Progress on fixing stuff

Fox2Code · Fox2Code · commit e79eb8aedaae · 2023-11-04T21:34:33.000+01:00
diff --git a/client/src/main/java/com/fox2code/foxloader/client/mixins/MixinNetClientHandler.java b/client/src/main/java/com/fox2code/foxloader/client/mixins/MixinNetClientHandler.java
@@ -71,10 +71,12 @@ public void onHandlePluginMessage(Packet250PluginMessage packet250, CallbackInfo
         NetworkPlayer networkPlayer = (NetworkPlayer)
                 Minecraft.getInstance().thePlayer;
         if (ModLoader.FOX_LOADER_MOD_ID.equals(packet250.channel)) {
+            ModLoader.getModLoaderLogger().info("Got FoxLoader packet");
             this.isFoxLoader = true;
         }
         ModContainer modContainer = ModLoader.getModContainer(packet250.channel);
         if (networkPlayer != null && modContainer != null && packet250.data != null) {
+            ModLoader.getModLoaderLogger().info("Processing FoxLoader packet");
             modContainer.notifyReceiveServerPacket(networkPlayer, packet250.data);
         }
     }
diff --git a/client/src/main/java/com/fox2code/foxloader/loader/ClientModLoader.java b/client/src/main/java/com/fox2code/foxloader/loader/ClientModLoader.java
@@ -45,7 +45,8 @@ private static void computeClientHello() {
         final byte[] nullSHA256 = new byte[32];
         try {
             ArrayList<ClientHello.ClientModData> clientModData =
-                    new ArrayList<>(ModLoader.modContainers.size());
+                    new ArrayList<>(ModLoader.modContainers.size() +
+                            ModLoader.coreMods.size());
             for (File coreMod : ModLoader.coreMods) {
                 byte[] sha256 = NetUtils.hashOf(coreMod);
                 clientModData.add(new ClientHello.ClientModData(
@@ -76,6 +77,12 @@ public void onServerStart(NetworkPlayer.ConnectionType connectionType) {
         GameRegistryClient.resetMappings(connectionType.isServer);
     }
 
+    @Override
+    public void onReceiveServerPacket(NetworkPlayer networkPlayer, byte[] data) {
+        ModLoader.foxLoader.logger.info("Received server packet");
+        LoaderNetworkManager.executeServerPacketData(networkPlayer, data);
+    }
+
     @Override
     void loaderHandleServerHello(NetworkPlayer networkPlayer, ServerHello serverHello) {
         ModLoader.foxLoader.logger.info("Initializing id translator");
diff --git a/common/src/main/java/com/fox2code/foxloader/launcher/StackTraceStringifier.java b/common/src/main/java/com/fox2code/foxloader/launcher/StackTraceStringifier.java
@@ -1,5 +1,6 @@
 package com.fox2code.foxloader.launcher;
 
+import com.fox2code.foxloader.launcher.utils.FastThreadLocal;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -37,8 +38,8 @@ public String stringify(Throwable throwable) {
         return stringBuilder.toString();
     }
 
-    private static final ThreadLocal<StackTraceStringifier> stringifier =
-            ThreadLocal.withInitial(StackTraceStringifier::new);
+    private static final FastThreadLocal<StackTraceStringifier> stringifier =
+            FastThreadLocal.withInitial(StackTraceStringifier::new);
 
     public static String stringifyStackTrace(Throwable throwable) {
         return stringifier.get().stringify(throwable);
diff --git a/common/src/main/java/com/fox2code/foxloader/launcher/utils/FastThreadLocal.java b/common/src/main/java/com/fox2code/foxloader/launcher/utils/FastThreadLocal.java
@@ -0,0 +1,97 @@
+package com.fox2code.foxloader.launcher.utils;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * Faster implementation of {@link ThreadLocal} made to work better at low threads counts.
+ */
+public class FastThreadLocal<T> extends ThreadLocal<T> {
+    private static final FastThreadLocalCache<?> NO_CACHE = new FastThreadLocalCache<>(null);
+    // Java cache value per thread to improve performance.
+    // Usually we would want to use volatile for fields accessed from multiple threads.
+    // but for this, not using volatile is on purpose and works in our favor.
+    private FastThreadLocalCache<T> fastThreadLocalCache;
+    private final boolean withCustomSupplier;
+
+    @SuppressWarnings("unchecked")
+    private static <T>  FastThreadLocalCache<T> noCache() {
+        return (FastThreadLocalCache<T>) NO_CACHE;
+    }
+
+    public static <S> FastThreadLocal<S> withInitial(Supplier<? extends S> supplier) {
+        return new SuppliedFastThreadLocal<>(supplier);
+    }
+
+    public FastThreadLocal() {
+        boolean customSupplier = true;
+        try { // Assume custom supplier if this fails
+            customSupplier = this.getClass().getMethod("initialValue")
+                    .getDeclaringClass() != Thread.class;
+        } catch (NoSuchMethodException ignored) {}
+        this.withCustomSupplier = customSupplier;
+        this.fastThreadLocalCache = customSupplier ? noCache() :
+                new FastThreadLocalCache<>(Thread.currentThread());
+    }
+
+    @Override
+    public final T get() {
+        final Thread thread = Thread.currentThread();
+        final FastThreadLocalCache<T> fastThreadLocalCache = this.fastThreadLocalCache;
+        if (fastThreadLocalCache.thread == thread)
+            return fastThreadLocalCache.value;
+        return (this.fastThreadLocalCache = new FastThreadLocalCache<>(thread, super.get())).value;
+    }
+
+    @Override
+    public final void set(T value) {
+        final Thread thread = Thread.currentThread();
+        final FastThreadLocalCache<T> fastThreadLocalCache = this.fastThreadLocalCache;
+        if (fastThreadLocalCache.thread == thread)
+            fastThreadLocalCache.value = value;
+        if (value == null && !this.withCustomSupplier)
+            super.remove();
+        else
+            super.set(value);
+    }
+
+    @Override
+    @SuppressWarnings("ThreadLocalSetWithNull")
+    public final void remove() {
+        if (this.withCustomSupplier) {
+            // Since we use volatile for speed
+            // and do not lock fastThreadLocalCache
+            // we cannot remove cache conditionally
+            // for thread safety reason
+            this.fastThreadLocalCache = noCache();
+            super.remove();
+        } else this.set(null);
+    }
+
+    private static class FastThreadLocalCache<T> {
+        private final Thread thread;
+        private T value;
+
+        private FastThreadLocalCache(Thread thread) {
+            this.thread = thread;
+        }
+
+        private FastThreadLocalCache(Thread thread, T value) {
+            this.thread = thread;
+            this.value = value;
+        }
+    }
+
+    static final class SuppliedFastThreadLocal<T> extends FastThreadLocal<T> {
+        private final Supplier<? extends T> supplier;
+
+        SuppliedFastThreadLocal(Supplier<? extends T> supplier) {
+            this.supplier = Objects.requireNonNull(supplier);
+        }
+
+        @Override
+        protected T initialValue() {
+            return Objects.requireNonNull(supplier.get(), "Initial value cannot be null");
+        }
+    }
+}
diff --git a/common/src/main/java/com/fox2code/foxloader/loader/LoaderNetworkManager.java b/common/src/main/java/com/fox2code/foxloader/loader/LoaderNetworkManager.java
@@ -1,5 +1,7 @@
 package com.fox2code.foxloader.loader;
 
+import com.fox2code.foxloader.launcher.utils.IOUtils;
+import com.fox2code.foxloader.launcher.utils.NetUtils;
 import com.fox2code.foxloader.loader.packet.ClientHello;
 import com.fox2code.foxloader.loader.packet.FoxPacket;
 import com.fox2code.foxloader.loader.packet.ServerHello;
@@ -16,7 +18,6 @@
 
 final class LoaderNetworkManager {
     static void executeClientPacketData(NetworkPlayer networkPlayer, byte[] data) {
-
         try (DataInputStream dataInputStream =
                      new NetworkDataInputStream(new ByteArrayInputStream(data))) {
             int packetId = dataInputStream.readUnsignedByte();
@@ -50,9 +51,10 @@ static void sendClientPacketData(NetworkPlayer networkPlayer, FoxPacket foxPacke
     }
 
     static void executeServerPacketData(NetworkPlayer networkPlayer, byte[] data) {
-        byte compressed = data[0];
         InputStream inputStream = new ByteArrayInputStream(data);
         try {
+            int compressed = inputStream.read();
+            ModLoader.foxLoader.logger.info("Compression: " + compressed);
             switch (compressed) {
                 case 0:
                     break;
@@ -63,14 +65,32 @@ static void executeServerPacketData(NetworkPlayer networkPlayer, byte[] data) {
                     inputStream = new DeflaterInputStream(inputStream);
                     break;
                 default:
+                    ModLoader.foxLoader.logger.log(Level.WARNING, "Unknown compression: " + compressed);
                     return;
             }
         } catch (IOException e) {
-            ModLoader.foxLoader.logger.log(Level.WARNING, "Failed to read server packet", e);
+            ModLoader.foxLoader.logger.log(Level.SEVERE, "Failed to read server packet", e);
         }
         try (DataInputStream dataInputStream =
                      new NetworkDataInputStream(inputStream)) {
             int packetId = dataInputStream.readUnsignedByte();
+            ModLoader.foxLoader.logger.info("PacketID: " + packetId);
+
+            if (packetId == 120) {
+                StringBuilder stringBuilder = new StringBuilder();
+                try {
+                    while (true)
+                        stringBuilder.append(Integer.toHexString(dataInputStream.readUnsignedByte())).append(" ");
+                } catch (Exception e) {
+                    ModLoader.foxLoader.logger.info("PacketOfDeath: " + stringBuilder);
+                    stringBuilder.setLength(0);
+                    for (byte b : data) {
+                        stringBuilder.append(String.format("%02X", b));
+                    }
+                    ModLoader.foxLoader.logger.info("RAW Data: " + stringBuilder);
+                    System.exit(1);
+                }
+            }
             //noinspection SwitchStatementWithTooFewBranches
             switch (packetId) {
                 case 0:
@@ -81,7 +101,9 @@ static void executeServerPacketData(NetworkPlayer networkPlayer, byte[] data) {
                                     networkPlayer, serverHello);
                     break;
             }
-        } catch (IOException ignored) {}
+        } catch (IOException e) {
+            ModLoader.foxLoader.logger.log(Level.SEVERE, "Failed to read server packet", e);
+        }
     }
 
     static void sendServerPacketData(NetworkPlayer networkPlayer, FoxPacket foxPacket) {
diff --git a/common/src/main/java/com/fox2code/foxloader/loader/ModContainer.java b/common/src/main/java/com/fox2code/foxloader/loader/ModContainer.java
@@ -1,6 +1,7 @@
 package com.fox2code.foxloader.loader;
 
 import com.fox2code.foxloader.launcher.FoxLauncher;
+import com.fox2code.foxloader.launcher.utils.FastThreadLocal;
 import com.fox2code.foxloader.loader.lua.LuaVMHelper;
 import com.fox2code.foxloader.loader.packet.ClientHello;
 import com.fox2code.foxloader.loader.transformer.PreClassTransformer;
@@ -15,11 +16,12 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public final class ModContainer {
-    private static final ThreadLocal<ModContainer> activeModContainer = new ThreadLocal<>();
+    private static final FastThreadLocal<ModContainer> activeModContainer = new FastThreadLocal<>();
     // tmp is used to make getModContainer work in constructor.
     static ModContainer tmp;
     public final File file;
@@ -61,6 +63,7 @@ public final class ModContainer {
         this.description = description;
         this.jitpack = jitpack;
         this.logger = Logger.getLogger(name);
+        FoxLauncher.installLoggerHelperOn(this.logger);
         this.unofficial = unofficial;
         this.injected = injected;
         if (ModLoader.DEV_MODE) {
@@ -85,8 +88,22 @@ static void setActiveModContainer(ModContainer modContainer)  {
 
     public void runInContext(Runnable runnable) {
         ModContainer modContainer = markActive();
-        runnable.run();
-        setActiveModContainer(modContainer);
+        try {
+            runnable.run();
+        } finally {
+            setActiveModContainer(modContainer);
+        }
+    }
+
+    public <T, R> R runFuncInContext(T thing, Function<T, R> func) {
+        ModContainer modContainer = markActive();
+        R result;
+        try {
+            result = func.apply(thing);
+        } finally {
+            setActiveModContainer(modContainer);
+        }
+        return result;
     }
 
     public Mod getClientMod() {
diff --git a/dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy b/dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy
@@ -365,6 +365,27 @@ class GradlePlugin implements Plugin<Project> {
                 try {
                     System.out.println("Decompiling patched ReIndev " + logSideName)
                     new FoxLoaderDecompiler(unpickedJarFox, sourcesJarFox, client).decompile()
+                } catch (OutOfMemoryError oom) {
+                    boolean deleteFailed = false
+                    try {
+                        closeJarFileSystem(unpickedJarFox)
+                        closeJarFileSystem(sourcesJarFox)
+                    } finally {
+                        if (!sourcesJarFox.delete()) {
+                            sourcesJarFox.deleteOnExit()
+                            deleteFailed = true
+                        }
+                    }
+                    Throwable root = oom
+                    while (root.getCause() != null)
+                        root = root.getCause()
+
+                    root.initCause(deleteFailed ? // If delete failed, restart
+                            UserMessage.UNRECOVERABLE_STATE_DECOMPILE :
+                            client ? UserMessage.FAIL_DECOMPILE_CLIENT :
+                                    UserMessage.FAIL_DECOMPILE_SERVER)
+                    if (deleteFailed) throw oom // If delete failed, we can't recover
+                    oom.printStackTrace()
                 } catch (Throwable throwable) {
                     boolean deleteFailed = false
                     try {
diff --git a/final/src/main/resources/mmc/instance.cfg b/final/src/main/resources/mmc/instance.cfg
@@ -1,6 +1,8 @@
+[General]
 InstanceType=OneSix
 LogPrePostOutput=true
 JoinServerOnLaunch=false
+IgnoreJavaCompatibility=true
 OverrideCommands=false
 OverrideConsole=false
 OverrideGameTime=false
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 
 # FoxLoader properties
-foxloader.version=1.2.23
+foxloader.version=1.2.24
 foxloader.lastReIndevTransformerChanges=1.2.22
 
 # ReIndev properties
diff --git a/server/src/main/java/com/fox2code/foxloader/loader/ServerModLoader.java b/server/src/main/java/com/fox2code/foxloader/loader/ServerModLoader.java
@@ -1,11 +1,13 @@
 package com.fox2code.foxloader.loader;
 
+import com.fox2code.foxloader.launcher.FoxLauncher;
 import com.fox2code.foxloader.loader.packet.ClientHello;
 import com.fox2code.foxloader.network.NetworkPlayer;
 import com.fox2code.foxloader.registry.CommandCompat;
 import com.fox2code.foxloader.registry.GameRegistryServer;
 import com.fox2code.foxloader.server.ServerCommandWrapper;
 import com.fox2code.foxloader.server.ServerCommandWrapper4ReIndevPatches;
+import com.fox2code.foxloader.server.network.NetworkPlayerImpl;
 import com.fox2code.foxloader.updater.UpdateManager;
 import net.minecraft.mitask.PlayerCommandHandler;
 import net.minecraft.server.MinecraftServer;
@@ -23,6 +25,16 @@ public static void launchModdedServer(String... args) {
     }
 
     public static void notifyNetworkPlayerJoined(NetworkPlayer networkPlayer) {
+        if (networkPlayer.hasFoxLoader()) {
+            ModLoader.getModLoaderLogger().info("Starting Thread check");
+            new Thread(() -> {
+                try {
+                    Thread.sleep(2500);
+                    if (!((NetworkPlayerImpl) networkPlayer).hasClientHello())
+                        networkPlayer.kick("You have a broken and outdated version of FoxLoader");
+                } catch (InterruptedException ignored) {}
+            }, "Async - Client Hello Player Check").start();
+        }
         for (ModContainer modContainer : ModLoader.modContainers.values()) {
             modContainer.notifyNetworkPlayerJoined(networkPlayer);
         }
@@ -66,6 +78,7 @@ public void onReceiveClientPacket(NetworkPlayer networkPlayer, byte[] data) {
 
     @Override
     void loaderHandleClientHello(NetworkPlayer networkPlayer, ClientHello clientHello) {
+        ((NetworkPlayerImpl) networkPlayer).notifyClientHello();
         for (ModContainer modContainer : ModLoader.modContainers.values()) {
             modContainer.notifyNetworkPlayerHello(networkPlayer, clientHello);
         }
diff --git a/server/src/main/java/com/fox2code/foxloader/registry/GameRegistryServer.java b/server/src/main/java/com/fox2code/foxloader/registry/GameRegistryServer.java
@@ -345,6 +345,7 @@ public int compare(Object var1, Object var2) {
     // END Common code //
 
     public void sendRegistryData(EntityPlayerMP networkPlayer) {
+        ModLoader.getModLoaderLogger().info("Player " + networkPlayer.username + " has FoxLoader");
         ((NetworkPlayerImpl) networkPlayer).sendNetworkDataRaw(
                 ModLoader.FOX_LOADER_MOD_ID, serverHello);
     }
diff --git a/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinEntityPlayerMP.java b/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinEntityPlayerMP.java
diff --git a/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinNetServerHandler.java b/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinNetServerHandler.java
diff --git a/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinWorld.java b/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinWorld.java
diff --git a/server/src/main/java/com/fox2code/foxloader/server/network/NetServerHandlerAccessor.java b/server/src/main/java/com/fox2code/foxloader/server/network/NetServerHandlerAccessor.java
diff --git a/server/src/main/java/com/fox2code/foxloader/server/network/NetworkPlayerImpl.java b/server/src/main/java/com/fox2code/foxloader/server/network/NetworkPlayerImpl.java

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,12 @@ public void onHandlePluginMessage(Packet250PluginMessage packet250, CallbackInfo`
`71`	`71`	`NetworkPlayer networkPlayer = (NetworkPlayer)`
`72`	`72`	`Minecraft.getInstance().thePlayer;`
`73`	`73`	`if (ModLoader.FOX_LOADER_MOD_ID.equals(packet250.channel)) {`
	`74`	`+ ModLoader.getModLoaderLogger().info("Got FoxLoader packet");`
`74`	`75`	`this.isFoxLoader = true;`
`75`	`76`	`}`
`76`	`77`	`ModContainer modContainer = ModLoader.getModContainer(packet250.channel);`
`77`	`78`	`if (networkPlayer != null && modContainer != null && packet250.data != null) {`
	`79`	`+ ModLoader.getModLoaderLogger().info("Processing FoxLoader packet");`
`78`	`80`	`modContainer.notifyReceiveServerPacket(networkPlayer, packet250.data);`
`79`	`81`	`}`
`80`	`82`	`}`