Allow loading sorting fix from the classpath.

Author: covers1624

build.gradle

@@ -10,13 +10,6 @@ version = '1.0'
 group = 'net.minecraftforge.lex'
 archivesBaseName = 'legacyjavafixer'
 
-jar {
-    manifest {
-        attributes('TweakClass': 'net.minecraftforge.lex.legacyjavafixer.LegacyJavaFixer',
-                   'TweakOrder': -2147483648)
-    }
-}
-
 repositories {
     mavenCentral()
     maven {

src/main/java/net/minecraftforge/legacyjavafixer/sort/ClientWrapper.java

@@ -0,0 +1,28 @@
+package net.minecraftforge.legacyjavafixer.sort;
+
+import net.minecraft.launchwrapper.Launch;
+
+/**
+ * Created by covers1624 on 1/6/21.
+ */
+public class ClientWrapper {
+
+    private static final String FML_COREMODS_SYS_PROP = "fml.coreMods.load";
+    private static final String DUMMY_PLUGIN = "net.minecraftforge.legacyjavafixer.sort.LegacyJavaSortDummyLoadingPlugin";
+
+    public static void main(String[] args) {
+        injectDummyCoreMod();
+        Launch.main(args);
+    }
+
+    protected static void injectDummyCoreMod() {
+        String coreMods = System.getProperty(FML_COREMODS_SYS_PROP, ""); // Grab the existing sys prop.
+        if (!coreMods.isEmpty()) {
+            coreMods = DUMMY_PLUGIN + "," + coreMods; // Coremods were provided already, append to the beginning.
+        } else {
+            coreMods = DUMMY_PLUGIN;
+        }
+        //Set the sys prop back.
+        System.setProperty(FML_COREMODS_SYS_PROP, coreMods);
+    }
+}

src/main/java/net/minecraftforge/legacyjavafixer/sort/LegacyJavaSortDummyLoadingPlugin.java

@@ -0,0 +1,33 @@
+package net.minecraftforge.legacyjavafixer.sort;
+
+import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
+import net.minecraft.launchwrapper.Launch;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Used as a dummy plugin to add our cascading tweaker.
+ * This allows us to provide this tweaker via the '-Dfml.coreMods.load' system property.
+ * <p>
+ * Created by covers1624 on 1/6/21.
+ */
+@IFMLLoadingPlugin.SortingIndex (-2147483648)
+public class LegacyJavaSortDummyLoadingPlugin implements IFMLLoadingPlugin {
+
+    public LegacyJavaSortDummyLoadingPlugin() {
+        @SuppressWarnings ("unchecked")
+        List<String> tweakClasses = (List<String>) Launch.blackboard.get("TweakClasses");
+        // Add our tweaker to LaunchWrapper, this is done the same as FMLTweaker
+        tweakClasses.add("net.minecraftforge.legacyjavafixer.sort.LegacyJavaSortTweaker");
+    }
+
+    //@formatter:off
+    public String[] getLibraryRequestClass() { return new String[0]; } // 1.6.4 and bellow support.
+    @Override public String[] getASMTransformerClass() { return new String[0]; }
+    @Override public String getModContainerClass() { return null; }
+    @Override public String getSetupClass() { return null; }
+    @Override public void injectData(Map<String, Object> map) { }
+    @Override public String getAccessTransformerClass() { return null; }
+    //@formatter:on
+}

…lex/legacyjavafixer/LegacyJavaFixer.java …avafixer/sort/LegacyJavaSortTweaker.javasrc/main/java/net/minecraftforge/lex/legacyjavafixer/LegacyJavaFixer.java renamed to src/main/java/net/minecraftforge/legacyjavafixer/sort/LegacyJavaSortTweaker.java src/main/java/net/minecraftforge/lex/legacyjavafixer/LegacyJavaFixer.java renamed to src/main/java/net/minecraftforge/legacyjavafixer/sort/LegacyJavaSortTweaker.java

@@ -1,4 +1,4 @@
-package net.minecraftforge.lex.legacyjavafixer;
+package net.minecraftforge.legacyjavafixer.sort;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -21,9 +21,9 @@
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 
-public class LegacyJavaFixer implements ITweaker
+public class LegacyJavaSortTweaker implements ITweaker
 {
-    public LegacyJavaFixer()
+    public LegacyJavaSortTweaker()
     {
         @SuppressWarnings("unchecked")
         ListIterator<ITweaker> itr = ((List<ITweaker>)Launch.blackboard.get("Tweaks")).listIterator();

src/main/java/net/minecraftforge/legacyjavafixer/sort/ServerWrapper.java

@@ -0,0 +1,14 @@
+package net.minecraftforge.legacyjavafixer.sort;
+
+import cpw.mods.fml.relauncher.ServerLaunchWrapper;
+
+/**
+ * Created by covers1624 on 1/6/21.
+ */
+public class ServerWrapper extends ClientWrapper {
+
+    public static void main(String[] args) {
+        injectDummyCoreMod();
+        ServerLaunchWrapper.main(args);
+    }
+}