Merge branch '1.20.4' into 1.20.6

rfresh2 · May 21, 2024 · 497a648 · 497a648
2 parents fbceb01 + a1187a7
commit 497a648
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -123,9 +123,9 @@ dependencies {
     shade("com.github.rfresh2.fastutil:long-object-maps:$fastutilVersion")
     shade("com.github.rfresh2.fastutil:int-int-maps:$fastutilVersion")
     shade("com.github.rfresh2.fastutil:reference-object-maps:$fastutilVersion")
-    shade("net.raphimc:ViaLoader:3.0.0-20240517.153411-1")
-    shade("com.viaversion:viaversion:5.0.0-20240517.190711-8")
-    shade("com.viaversion:viabackwards:5.0.0-20240515.152913-2")
+    shade("net.raphimc:ViaLoader:2.2.13")
+    shade("com.viaversion:viaversion:4.10.2")
+    shade("com.viaversion:viabackwards:4.10.2")
     shade("org.jline:jline:3.26.1")
     shade("org.jline:jline-terminal-jansi:3.26.1")
     shade("ar.com.hjg:pngj:2.1.0")

diff --git a/src/main/java/com/zenith/via/ZenithViaConfig.java b/src/main/java/com/zenith/via/ZenithViaConfig.java
@@ -3,11 +3,10 @@
 import net.raphimc.vialoader.impl.viaversion.VLViaConfig;
 
 import java.io.File;
-import java.util.logging.LogManager;
 
 public class ZenithViaConfig extends VLViaConfig {
     public ZenithViaConfig(final File configFile) {
-        super(configFile, LogManager.getLogManager().getLogger("ViaVersion"));
+        super(configFile);
     }
 
     @Override

diff --git a/src/main/java/com/zenith/via/ZenithViaLoader.java b/src/main/java/com/zenith/via/ZenithViaLoader.java
@@ -1,6 +1,6 @@
 package com.zenith.via;
 
-import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.provider.TransferProvider;
+import com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.provider.TransferProvider;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.VersionProvider;

diff --git a/src/main/resources/META-INF/native-image/reflect-config.json b/src/main/resources/META-INF/native-image/reflect-config.json
@@ -32,12 +32,6 @@
 {
   "name":"[Lcom.github.steveice10.mc.auth.data.GameProfile;"
 },
-{
-  "name":"[Lcom.viaversion.nbt.tag.CompoundTag;"
-},
-{
-  "name":"[Lcom.viaversion.nbt.tag.Tag;"
-},
 {
   "name":"[Lcom.viaversion.viaversion.api.minecraft.BlockChangeRecord;"
 },
@@ -528,8 +522,7 @@
 },
 {
   "name":"com.viaversion.nbt.tag.CompoundTag",
-  "allDeclaredFields":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.lang.String"] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"com.viaversion.nbt.tag.DoubleTag",
@@ -598,11 +591,6 @@
   "allDeclaredFields":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
-{
-  "name":"com.viaversion.viaversion.protocols.v1_12_2to1_13.data.RecipeData$Recipe",
-  "allDeclaredFields":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
 {
   "name":"com.zaxxer.hikari.HikariConfig",
   "allDeclaredFields":true