4.2.0 Release

Author: FlorianMichael

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 
 # Project Details
 maven_group=de.florianmichael
-maven_version=4.1.2-SNAPSHOT
+maven_version=4.2.0
 maven_description=Client-side ViaVersion implementation for MinecraftForge and NeoForge
 
 mixin_version=0.8.3

viaforge-mc1217/src/main/java/de/florianmichael/viaforge/mixin/MixinServerData.java

@@ -19,7 +19,6 @@
 package de.florianmichael.viaforge.mixin;
 
 import de.florianmichael.viaforge.common.gui.ExtendedServerData;
-import net.minecraft.SharedConstants;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.nbt.CompoundTag;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -30,7 +29,6 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-import java.lang.reflect.Method;
 
 @Mixin(ServerData.class)
 public class MixinServerData implements ExtendedServerData {
@@ -48,7 +46,7 @@ public void saveVersion(CallbackInfoReturnable<CompoundTag> cir, CompoundTag com
     @Inject(method = "read", at = @At(value = "TAIL"))
     private static void getVersion(CompoundTag compoundnbt, CallbackInfoReturnable<ServerData> cir) {
         if (compoundnbt.contains("viaForge$version")) {
-            ((ExtendedServerData) cir.getReturnValue()).viaForge$setVersion(ProtocolVersion.getClosest(viaforge$getString(compoundnbt)));
+            ((ExtendedServerData) cir.getReturnValue()).viaForge$setVersion(ProtocolVersion.getClosest(compoundnbt.getStringOr("viaForge$version", "")));
         }
     }
 
@@ -69,27 +67,4 @@ public void track(ServerData serverDataIn, CallbackInfo ci) {
         viaForge$version = version;
     }
 
-    @Unique
-    private static Method viaForge$getString;
-
-    /**
-     * 1.21.4 Compat
-     */
-    @Unique
-    private static String viaforge$getString(CompoundTag compoundnbt) {
-        if (SharedConstants.getProtocolVersion() >= 770) {
-            return compoundnbt.getStringOr("viaForge$version", "");
-        } else {
-            String s = "";
-            try {
-                if (viaForge$getString == null) {
-                    viaForge$getString = CompoundTag.class.getDeclaredMethod("getString", String.class);
-                }
-                s = (String) viaForge$getString.invoke(compoundnbt, "viaForge$version");
-            } catch (Exception e) {
-                throw new IllegalArgumentException(e);
-            }
-            return s;
-        }
-    }
 }