Update 1.19.4
This commit is contained in:
parent
ff8756dc1a
commit
56872f1309
@ -11,5 +11,5 @@ dependencies {
|
|||||||
// Dev env
|
// Dev env
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
|
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${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")
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# https://fabricmc.net/develop/
|
# https://fabricmc.net/develop/
|
||||||
minecraft_version=1.19.3
|
minecraft_version=1.19.4
|
||||||
yarn_mappings=build.5
|
yarn_mappings=build.1
|
||||||
loader_version=0.14.12
|
loader_version=0.14.17
|
||||||
|
|
||||||
maven_group=io.gitlab.jfronny
|
maven_group=io.gitlab.jfronny
|
||||||
archives_base_name=globalization
|
archives_base_name=globalization
|
||||||
@ -10,5 +10,5 @@ modrinth_id=globalization
|
|||||||
modrinth_required_dependencies=libjf
|
modrinth_required_dependencies=libjf
|
||||||
modrinth_optional_dependencies=modmenu
|
modrinth_optional_dependencies=modmenu
|
||||||
|
|
||||||
libjf_version=3.5.0
|
libjf_version=3.6.0
|
||||||
fabric_version=0.70.0+1.19.3
|
fabric_version=0.75.3+1.19.4
|
||||||
|
@ -2,7 +2,6 @@ package io.gitlab.jfronny.globalization.mixin;
|
|||||||
|
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
import io.gitlab.jfronny.globalization.GlobalizationMap;
|
import io.gitlab.jfronny.globalization.GlobalizationMap;
|
||||||
import net.minecraft.client.resource.language.LanguageDefinition;
|
|
||||||
import net.minecraft.client.resource.language.TranslationStorage;
|
import net.minecraft.client.resource.language.TranslationStorage;
|
||||||
import net.minecraft.resource.ResourceManager;
|
import net.minecraft.resource.ResourceManager;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
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.CallbackInfoReturnable;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.*;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Mixin(TranslationStorage.class)
|
@Mixin(TranslationStorage.class)
|
||||||
public class TranslationStorageMixin {
|
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<String, String> globalization$createCustomMap(Map<String, String> original) {
|
private static Map<String, String> globalization$createCustomMap(Map<String, String> original) {
|
||||||
if (!original.isEmpty()) throw new IllegalStateException("Non-empty original");
|
if (!original.isEmpty()) throw new IllegalStateException("Non-empty original");
|
||||||
return new GlobalizationMap();
|
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)
|
@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 resourceManager, List<LanguageDefinition> definitions, CallbackInfoReturnable<TranslationStorage> cir, Map<String, String> map) {
|
private static void globalization$forkCustomMap(ResourceManager manager, List<String> definitions, boolean leftToRight, CallbackInfoReturnable<String> cir, Map<String, String> map) {
|
||||||
globalization$getMap(map).fork();
|
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<String, String> globalization$generateMissing(Map<String, String> source) {
|
private static ImmutableMap<String, String> globalization$generateMissing(Map<String, String> source) {
|
||||||
return ImmutableMap.copyOf(globalization$getMap(source).generateMissing());
|
return ImmutableMap.copyOf(globalization$getMap(source).generateMissing());
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
public class GlobalizationMap extends AbstractMap<String, String> {
|
public class GlobalizationMap extends AbstractMap<String, String> {
|
||||||
private static final Path targetPath = FabricLoader.getInstance().getConfigDir().resolve("globalization");
|
private static final Path targetPath = FabricLoader.getInstance().getConfigDir().resolve("globalization");
|
||||||
private List<Map<String, String>> pools = new LinkedList<>();
|
private final List<Map<String, String>> pools = new LinkedList<>();
|
||||||
|
|
||||||
public void fork() {
|
public void fork() {
|
||||||
if (pools.isEmpty() || !getCurrentPool().isEmpty()) pools.add(new LinkedHashMap<>());
|
if (pools.isEmpty() || !getCurrentPool().isEmpty()) pools.add(new LinkedHashMap<>());
|
||||||
|
Loading…
Reference in New Issue
Block a user