diff --git a/build.gradle b/build.gradle index 5e51c87..1c3360c 100644 --- a/build.gradle +++ b/build.gradle @@ -54,9 +54,9 @@ repositories { } dependencies { - include "com.viaversion:viaversion-common:4.10.0-24w03b-SNAPSHOT" - include "com.viaversion:viabackwards-common:4.10.0-24w03a-SNAPSHOT" - include "com.viaversion:viarewind-common:3.0.6-20240114.162712-15" + include "com.viaversion:viaversion-common:4.10.0-24w04a-SNAPSHOT" + include "com.viaversion:viabackwards-common:4.10.0-24w04a-SNAPSHOT" + include "com.viaversion:viarewind-common:3.0.6-SNAPSHOT" include "net.raphimc:ViaLegacy:2.2.22-SNAPSHOT" include "net.raphimc:ViaAprilFools:2.0.11-SNAPSHOT" include("net.raphimc:ViaBedrock:0.0.4-SNAPSHOT") { diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinConfig.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinConfig.java index 3738579..72d16f8 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinConfig.java +++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinConfig.java @@ -28,7 +28,7 @@ import java.util.Map; @Mixin(Config.class) 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<String, Object> map, final Object key) { if (((Object) this) instanceof ConfigPatcher) { return true; diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocolVersion.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocolVersion.java index 5841f8d..67f951c 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocolVersion.java +++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocolVersion.java @@ -52,7 +52,7 @@ public abstract class MixinProtocolVersion { remaps.put("1.19.1/2", new Pair<>("1.19.1-1.19.2", null)); remaps.put("1.20/1.20.1", new Pair<>("1.20-1.20.1", null)); remaps.put("1.20.3/1.20.4", new Pair<>("1.20.3-1.20.4", null)); - remaps.put("1.20.5", new Pair<>("24w03b", null)); + remaps.put("1.20.5", new Pair<>("24w04a", null)); } @Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;register(ILjava/lang/String;)Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;"))