Add Localization API

build.gradle

@@ -202,6 +202,8 @@ def setUpLibrary(project) {
 		implementation "org.apache.logging.log4j:log4j-api:2.19.0"
 		implementation "org.apache.logging.log4j:log4j-core:2.19.0"
 
+		implementation "org.quiltmc.parsers:json:${project.rootProject.quilt_parsers_version}"
+
 		implementation project.dependencies.project(path: ':libraries:core', configuration: 'namedElements')
 
 		libraries.each { libraryPath ->

libraries/branding/branding-mcin-20100206-2103-mca1.2.1_01/src/main/java/net/ornithemc/osl/branding/impl/BrandingPatchImpl.java

@@ -4,11 +4,10 @@
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 
-import net.fabricmc.loader.api.FabricLoader;
-
 import net.ornithemc.osl.branding.api.BrandingContext;
 import net.ornithemc.osl.branding.api.BrandingPatchEvents;
 import net.ornithemc.osl.branding.api.Operation;
+import net.ornithemc.osl.core.impl.util.MinecraftVersion;
 import net.ornithemc.osl.entrypoints.api.client.ClientModInitializer;
 import net.ornithemc.osl.entrypoints.api.launch.LaunchEvents;
 import net.ornithemc.osl.entrypoints.api.launch.OptionsConsumer;
@@ -21,7 +20,7 @@ public class BrandingPatchImpl implements ClientModInitializer {
 
 	public static String getGameVersion() {
 		if (gameVersion == null) {
-			gameVersion = FabricLoader.getInstance().getRawGameVersion();
+			gameVersion = MinecraftVersion.resolve().gameVersion();
 
 			if (gameVersion.charAt(0) == 'a') {
 				gameVersion = "Alpha v" + gameVersion.substring(1);

libraries/core/src/main/java/net/ornithemc/osl/core/api/util/Unit.java

@@ -0,0 +1,7 @@
+package net.ornithemc.osl.core.api.util;
+
+public enum Unit {
+
+	INSTANCE
+
+}

libraries/core/src/main/java/net/ornithemc/osl/core/api/util/function/IOSupplier.java

@@ -0,0 +1,9 @@
+package net.ornithemc.osl.core.api.util.function;
+
+import java.io.IOException;
+
+public interface IOSupplier<T> {
+
+	T get() throws IOException;
+
+}

libraries/core/src/main/java/net/ornithemc/osl/core/impl/util/MinecraftVersion.java

@@ -0,0 +1,77 @@
+package net.ornithemc.osl.core.impl.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.loader.api.SemanticVersion;
+import net.fabricmc.loader.api.Version;
+import net.fabricmc.loader.api.VersionParsingException;
+import net.fabricmc.loader.impl.game.minecraft.McVersionLookup;
+
+public final class MinecraftVersion {
+
+	private static MinecraftVersion INSTANCE;
+
+	public static MinecraftVersion resolve() {
+		if (INSTANCE == null) {
+			Optional<ModContainer> mod = FabricLoader.getInstance().getModContainer("minecraft");
+
+			if (!mod.isPresent()) {
+				throw new IllegalStateException("Minecraft not loaded!");
+			}
+
+			ModContainer minecraft = mod.get();
+			String gameVersion = FabricLoader.getInstance().getRawGameVersion();
+			SemanticVersion semanticVersion = resolveSemanticVersion(minecraft.getMetadata().getVersion());
+
+			INSTANCE = new MinecraftVersion(gameVersion, semanticVersion);
+		}
+
+		return INSTANCE;
+	}
+
+	private final String gameVersion;
+	private final SemanticVersion semanticVersion;
+
+	// semantic versions for other game versions
+	private final Map<String, SemanticVersion> semanticVersions = new HashMap<>();
+
+	private MinecraftVersion(String gameVersion, SemanticVersion semanticVersion) {
+		this.gameVersion = gameVersion;
+		this.semanticVersion = semanticVersion;
+	}
+
+	public String gameVersion() {
+		return this.gameVersion;
+	}
+
+	public String semanticVersion() {
+		return this.semanticVersion.toString();
+	}
+
+	public int compareTo(String gameVersion) {
+		return this.semanticVersion.compareTo((Version) this.semanticVersions.computeIfAbsent(gameVersion, MinecraftVersion::resolveSemanticVersion));
+	}
+
+	private static SemanticVersion resolveSemanticVersion(Version gameVersion) {
+		if (gameVersion instanceof SemanticVersion) {
+			return (SemanticVersion) gameVersion;
+		} else {
+			return resolveSemanticVersion(gameVersion.toString());
+		}
+	}
+
+	private static SemanticVersion resolveSemanticVersion(String gameVersion) {
+		String releaseVersion = McVersionLookup.getRelease(gameVersion);
+		String normalizedVersion = McVersionLookup.normalizeVersion(gameVersion, releaseVersion);
+
+		try {
+			return SemanticVersion.parse(normalizedVersion);
+		} catch (VersionParsingException e) {
+			throw new IllegalStateException("Unable to parse Minecraft version " + gameVersion, e);
+		}
+	}
+}

libraries/core/src/main/java/net/ornithemc/osl/core/impl/util/Util.java

@@ -0,0 +1,30 @@
+package net.ornithemc.osl.core.impl.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public final class Util {
+
+	public static <V> CompletableFuture<List<V>> sequence(List<? extends CompletableFuture<? extends V>> futures) {
+		List<V> results = new ArrayList<>(futures.size());
+
+		CompletableFuture<?>[] sequence = new CompletableFuture[futures.size()];
+		CompletableFuture<Void> failure = new CompletableFuture<>();
+
+		futures.forEach(future -> {
+			int i = results.size();
+			results.add(null);
+
+			sequence[i] = future.whenComplete((result, exception) -> {
+				if (exception != null) {
+					failure.completeExceptionally(exception);
+				} else {
+					results.set(i, result);
+				}
+			});
+		});
+
+		return CompletableFuture.allOf(sequence).applyToEither(failure, v -> results);
+	}
+}

libraries/localization/README.md

@@ -0,0 +1,3 @@
+# Localization API
+
+The Localization API provides a consistent access point for localized text, and adds support for localization in versions that do not natively do so.

libraries/localization/build.gradle

@@ -0,0 +1,5 @@
+setUpLibrary(project)
+
+dependencies {
+	implementation 'com.google.code.gson:gson:2.8.0'
+}

libraries/localization/gradle.properties

@@ -0,0 +1,6 @@
+library_id = localization
+library_name = Localization
+library_description = Localization API and events.
+library_version = 0.1.0-alpha.1
+
+osl_dependencies = core:>=0.7.0,executors:>=0.1.0,text-components:>=0.1.0-,resource-loader:>=0.7.0-

libraries/localization/localization-mc11w49a-mc1.5.2/gradle.properties

@@ -0,0 +1,6 @@
+min_mc_version = 11w49a
+max_mc_version = 1.5.2
+minecraft_dependency = >=1.1-alpha.11.49.a <=1.5.2
+
+minecraft_version = 1.5.2
+client_nests_build = 6

libraries/localization/localization-mc11w49a-mc1.5.2/src/main/java/net/ornithemc/osl/localization/impl/mixin/client/LanguageAccess.java

@@ -0,0 +1,16 @@
+package net.ornithemc.osl.localization.impl.mixin.client;
+
+import java.util.Properties;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.locale.Language;
+
+@Mixin(Language.class)
+public interface LanguageAccess {
+
+	@Accessor("translations")
+	Properties accessTranslations();
+
+}

libraries/localization/localization-mc11w49a-mc1.5.2/src/main/java/net/ornithemc/osl/localization/impl/mixin/client/LanguageMixin.java

@@ -0,0 +1,93 @@
+package net.ornithemc.osl.localization.impl.mixin.client;
+
+import java.util.Properties;
+
+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.CallbackInfo;
+
+import com.llamalad7.mixinextras.sugar.Local;
+
+import net.minecraft.locale.Language;
+
+import net.ornithemc.osl.localization.impl.Localization;
+import net.ornithemc.osl.resource.loader.api.resource.manager.ResourceManager;
+
+@Mixin(Language.class)
+public class LanguageMixin {
+
+	@Shadow
+	private static Language INSTANCE;
+
+	@Shadow
+	private Properties translations;
+	@Shadow
+	private String currentCode;
+
+	@Inject(
+		method = "<clinit>",
+		at = @At(
+			value = "TAIL"
+		)
+	)
+	private static void osl$localization$initLocale(CallbackInfo ci) {
+		Localization.getLocale().wrap(((LanguageAccess) INSTANCE).accessTranslations());
+	}
+
+	@Inject(
+		method = "load",
+		at = @At(
+			value = "TAIL"
+		)
+	)
+	private void osl$localization$reloadLanguageManager(CallbackInfo ci) {
+		// each ServerPlayerEntity also holds an instance of this class
+		if ((Language) (Object) this == INSTANCE) {
+			Localization.reloadLanguageManager();
+		}
+	}
+
+	@Inject(
+		method = "loadLanguage",
+		at = @At(
+			value = "HEAD"
+		)
+	)
+	private void osl$localization$setLanguage(CallbackInfo ci) {
+		// each ServerPlayerEntity also holds an instance of this class
+		if ((Language) (Object) this == INSTANCE) {
+			Localization.getLanguageManager().setSelectedLanguage(this.currentCode);
+		}
+	}
+
+	@Inject(
+		method = "loadLanguage",
+		at = @At(
+			value = "INVOKE",
+			target = "Lnet/minecraft/locale/Language;loadTranslations(Ljava/util/Properties;Ljava/lang/String;)V"
+		)
+	)
+	private void osl$localization$loadExtraTranslations(CallbackInfo ci, @Local String language, @Local Properties translations) {
+		// each ServerPlayerEntity also holds an instance of this class
+		if ((Language) (Object) this == INSTANCE) {
+			// the translations map is replaced with each reload
+			Localization.getLocale().wrap(translations);
+			Localization.getLocale().loadLanguage(ResourceManager.client(), language);
+		}
+	}
+
+	@Inject(
+		method = "loadLanguage",
+		at = @At(
+			value = "TAIL"
+		)
+	)
+	private void osl$localization$localeReloaded(CallbackInfo ci) {
+		// each ServerPlayerEntity also holds an instance of this class
+		if ((Language) (Object) this == INSTANCE) {
+			Localization.getLocale().setLastUpdateTime();
+		}
+	}
+}

libraries/localization/localization-mc11w49a-mc1.5.2/src/main/resources/fabric.mod.json

@@ -0,0 +1,28 @@
+{
+  "schemaVersion": 1,
+  "id": "osl-localization",
+  "version": "0.1.0-alpha.1+mc11w49a-mc1.5.2",
+  "environment": "*",
+  "mixins": [
+    "osl.localization.mixins.json"
+  ],
+  "depends": {
+    "fabricloader": "\u003e\u003d0.18.0",
+    "minecraft": "\u003e\u003d1.1-alpha.11.49.a \u003c\u003d1.5.2",
+    "osl-core": "\u003e\u003d0.7.0",
+    "osl-executors": "\u003e\u003d0.1.0",
+    "osl-text-components": "\u003e\u003d0.1.0-",
+    "osl-resource-loader": "\u003e\u003d0.7.0-"
+  },
+  "name": "OSL Localization",
+  "description": "Localization API and events.",
+  "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"
+}

libraries/resource-loader/resource-loader-mca1.2.2-mc11w48a/src/main/resources/osl.resource-loader.mixins.json → libraries/localization/localization-mc11w49a-mc1.5.2/src/main/resources/osl.localization.mixins.json

@@ -1,12 +1,12 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "net.ornithemc.osl.resource.loader.impl.mixin",
+	"package": "net.ornithemc.osl.localization.impl.mixin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"client.TexturePackMixin",
+		"client.LanguageAccess",
 		"client.LanguageMixin"
 	],
 	"server": [

libraries/localization/localization-mc13w26a-mc18w01a/gradle.properties

@@ -0,0 +1,8 @@
+min_mc_version = 13w26a
+max_mc_version = 18w01a
+minecraft_dependency = >=1.6-alpha.13.26.a <=1.13-alpha.18.1.a
+
+minecraft_version = 1.8.2-pre4
+raven_build = 1
+sparrow_build = 1
+nests_build = 3

libraries/localization/localization-mc13w26a-mc18w01a/src/main/java/net/ornithemc/osl/localization/impl/access/SimpleResourceAccess.java

@@ -0,0 +1,9 @@
+package net.ornithemc.osl.localization.impl.access;
+
+import net.ornithemc.osl.core.api.util.NamespacedIdentifier;
+
+public interface SimpleResourceAccess {
+
+	NamespacedIdentifier osl$localization$getLocation();
+
+}