Refactor everything

* Only inject enabled mixin
* Show error if secret not set
* Upgrade gradle & dependencies

Author: james58899

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.4-SNAPSHOT'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -25,8 +25,8 @@ dependencies {
 	modApi "net.fabricmc:fabric-loader:${project.loader_version}"
 	modApi "me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}"
 
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	//modApi "net.fabricmc:fabric:${project.fabric_version}"
+	// API
+	modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	include "me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}"
 }
 

gradle.properties

@@ -2,12 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16
-yarn_mappings=1.16+build.1
-loader_version=0.8.8+build.202
+minecraft_version=1.16.4
+yarn_mappings=1.16.4+build.6
+loader_version=0.10.6+build.214
 # Mod Properties
-mod_version=1.3.3
+mod_version=1.3.4
 maven_group=one.oktw
 archives_base_name=FabricProxy
 # Dependencies
-auto_config_version=2.2.0
+auto_config_version=3.3.1
+fabric_version=0.25.1+build.416-1.16

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -2,15 +2,69 @@
 
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
-import net.fabricmc.api.ModInitializer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
-public class FabricProxy implements ModInitializer {
+import java.util.List;
+import java.util.Set;
+
+public class FabricProxy implements IMixinConfigPlugin {
     public static ModConfig config;
+    private final Logger logger = LogManager.getLogger("FabricProxy");
+
+    @Override
+    public void onLoad(String mixinPackage) {
+        if (config == null) {
+            AutoConfig.register(ModConfig.class, Toml4jConfigSerializer::new);
+            config = AutoConfig.getConfigHolder(ModConfig.class).getConfig();
+        }
+    }
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        String module = mixinClassName.split("\\.")[3];
+        if (module.equals("bungee") && config.getBungeeCord()) {
+            logger.info("BungeeCord support injected: {}", mixinClassName);
+            return true;
+        }
+
+        if (module.equals("velocity") && config.getVelocity()) {
+            if (config.getSecret().isEmpty()) {
+                logger.error("Error: velocity secret is empty!");
+            } else {
+                logger.info("Velocity support injected: {}", mixinClassName);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public String getRefMapperConfig() {
+        return null;
+    }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+    }
+
+    @Override
+    public List<String> getMixins() {
+        return null;
+    }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
 
     @Override
-    public void onInitialize() {
-        AutoConfig.register(ModConfig.class, Toml4jConfigSerializer::new);
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
 
-        config = AutoConfig.getConfigHolder(ModConfig.class).getConfig();
     }
 }

src/main/java/one/oktw/FabricProxy.java

@@ -13,7 +13,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-public class VelocityProxy {
+public class VelocityLib {
     public static final Identifier PLAYER_INFO_CHANNEL = new Identifier("velocity", "player_info");
     private static final int SUPPORTED_FORWARDING_VERSION = 1;
 

src/main/java/one/oktw/VelocityProxy.java src/main/java/one/oktw/VelocityLib.java

@@ -2,12 +2,9 @@
 
 import com.mojang.authlib.properties.Property;
 
-import java.net.SocketAddress;
 import java.util.UUID;
 
-public interface IClientConnection {
-    void setRemoteAddress(SocketAddress socketAddress);
-
+public interface BungeeClientConnection {
     UUID getSpoofedUUID();
 
     void setSpoofedUUID(UUID uuid);

src/main/java/one/oktw/interfaces/IClientConnection.java src/main/java/one/oktw/interfaces/BungeeClientConnection.java

@@ -0,0 +1,13 @@
+package one.oktw.mixin;
+
+import net.minecraft.network.ClientConnection;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.net.SocketAddress;
+
+@Mixin(ClientConnection.class)
+public interface ClientConnectionAccessor {
+    @Accessor
+    void setAddress(SocketAddress address);
+}

src/main/java/one/oktw/interfaces/IHandshakeC2SPacket.java

@@ -1,26 +1,17 @@
-package one.oktw.mixin;
+package one.oktw.mixin.bungee;
 
 import com.mojang.authlib.properties.Property;
 import net.minecraft.network.ClientConnection;
-import one.oktw.interfaces.IClientConnection;
+import one.oktw.interfaces.BungeeClientConnection;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
-import java.net.SocketAddress;
 import java.util.UUID;
 
 @Mixin(ClientConnection.class)
-public abstract class ClientConnectionMixin implements IClientConnection {
-    @Shadow
-    private SocketAddress address;
+public abstract class ClientConnectionMixin implements BungeeClientConnection {
     private UUID spoofedUUID;
     private Property[] spoofedProfile;
 
-    @Override
-    public void setRemoteAddress(SocketAddress socketAddress) {
-        this.address = socketAddress;
-    }
-
     @Override
     public UUID getSpoofedUUID() {
         return this.spoofedUUID;

src/main/java/one/oktw/interfaces/ILoginQueryRequestS2CPacket.java

@@ -0,0 +1,11 @@
+package one.oktw.mixin.bungee;
+
+import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(HandshakeC2SPacket.class)
+public interface HandshakeC2SPacketAccessor {
+    @Accessor
+    String getAddress();
+}

src/main/java/one/oktw/interfaces/ILoginQueryResponseC2SPacket.java

@@ -1,35 +1,19 @@
 package one.oktw.mixin.bungee;
 
-import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
 import one.oktw.FabricProxy;
-import one.oktw.interfaces.IHandshakeC2SPacket;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 @Mixin(HandshakeC2SPacket.class)
-public abstract class HandshakeC2SPacketMixin implements IHandshakeC2SPacket {
-    @Shadow
-    private String address;
-
-    @Redirect(method = "read", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/PacketByteBuf;readString(I)Ljava/lang/String;"))
-    private String onReadPacketData(PacketByteBuf buf, int int_1) {
-        if (!FabricProxy.config.getBungeeCord()) {
-            return buf.readString(255);
+public abstract class HandshakeC2SPacketMixin {
+    @ModifyConstant(method = "read", constant = @Constant(intValue = 255))
+    private int readStringSize(int i) {
+        if (FabricProxy.config.getBungeeCord()) {
+            return Short.MAX_VALUE;
         }
 
-        return buf.readString(Short.MAX_VALUE);
-    }
-
-    @Override
-    public String getAddress() {
-        return address;
-    }
-
-    @Override
-    public void setAddress(String address) {
-        this.address = address;
+        return i;
     }
 }

src/main/java/one/oktw/mixin/ClientConnectionAccessor.java

@@ -10,8 +10,8 @@
 import net.minecraft.server.network.ServerHandshakeNetworkHandler;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
-import one.oktw.interfaces.IClientConnection;
-import one.oktw.interfaces.IHandshakeC2SPacket;
+import one.oktw.interfaces.BungeeClientConnection;
+import one.oktw.mixin.ClientConnectionAccessor;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -29,22 +29,21 @@ public class ServerHandshakeNetworkHandlerMixin {
     @Final
     private ClientConnection connection;
 
-    @Inject(method = "onHandshake", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "onHandshake", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerLoginNetworkHandler;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/ClientConnection;)V"))
     private void onProcessHandshakeStart(HandshakeC2SPacket packet, CallbackInfo ci) {
         if (config.getBungeeCord() && packet.getIntendedState().equals(NetworkState.LOGIN)) {
-            String[] split = ((IHandshakeC2SPacket) packet).getAddress().split("\00");
+            String[] split = ((HandshakeC2SPacketAccessor) packet).getAddress().split("\00");
             if (split.length == 3 || split.length == 4) {
-                ((IHandshakeC2SPacket) packet).setAddress(split[0]);
-                ((IClientConnection) connection).setRemoteAddress(new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) connection.getAddress()).getPort()));
-                ((IClientConnection) connection).setSpoofedUUID(UUIDTypeAdapter.fromString(split[2]));
+                ((ClientConnectionAccessor) connection).setAddress(new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) connection.getAddress()).getPort()));
+                ((BungeeClientConnection) connection).setSpoofedUUID(UUIDTypeAdapter.fromString(split[2]));
+
+                if (split.length == 4) {
+                    ((BungeeClientConnection) connection).setSpoofedProfile(gson.fromJson(split[3], Property[].class));
+                }
             } else {
                 Text disconnectMessage = new LiteralText("If you wish to use IP forwarding, please enable it in your BungeeCord config as well!");
                 connection.send(new LoginDisconnectS2CPacket(disconnectMessage));
                 connection.disconnect(disconnectMessage);
-                return;
-            }
-            if (split.length == 4) {
-                ((IClientConnection) connection).setSpoofedProfile(gson.fromJson(split[3], Property[].class));
             }
         }
     }