From 56872f130928c8b7d781108d86397282f1d58c9e Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 14 Mar 2023 22:45:24 +0100 Subject: [PATCH] Update 1.19.4 --- build.gradle.kts | 2 +- gradle.properties | 10 +++++----- .../globalization/mixin/TranslationStorageMixin.java | 12 +++++------- .../jfronny/globalization/GlobalizationMap.java | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 876edbf..d26bdb7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,5 +11,5 @@ dependencies { // Dev env modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") - modLocalRuntime("com.terraformersmc:modmenu:5.0.2") + modLocalRuntime("com.terraformersmc:modmenu:6.1.0-rc.1") } diff --git a/gradle.properties b/gradle.properties index 33a3c98..a4f04d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # https://fabricmc.net/develop/ -minecraft_version=1.19.3 -yarn_mappings=build.5 -loader_version=0.14.12 +minecraft_version=1.19.4 +yarn_mappings=build.1 +loader_version=0.14.17 maven_group=io.gitlab.jfronny archives_base_name=globalization @@ -10,5 +10,5 @@ modrinth_id=globalization modrinth_required_dependencies=libjf modrinth_optional_dependencies=modmenu -libjf_version=3.5.0 -fabric_version=0.70.0+1.19.3 +libjf_version=3.6.0 +fabric_version=0.75.3+1.19.4 diff --git a/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java b/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java index 33e3a1e..9a88a9b 100644 --- a/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java +++ b/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java @@ -2,7 +2,6 @@ package io.gitlab.jfronny.globalization.mixin; import com.google.common.collect.ImmutableMap; import io.gitlab.jfronny.globalization.GlobalizationMap; -import net.minecraft.client.resource.language.LanguageDefinition; import net.minecraft.client.resource.language.TranslationStorage; import net.minecraft.resource.ResourceManager; import org.spongepowered.asm.mixin.Mixin; @@ -10,23 +9,22 @@ import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import java.util.List; -import java.util.Map; +import java.util.*; @Mixin(TranslationStorage.class) public class TranslationStorageMixin { - @ModifyVariable(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/Maps;newHashMap()Ljava/util/HashMap;"), index = 2) + @ModifyVariable(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Z)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/Maps;newHashMap()Ljava/util/HashMap;"), index = 3) private static Map globalization$createCustomMap(Map original) { if (!original.isEmpty()) throw new IllegalStateException("Non-empty original"); return new GlobalizationMap(); } - @Inject(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resource/language/LanguageDefinition;isRightToLeft()Z"), locals = LocalCapture.CAPTURE_FAILHARD) - private static void globalization$forkCustomMap(ResourceManager resourceManager, List definitions, CallbackInfoReturnable cir, Map map) { + @Inject(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Z)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE", target = "Ljava/lang/String;format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;"), locals = LocalCapture.CAPTURE_FAILHARD) + private static void globalization$forkCustomMap(ResourceManager manager, List definitions, boolean leftToRight, CallbackInfoReturnable cir, Map map) { globalization$getMap(map).fork(); } - @Redirect(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;")) + @Redirect(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Z)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;")) private static ImmutableMap globalization$generateMissing(Map source) { return ImmutableMap.copyOf(globalization$getMap(source).generateMissing()); } diff --git a/src/main/java/io/gitlab/jfronny/globalization/GlobalizationMap.java b/src/main/java/io/gitlab/jfronny/globalization/GlobalizationMap.java index f756093..e9eb42b 100644 --- a/src/main/java/io/gitlab/jfronny/globalization/GlobalizationMap.java +++ b/src/main/java/io/gitlab/jfronny/globalization/GlobalizationMap.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; public class GlobalizationMap extends AbstractMap { private static final Path targetPath = FabricLoader.getInstance().getConfigDir().resolve("globalization"); - private List> pools = new LinkedList<>(); + private final List> pools = new LinkedList<>(); public void fork() { if (pools.isEmpty() || !getCurrentPool().isEmpty()) pools.add(new LinkedHashMap<>());