From 56b13f7fbba5550a6c77966726ab414da85f0a9b Mon Sep 17 00:00:00 2001
From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Date: Sat, 11 Jun 2022 17:35:22 +0200
Subject: loading plugin

---
 .../cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java')

diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java b/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java
index 825dab8..7ab9d4c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java
@@ -4,18 +4,20 @@ import cc.polyfrost.oneconfig.internal.init.OneConfigInit;
 import cc.polyfrost.oneconfig.internal.plugin.asm.ClassTransformer;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Set;
 
-public class LoadingPlugin {
+public class LoadingPlugin implements IFMLLoadingPlugin {
 
     /**
      * Taken from LWJGLTwoPointFive under The Unlicense
      * <a href="https://github.com/DJtheRedstoner/LWJGLTwoPointFive/blob/master/LICENSE/">https://github.com/DJtheRedstoner/LWJGLTwoPointFive/blob/master/LICENSE/</a>
      */
     public LoadingPlugin() {
+        if (Launch.blackboard.containsKey("oneconfig.init.initialized")) return;
         try {
             Field f_exceptions = LaunchClassLoader.class.getDeclaredField("classLoaderExceptions");
             f_exceptions.setAccessible(true);
@@ -28,23 +30,28 @@ public class LoadingPlugin {
         }
     }
 
+    @Override
     public String[] getASMTransformerClass() {
+        if (Launch.blackboard.containsKey("oneconfig.init.registered_transformer")) return new String[]{};
         Launch.blackboard.put("oneconfig.init.registered_transformer", true);
         return new String[]{ClassTransformer.class.getName()};
     }
 
+    @Override
     public String getModContainerClass() {
         return null;
     }
 
+    @Override
     public String getSetupClass() {
         return null;
     }
 
+    @Override
     public void injectData(Map<String, Object> data) {
-
     }
 
+    @Override
     public String getAccessTransformerClass() {
         return null;
     }
-- 
cgit 


From 7f28a19a6e11ab7cddeb51caffa76b1ad71cfeae Mon Sep 17 00:00:00 2001
From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Date: Sat, 11 Jun 2022 18:21:31 +0200
Subject: fix things

---
 build.gradle.kts                                                        | 1 -
 gradle.properties                                                       | 2 +-
 src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java')

diff --git a/build.gradle.kts b/build.gradle.kts
index db12bea..6232699 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -237,7 +237,6 @@ tasks {
                     "TweakOrder" to "0",
                     "MixinConfigs" to "mixins.oneconfig.json",
                     "TweakClass" to "org.spongepowered.asm.launch.MixinTweaker",
-                    "FMLCorePlugin" to "cc.polyfrost.oneconfig.internal.plugin.LoadingPlugin",
                     "FMLCorePluginContainsFMLMod" to "lol"
                 )
             )
diff --git a/gradle.properties b/gradle.properties
index d4390fc..c7ef230 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 mod_name = OneConfig
 mod_id = oneconfig
-mod_version = 0.1.0-alpha7
+mod_version = 0.1.0-alpha8
 
 essential.defaults.loom=0
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java b/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java
index 7ab9d4c..cdd0d83 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/plugin/LoadingPlugin.java
@@ -17,7 +17,6 @@ public class LoadingPlugin implements IFMLLoadingPlugin {
      * <a href="https://github.com/DJtheRedstoner/LWJGLTwoPointFive/blob/master/LICENSE/">https://github.com/DJtheRedstoner/LWJGLTwoPointFive/blob/master/LICENSE/</a>
      */
     public LoadingPlugin() {
-        if (Launch.blackboard.containsKey("oneconfig.init.initialized")) return;
         try {
             Field f_exceptions = LaunchClassLoader.class.getDeclaredField("classLoaderExceptions");
             f_exceptions.setAccessible(true);
@@ -32,7 +31,6 @@ public class LoadingPlugin implements IFMLLoadingPlugin {
 
     @Override
     public String[] getASMTransformerClass() {
-        if (Launch.blackboard.containsKey("oneconfig.init.registered_transformer")) return new String[]{};
         Launch.blackboard.put("oneconfig.init.registered_transformer", true);
         return new String[]{ClassTransformer.class.getName()};
     }
-- 
cgit