Remove system.exit to make FML happy (#12)

* remove system.exit * update buildscript, update dependencies, spotless * fix shadow issues
GTNewHorizons · Dec 20, 2023 · e44ef99 · e44ef99
1 parent cee6b6f
commit e44ef99
Show file tree

Hide file tree

Showing 183 changed files with 1,385 additions and 904 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/gradle.properties b/gradle.properties
@@ -58,6 +58,11 @@ containsMixinsAndOrCoreModOnly = false
 # If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.
 usesShadowedDependencies = true
+# If disabled, won't remove unused classes from shaded dependencies. Some libraries use reflection to access
+# their own classes, making the minimization unreliable.
+minimizeShadowedDependencies = false
+# If disabled, won't rename the shadowed classes.
+relocateShadowedDependencies = true
 
 # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
 # projects. New projects should not use this parameter.

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/repositories.gradle b/repositories.gradle
@@ -1,19 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name 'GTNH Maven'
-        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-        allowInsecureProtocol
-    }
-    mavenLocal()
-    mavenCentral()
-    maven {
-        name 'gt'
-        url 'https://gregtech.overminddl1.com/'
-    }
-    maven {
-        name 'Mobius Repo'
-        url 'http://mobiusstrip.eu/maven'
-    }
 }
diff --git a/src/ClientTesting.py b/src/ClientTesting.py
@@ -1,4 +1,7 @@
-import asyncore, socket, binascii
+import asyncore
+import binascii
+import socket
+
 
 class ClientTest(asyncore.dispatcher):
 
@@ -27,4 +30,4 @@ def writable(self):
 		return (len(self.buffer) > 0)
 
 client = ClientTest('localhost', 25566)
-asyncore.loop()
+asyncore.loop()
diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/CoreTransformer.java b/src/main/java/mcp/mobius/mobiuscore/asm/CoreTransformer.java
@@ -3,19 +3,26 @@
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 
-import mcp.mobius.mobiuscore.asm.transformers.common.*;
-import mcp.mobius.mobiuscore.asm.transformers.crucible.TransformerWorldCrucible;
-import mcp.mobius.mobiuscore.asm.transformers.forge.TransformerWorld;
-import mcp.mobius.mobiuscore.asm.transformers.kcauldron.TransformerWorldKCauldron;
-import mcp.mobius.mobiuscore.asm.transformers.mcpc.TransformerWorldCauldron;
-import mcp.mobius.mobiuscore.asm.transformers.thermos.TransformerWorldThermos;
-
 import net.minecraft.launchwrapper.IClassTransformer;
 
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.util.TraceClassVisitor;
 
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerASMEventHandler;
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerFMLCommonHandler;
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerFMLOutboundHandler;
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerMessageDeserializer;
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerMessageSerializer;
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerRenderManager;
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerTERenderer;
+import mcp.mobius.mobiuscore.asm.transformers.common.TransformerWorldServer;
+import mcp.mobius.mobiuscore.asm.transformers.crucible.TransformerWorldCrucible;
+import mcp.mobius.mobiuscore.asm.transformers.forge.TransformerWorld;
+import mcp.mobius.mobiuscore.asm.transformers.kcauldron.TransformerWorldKCauldron;
+import mcp.mobius.mobiuscore.asm.transformers.mcpc.TransformerWorldCauldron;
+import mcp.mobius.mobiuscore.asm.transformers.thermos.TransformerWorldThermos;
+
 public class CoreTransformer implements IClassTransformer {
 
     public CoreTransformer() {

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/TransformerBase.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/TransformerBase.java
@@ -9,10 +9,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import mcp.mobius.mobiuscore.asm.CoreDescription;
-import mcp.mobius.mobiuscore.asm.MethodDescriptor;
-import mcp.mobius.mobiuscore.asm.Opcode;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -28,6 +24,10 @@
 import org.objectweb.asm.tree.TypeInsnNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
+import mcp.mobius.mobiuscore.asm.CoreDescription;
+import mcp.mobius.mobiuscore.asm.MethodDescriptor;
+import mcp.mobius.mobiuscore.asm.Opcode;
+
 public abstract class TransformerBase {
 
     HashMap<String, List<MethodDescriptor>> methodsToOverwrite = new HashMap<String, List<MethodDescriptor>>();

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerASMEventHandler.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerASMEventHandler.java
@@ -1,17 +1,18 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import static org.objectweb.asm.Opcodes.*;
-
-import mcp.mobius.mobiuscore.asm.Opcode;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import mcp.mobius.mobiuscore.asm.Opcode;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerASMEventHandler extends TransformerBase {
 
     /* SHOULD WORK BOTH SIDES */

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerFMLCommonHandler.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerFMLCommonHandler.java
@@ -1,16 +1,16 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.Opcode;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.Opcode;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerFMLCommonHandler extends TransformerBase {
 
     // (Ljava/util/EnumSet<Lcpw/mods/fml/common/TickType;>;Lcpw/mods/fml/relauncher/Side;[Ljava/lang/Object;)V

diff --git a/...ain/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerFMLOutboundHandler.java b/...ain/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerFMLOutboundHandler.java
@@ -1,15 +1,15 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.Opcode;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import mcp.mobius.mobiuscore.asm.Opcode;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerFMLOutboundHandler extends TransformerBase {
 
     private static String FMLOH_WRITE;

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerFMLProxyPacket.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerFMLProxyPacket.java
@@ -1,16 +1,16 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.Opcode;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.Opcode;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerFMLProxyPacket extends TransformerBase {
 
     private static String FMLPP_PROCESS;

diff --git a/...in/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerMessageDeserializer.java b/...in/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerMessageDeserializer.java
@@ -1,9 +1,5 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -14,6 +10,10 @@
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerMessageDeserializer extends TransformerBase {
 
     private static String DESERIALIZER_DECODE;

diff --git a/...main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerMessageSerializer.java b/...main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerMessageSerializer.java
@@ -1,9 +1,5 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -14,6 +10,10 @@
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerMessageSerializer extends TransformerBase {
 
     private static String SERIALIZER_ENCODE;

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerRenderManager.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerRenderManager.java
@@ -1,9 +1,5 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -14,6 +10,10 @@
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerRenderManager extends TransformerBase {
 
     // private static String RM_RENDERENT;

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerTERenderer.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerTERenderer.java
@@ -1,9 +1,5 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -14,6 +10,10 @@
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerTERenderer extends TransformerBase {
 
     private static String TER_RENDER;

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerWorldServer.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/common/TransformerWorldServer.java
@@ -1,9 +1,5 @@
 package mcp.mobius.mobiuscore.asm.transformers.common;
 
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -14,6 +10,10 @@
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerWorldServer extends TransformerBase {
 
     private static String WORLDSERVER_TICK;

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/crucible/TransformerWorldCrucible.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/crucible/TransformerWorldCrucible.java
@@ -1,15 +1,19 @@
 package mcp.mobius.mobiuscore.asm.transformers.crucible;
 
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LineNumberNode;
+import org.objectweb.asm.tree.MethodNode;
+
 import mcp.mobius.mobiuscore.asm.CoreDescription;
 import mcp.mobius.mobiuscore.asm.ObfTable;
 import mcp.mobius.mobiuscore.asm.Opcode;
 import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
 import mcp.mobius.mobiuscore.profiler.ProfilerSection;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.tree.*;
-
 public class TransformerWorldCrucible extends TransformerBase {
 
     private static String WORLD_UPDATEENTITIES;

diff --git a/src/main/java/mcp/mobius/mobiuscore/asm/transformers/forge/TransformerWorld.java b/src/main/java/mcp/mobius/mobiuscore/asm/transformers/forge/TransformerWorld.java
@@ -1,11 +1,5 @@
 package mcp.mobius.mobiuscore.asm.transformers.forge;
 
-import mcp.mobius.mobiuscore.asm.CoreDescription;
-import mcp.mobius.mobiuscore.asm.ObfTable;
-import mcp.mobius.mobiuscore.asm.Opcode;
-import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
-import mcp.mobius.mobiuscore.profiler.ProfilerSection;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.AbstractInsnNode;
@@ -14,6 +8,12 @@
 import org.objectweb.asm.tree.LineNumberNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import mcp.mobius.mobiuscore.asm.CoreDescription;
+import mcp.mobius.mobiuscore.asm.ObfTable;
+import mcp.mobius.mobiuscore.asm.Opcode;
+import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
+import mcp.mobius.mobiuscore.profiler.ProfilerSection;
+
 public class TransformerWorld extends TransformerBase {
 
     private static String WORLD_UPDATEENTITIES;

diff --git a/...main/java/mcp/mobius/mobiuscore/asm/transformers/kcauldron/TransformerWorldKCauldron.java b/...main/java/mcp/mobius/mobiuscore/asm/transformers/kcauldron/TransformerWorldKCauldron.java
@@ -1,15 +1,19 @@
 package mcp.mobius.mobiuscore.asm.transformers.kcauldron;
 
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LineNumberNode;
+import org.objectweb.asm.tree.MethodNode;
+
 import mcp.mobius.mobiuscore.asm.CoreDescription;
 import mcp.mobius.mobiuscore.asm.ObfTable;
 import mcp.mobius.mobiuscore.asm.Opcode;
 import mcp.mobius.mobiuscore.asm.transformers.TransformerBase;
 import mcp.mobius.mobiuscore.profiler.ProfilerSection;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.tree.*;
-
 public class TransformerWorldKCauldron extends TransformerBase {
 
     private static String WORLD_UPDATEENTITIES;