Add Localization API

build.gradle

@@ -182,6 +182,8 @@ def fillModJson(project, task) {
 }
 
 def setUpLibrary(project) {
+	def isCore = (project.path == ':libraries:core')
+
 	project.apply plugin: 'java-library'
 	project.apply plugin: 'eclipse'
 	project.apply plugin: 'idea'
@@ -209,21 +211,31 @@ def setUpLibrary(project) {
 	def libraries = []
 	def modules = []
 
-	findLibraryDependencies(project, libraries, modules)
+	if (!isCore) {
+		findLibraryDependencies(project, libraries, modules)
+	}
 
 	project.dependencies {
 		implementation "net.fabricmc:fabric-loader:${project.rootProject.loader_version}"
 
 		implementation "org.apache.logging.log4j:log4j-api:2.19.0"
 		implementation "org.apache.logging.log4j:log4j-core:2.19.0"
 
-		implementation project.dependencies.project(path: ':libraries:core', configuration: 'namedElements')
+		implementation "org.quiltmc.parsers:json:${project.rootProject.quilt_parsers_version}"
 
 		libraries.each { libraryPath ->
 			implementation project.dependencies.project(path: libraryPath)
+
+			if (libraryPath == ':libraries:core') {
+				evaluationDependsOn libraryPath
+			}
 		}
 		modules.each { modulePath ->
 			implementation project.dependencies.project(path: modulePath, configuration: 'namedElements')
+
+			if (modulePath.startsWith(':libraries:core')) {
+				evaluationDependsOn modulePath
+			}
 		}
 	}
 
@@ -247,11 +259,8 @@ def setUpLibrary(project) {
 }
 
 def setUpModule(project) {
-	// normally modules have a 'root' and subprojects
-	// for different mc version ranges
-	// the Core API is the only exception to this
-	def isCore = (project.path == ':libraries:core')
-	def library = (isCore) ? project : project.parent
+	def library = project.parent
+	def isCore = (library.path == ':libraries:core')
 
 	project.apply plugin: 'java-library'
 	project.apply plugin: 'eclipse'
@@ -263,13 +272,9 @@ def setUpModule(project) {
 	project.base {
 		archivesName = "${project.rootProject.mod_id_short}-${library.library_id}"
 	}
-	project.version = "${library.library_version}"
+	project.version = "${library.library_version}+mc${project.min_mc_version}-mc${project.max_mc_version}"
 	project.group = "${project.rootProject.library_maven_group}"
 
-	if (!isCore) {
-		project.version += "+mc${project.min_mc_version}-mc${project.max_mc_version}"
-	}
-
 	def ctfile = project.file("src/main/resources/${project.rootProject.mod_id_short}.${library.library_id}.classtweaker")
 
 	project.loom {
@@ -291,7 +296,9 @@ def setUpModule(project) {
 	def libraries = []
 	def modules = []
 
-	findModuleDependencies(project, libraries, modules)
+	if (!isCore) {
+		findModuleDependencies(project, libraries, modules)
+	}
 
 	project.dependencies {
 		minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -336,11 +343,21 @@ def setUpModule(project) {
 			include "org.quiltmc.parsers:json:${project.rootProject.quilt_parsers_version}"
 		}
 
+		implementation project.dependencies.project(path: library.path)
+
 		libraries.each { libraryPath ->
 			implementation project.dependencies.project(path: libraryPath)
+
+			if (libraryPath == ':libraries:core') {
+				evaluationDependsOn libraryPath
+			}
 		}
 		modules.each { modulePath ->
 			implementation project.dependencies.project(path: modulePath, configuration: 'namedElements')
+
+			if (modulePath.startsWith(':libraries:core')) {
+				evaluationDependsOn modulePath
+			}
 		}
 	}
 
@@ -351,14 +368,10 @@ def setUpModule(project) {
 	project.sourceSets {
 		main {
 			java {
-				if (!isCore) {
-					srcDirs += project.parent.sourceSets.main.java.srcDirs
-				}
+				srcDirs += project.parent.sourceSets.main.java.srcDirs
 			}
 			resources {
-				if (!isCore) {
-					srcDirs += project.parent.sourceSets.main.resources.srcDirs
-				}
+				srcDirs += project.parent.sourceSets.main.resources.srcDirs
 			}
 		}
 	}
@@ -399,9 +412,7 @@ def setUpModule(project) {
 				environment = '*'
 			}
 
-			if (!isCore) {
-				depends "minecraft", "${project.minecraft_dependency}"
-			}
+			depends "minecraft", "${project.minecraft_dependency}"
 
 			if (!isCore && library.hasProperty('osl_dependencies')) {
 				for (def dependency : library.osl_dependencies.split(',')) {
@@ -447,10 +458,7 @@ def setUpModule(project) {
 	project.publishing {
 		publications {
 			mavenJava(MavenPublication) {
-				if (!isCore) {
-					artifactId project.parent.name
-				}
-
+				artifactId library.library_id
 				from project.components.java
 
 				pom.withXml {
@@ -480,10 +488,6 @@ def setUpModule(project) {
 		}
 	}
 
-	if (isCore) {
-		addPomDependency(project)
-	}
-
 	setUpJavadoc(project)
 }
 
@@ -493,13 +497,8 @@ def findLibraryDependencies(project, libraries, modules) {
 
 		for (dep : deps) {
 			def libraryName = dep.substring(0, dep.indexOf(':'))
-
-			if (libraryName != 'core') {
-				libraries.add(":libraries:${libraryName}")
-			}
+			libraries.add(":libraries:${libraryName}")
 		}
-
-		modules.add(':libraries:core')
 	}
 }
 
@@ -509,18 +508,13 @@ def findModuleDependencies(project, libraries, modules) {
 
 		for (dep : deps) {
 			def libraryName = dep.substring(0, dep.indexOf(':'))
+			def moduleName = findModuleDependency(project, libraryName)
 
-			if (libraryName != 'core') {
-				def moduleName = findModuleDependency(project, libraryName)
-
+			if (moduleName != null) {
 				libraries.add(":libraries:${libraryName}")
-				if (moduleName != null) {
-					modules.add(":libraries:${libraryName}:${moduleName}")
-				}
+				modules.add(":libraries:${libraryName}:${moduleName}")
 			}
 		}
-
-		modules.add(':libraries:core')
 	}
 }
 

libraries/core/build.gradle

@@ -1 +1,6 @@
-setUpModule(project)
+setUpLibrary(project)
+
+dependencies {
+	implementation 'org.jetbrains:annotations:24.0.1'
+	implementation 'it.unimi.dsi:fastutil:8.5.9'
+}

libraries/core/core-mc14w27a-mc1.14.4/gradle.properties

@@ -0,0 +1,5 @@
+min_mc_version = 14w27a
+max_mc_version = 1.14.4
+minecraft_dependency = >=1.8-alpha.14.27.a <=1.14.4
+
+minecraft_version = 1.14.4

libraries/core/core-mc14w27a-mc1.14.4/src/main/java/net/ornithemc/osl/core/impl/mixin/common/IdentifierMixin.java

@@ -0,0 +1,45 @@
+package net.ornithemc.osl.core.impl.mixin.common;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.resource.Identifier;
+
+import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
+import net.ornithemc.osl.core.api.util.NamespacedIdentifiers;
+
+@Mixin(Identifier.class)
+public class IdentifierMixin implements NamespacedIdentifier {
+
+	@Shadow
+	private String namespace;
+	@Shadow
+	private String path;
+
+	@Inject(
+		method = "equals",
+		remap = false,
+		cancellable = true,
+		at = @At(
+			value = "HEAD"
+		)
+	)
+	private void osl$core$equalsNamespacedIdentifier(Object o, CallbackInfoReturnable<Boolean> cir) {
+		if (o instanceof NamespacedIdentifier) {
+			cir.setReturnValue(NamespacedIdentifiers.equals(this, (NamespacedIdentifier) o));
+		}
+	}
+
+	@Override
+	public String namespace() {
+		return namespace;
+	}
+
+	@Override
+	public String identifier() {
+		return path;
+	}
+}

libraries/core/src/main/resources/fabric.mod.json → libraries/core/core-mc14w27a-mc1.14.4/src/main/resources/fabric.mod.json

@@ -1,14 +1,15 @@
 {
   "schemaVersion": 1,
   "id": "osl-core",
-  "version": "0.7.1",
+  "version": "0.7.1+mc14w27a-mc1.14.4",
   "environment": "*",
   "mixins": [
     "osl.core.mixins.json"
   ],
   "accessWidener": "osl.core.classtweaker",
   "depends": {
-    "fabricloader": "\u003e\u003d0.18.0"
+    "fabricloader": "\u003e\u003d0.18.0",
+    "minecraft": "\u003e\u003d1.8-alpha.14.27.a \u003c\u003d1.14.4"
   },
   "name": "OSL Core",
   "description": "The core of Ornithe Standard Libraries.",

libraries/core/core-mc14w27a-mc1.14.4/src/main/resources/osl.core.classtweaker

@@ -0,0 +1,3 @@
+classTweaker	v1	named
+
+transitive-inject-interface	net/minecraft/resource/Identifier	net/ornithemc/osl/core/impl/util/IdentifierImpl

libraries/core/src/main/resources/osl.core.mixins.json → libraries/core/core-mc14w27a-mc1.14.4/src/main/resources/osl.core.mixins.json

@@ -4,7 +4,7 @@
 	"package": "net.ornithemc.osl.core.impl.mixin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
-		"IdentifierMixin"
+		"common.IdentifierMixin"
 	],
 	"client": [
 	],

libraries/core/core-mca1.0.1_01-mc14w26c/gradle.properties

@@ -0,0 +1,8 @@
+min_mc_version = a1.0.1_01
+max_mc_version = 14w26c
+minecraft_dependency = >=1.0.0-alpha.0.1 <=1.8-alpha.14.26.c
+
+minecraft_version = 1.7.2
+raven_build = 1
+sparrow_build = 1
+nests_build = 3

libraries/core/core-mca1.0.1_01-mc14w26c/src/main/java/net/ornithemc/osl/core/impl/CoreMixinPlugin.java

@@ -0,0 +1,51 @@
+package net.ornithemc.osl.core.impl;
+
+import java.util.List;
+import java.util.Set;
+
+import org.objectweb.asm.tree.ClassNode;
+
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import net.ornithemc.osl.core.impl.util.MinecraftVersion;
+
+public class CoreMixinPlugin implements IMixinConfigPlugin {
+
+	public static final boolean IDENTIFIER_EXISTS = MinecraftVersion.resolve().compareTo("13w21a") >= 0;
+
+	@Override
+	public void onLoad(String mixinPackage) {
+	}
+
+	@Override
+	public String getRefMapperConfig() {
+		return null;
+	}
+
+	@Override
+	public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+		if ("net.ornithemc.osl.core.impl.mixin.client.IdentifierMixin".equals(mixinClassName)) {
+			return IDENTIFIER_EXISTS;
+		}
+
+		return true;
+	}
+
+	@Override
+	public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+	}
+
+	@Override
+	public List<String> getMixins() {
+		return null;
+	}
+
+	@Override
+	public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+	}
+
+	@Override
+	public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+	}
+}

libraries/core/src/main/java/net/ornithemc/osl/core/impl/mixin/IdentifierMixin.java → libraries/core/core-mca1.0.1_01-mc14w26c/src/main/java/net/ornithemc/osl/core/impl/mixin/client/IdentifierMixin.java

@@ -1,7 +1,6 @@
-package net.ornithemc.osl.core.impl.mixin;
+package net.ornithemc.osl.core.impl.mixin.client;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -12,9 +11,8 @@
 import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
 import net.ornithemc.osl.core.api.util.NamespacedIdentifiers;
 
-@Pseudo // needed because Identifier does not exist in all versions
 @Mixin(Identifier.class)
-public class IdentifierMixin implements NamespacedIdentifier { // TODO: interface injection
+public class IdentifierMixin implements NamespacedIdentifier {
 
 	@Shadow
 	private String namespace;

libraries/core/core-mca1.0.1_01-mc14w26c/src/main/resources/fabric.mod.json

@@ -0,0 +1,25 @@
+{
+  "schemaVersion": 1,
+  "id": "osl-core",
+  "version": "0.7.1+mc14w27a-mc14w26c",
+  "environment": "*",
+  "mixins": [
+    "osl.core.mixins.json"
+  ],
+  "accessWidener": "osl.core.classtweaker",
+  "depends": {
+    "fabricloader": "\u003e\u003d0.18.0",
+    "minecraft": "\u003e\u003d1.0.0-alpha.0.1 \u003c\u003d1.8-alpha.14.26.c"
+  },
+  "name": "OSL Core",
+  "description": "The core of Ornithe Standard Libraries.",
+  "authors": [
+    "OrnitheMC"
+  ],
+  "contact": {
+    "homepage": "https://ornithemc.net/",
+    "issues": "https://github.com/OrnitheMC/ornithe-standard-libraries/issues",
+    "sources": "https://github.com/OrnitheMC/ornithe-standard-libraries"
+  },
+  "license": "Apache-2.0"
+}