From bcb3c57832211d0db601069f2fdcb58ca3db663d Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:54:11 +0100 Subject: [PATCH] 24w04a and Via API usage update --- gradle.properties | 4 ++-- .../viafabricplus/injection/mixin/viaversion/MixinConfig.java | 2 +- .../injection/mixin/viaversion/MixinProtocolVersion.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 26803dc67..0e9a5f7ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,8 +14,8 @@ maven_group=de.florianmichael archives_base_name=viafabricplus # ViaVersion Libraries -viaversion_version=4.10.0-24w03b-SNAPSHOT -viabackwards_version=4.10.0-24w03a-SNAPSHOT +viaversion_version=4.10.0-24w04a-SNAPSHOT +viabackwards_version=4.10.0-24w04a-SNAPSHOT vialegacy_version=2.2.22-SNAPSHOT viaaprilfools_version=2.0.11-SNAPSHOT vialoader_version=2.2.13-SNAPSHOT diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinConfig.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinConfig.java index 847895c5a..c9e643200 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinConfig.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinConfig.java @@ -30,7 +30,7 @@ @Mixin(value = Config.class, remap = false) public abstract class MixinConfig { - @Redirect(method = "loadConfig(Ljava/io/File;Ljava/net/URL;)Ljava/util/Map;", at = @At(value = "INVOKE", target = "Ljava/util/Map;containsKey(Ljava/lang/Object;)Z")) + @Redirect(method = "loadConfig(Ljava/io/File;Lcom/viaversion/viaversion/util/InputStreamSupplier;)Ljava/util/Map;", at = @At(value = "INVOKE", target = "Ljava/util/Map;containsKey(Ljava/lang/Object;)Z")) private boolean allowConfigPatching(final Map map, final Object key) { return ((Object) this) instanceof ConfigPatcher || map.containsKey(key); } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java index 7f2817317..04d173a55 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java @@ -54,7 +54,7 @@ private static void initMaps(CallbackInfo ci) { viaFabricPlus$remaps.put("1.19.1/2", new Pair<>("1.19.1-1.19.2", null)); viaFabricPlus$remaps.put("1.20/1.20.1", new Pair<>("1.20-1.20.1", null)); viaFabricPlus$remaps.put("1.20.3/1.20.4", new Pair<>("1.20.3-1.20.4", null)); - viaFabricPlus$remaps.put("1.20.5", new Pair<>("24w03b", null)); + viaFabricPlus$remaps.put("1.20.5", new Pair<>("24w04a", null)); } @Redirect(method = "", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;register(ILjava/lang/String;)Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;"))