Alot more work done to make mixins in MangoBot possible...

Now no longer hard coded to load mixins... and you can have as many mixins as youd like!!!

Author: RealMangorage

build.gradle

@@ -75,7 +75,7 @@ dependencies {
     installer('org.mangorage:installer:4.0.20')
     bootstrap("org.mangorage:mangobotbootstrap:1.0.41-beta")
 
-    plugin("org.mangorage:mangobot:12.0.71")
+    plugin("org.mangorage:mangobot:12.0.72")
 
 
     // SpongeMixin...

src/main/java/module-info.java

@@ -1,3 +1,6 @@
+import org.mangorage.mangobotmixin.mixin.core.MangoBotMixinBlackboardImpl;
+import org.mangorage.mangobotmixin.mixin.transformer.SpongeMixinClassTransformerImpl;
+
 module org.mangorage.mangobotmixin {
     requires org.mangorage.mangobotcore;
     requires org.spongepowered.mixin;
@@ -6,11 +9,14 @@
 
     exports org.mangorage.mangobotmixin.plugin to org.mangorage.mangobotcore;
     exports org.mangorage.mangobotmixin.mixin.core to org.spongepowered.mixin;
+    exports org.mangorage.mangobotmixin.mixin to org.spongepowered.mixin;
+    exports org.mangorage.mangobotmixin.mixin.transformer to org.spongepowered.mixin;
 
 
-    provides org.mangorage.bootstrap.api.transformer.IClassTransformer with org.mangorage.mangobotmixin.mixin.SpongeMixinTransformer;
-    provides org.spongepowered.asm.service.IGlobalPropertyService with org.mangorage.mangobotmixin.mixin.core.MixinBlackboardImpl;
+    provides org.mangorage.bootstrap.api.transformer.IClassTransformer with SpongeMixinClassTransformerImpl;
+    provides org.spongepowered.asm.service.IGlobalPropertyService with MangoBotMixinBlackboardImpl;
     provides org.mangorage.mangobotcore.plugin.api.Plugin with org.mangorage.mangobotmixin.plugin.MangoBotMixinPlugin;
+    provides org.mangorage.mangobotcore.plugin.api.IPluginInfoGetter with org.mangorage.mangobotmixin.mixin.MetadataInfoGrabberImpl;
 
     uses org.mangorage.bootstrap.api.transformer.IClassTransformer;
     uses org.spongepowered.asm.service.IGlobalPropertyService;

src/main/java/org/mangorage/mangobotmixin/mixin/MetadataInfoGrabberImpl.java

@@ -0,0 +1,26 @@
+package org.mangorage.mangobotmixin.mixin;
+
+import org.mangorage.mangobotcore.plugin.api.IPluginInfoGetter;
+import org.mangorage.mangobotcore.plugin.api.Metadata;
+import org.spongepowered.asm.mixin.Mixins;
+
+import java.util.List;
+
+public final class MetadataInfoGrabberImpl implements IPluginInfoGetter {
+    @Override
+    public void onGet(List<Metadata> list) {
+        list
+                .forEach(container -> {
+                    final var extraMap = container.getExtraMap();
+                    if (extraMap != null) {
+                        final var mixins = (List<String>) extraMap.getKey("mixins", List.class);
+                        if (mixins != null) {
+                            for (String mixin : mixins) {
+                                System.out.println("Adding Mixin " + mixin);
+                                Mixins.addConfiguration(mixin);
+                            }
+                        }
+                    }
+                });
+    }
+}

src/main/java/org/mangorage/mangobotmixin/mixin/SpongeMixinImpl.java

@@ -1,41 +1,54 @@
 package org.mangorage.mangobotmixin.mixin;
 
-import org.mangorage.mangobotmixin.mixin.core.MangoBotMixinBootstrap;
-import org.mangorage.mangobotmixin.mixin.core.MixinServiceMangoBot;
-import org.mangorage.mangobotmixin.mixin.transformer.MangoBotTransformer;
+import org.mangorage.mangobotmixin.mixin.core.MangoBotMixinBootstrapImpl;
+import org.mangorage.mangobotmixin.mixin.core.MangoBotMixinServiceImpl;
 
 import org.spongepowered.asm.launch.MixinBootstrap;
 import org.spongepowered.asm.mixin.MixinEnvironment;
-import org.spongepowered.asm.mixin.Mixins;
+import org.spongepowered.asm.mixin.transformer.IMixinTransformer;
+import org.spongepowered.asm.mixin.transformer.IMixinTransformerFactory;
 
 import java.lang.reflect.Method;
 
 public final class SpongeMixinImpl {
-    private static final SpongeMixinImpl INSTANCE = new SpongeMixinImpl();
+    private static boolean loaded = false;
+    private static IMixinTransformerFactory factory;
+    private static IMixinTransformer transformer;
 
-    public static void load() {}
+    public static void setFactory(IMixinTransformerFactory factory) {
+        if (SpongeMixinImpl.factory != null) return;
+        SpongeMixinImpl.factory = factory;
+    }
+
+    public static void prepare() {
+        if (SpongeMixinImpl.transformer != null) return;
+        SpongeMixinImpl.transformer = factory.createTransformer();
+    }
+
+    public static IMixinTransformer getTransformer() {
+        return transformer;
+    }
+
+    public static void load() {
+        if (loaded) return;
+        loaded = true;
 
-    SpongeMixinImpl() {
         // Load
 //        System.setProperty("mixin.debug.verbose", "true");
 //        System.setProperty("mixin.debug", "true");
 //        System.setProperty("mixin.env.disableRefMap", "true");
 //        System.setProperty("mixin.checks", "true");
 
-        System.setProperty("mixin.bootstrapService", MangoBotMixinBootstrap.class.getName());
-        System.setProperty("mixin.service", MixinServiceMangoBot.class.getName());
+        System.setProperty("mixin.bootstrapService", MangoBotMixinBootstrapImpl.class.getName());
+        System.setProperty("mixin.service", MangoBotMixinServiceImpl.class.getName());
         System.setProperty("mixin.env.remapRefMap", "false");
 
         MixinBootstrap.init();
 
-        Mixins.addConfiguration("mangobotcore.mixins.json");
-
         completeMixinBootstrap();
-
-        // Mixin Extras Init
     }
 
-    private void completeMixinBootstrap() {
+    private static void completeMixinBootstrap() {
         // Move to the default phase.
         try {
             final Method method = MixinEnvironment.class.getDeclaredMethod("gotoPhase", MixinEnvironment.Phase.class);
@@ -45,8 +58,7 @@ private void completeMixinBootstrap() {
         } catch(final Exception exception) {
             exception.printStackTrace();
         }
-
-        MangoBotTransformer.getInstance().load();
+        prepare();
     }
 }
 

…ixin/mixin/core/MixinBlackboardImpl.java …in/core/MangoBotMixinBlackboardImpl.javasrc/main/java/org/mangorage/mangobotmixin/mixin/core/MixinBlackboardImpl.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinBlackboardImpl.java src/main/java/org/mangorage/mangobotmixin/mixin/core/MixinBlackboardImpl.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinBlackboardImpl.java

@@ -14,10 +14,10 @@
  * @author vectrix
  * @since 1.0.0
  */
-public final class MixinBlackboardImpl implements IGlobalPropertyService {
+public final class MangoBotMixinBlackboardImpl implements IGlobalPropertyService {
     private final Map<IPropertyKey, Object> map = new HashMap<>();
 
-    public MixinBlackboardImpl() {
+    public MangoBotMixinBlackboardImpl() {
     }
 
     public record Key(String name) implements IPropertyKey {}

…n/mixin/core/MangoBotMixinBootstrap.java …xin/core/MangoBotMixinBootstrapImpl.javasrc/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinBootstrap.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinBootstrapImpl.java src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinBootstrap.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinBootstrapImpl.java

@@ -2,7 +2,7 @@
 
 import org.spongepowered.asm.service.IMixinServiceBootstrap;
 
-public final class MangoBotMixinBootstrap implements IMixinServiceBootstrap {
+public final class MangoBotMixinBootstrapImpl implements IMixinServiceBootstrap {
     @Override
     public String getName() {
         return "MangoBotBootstrap";

…/mangobotmixin/mixin/MixinContainer.java …xin/core/MangoBotMixinContainerImpl.javasrc/main/java/org/mangorage/mangobotmixin/mixin/MixinContainer.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinContainerImpl.java src/main/java/org/mangorage/mangobotmixin/mixin/MixinContainer.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinContainerImpl.java

@@ -1,4 +1,4 @@
-package org.mangorage.mangobotmixin.mixin;
+package org.mangorage.mangobotmixin.mixin.core;
 
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.launch.platform.container.ContainerHandleURI;
@@ -7,14 +7,14 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-public final class MixinContainer extends ContainerHandleVirtual {
+public final class MangoBotMixinContainerImpl extends ContainerHandleVirtual {
     /**
      * Creates a new root container handle.
      *
      * @param name the name
      * @since 1.0.0
      */
-    public MixinContainer(final @NotNull String name) {
+    public MangoBotMixinContainerImpl(final @NotNull String name) {
         super(name);
     }
 

…age/mangobotmixin/mixin/MixinLogger.java …/mixin/core/MangoBotMixinLoggerImpl.javasrc/main/java/org/mangorage/mangobotmixin/mixin/MixinLogger.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinLoggerImpl.java src/main/java/org/mangorage/mangobotmixin/mixin/MixinLogger.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinLoggerImpl.java

@@ -1,4 +1,4 @@
-package org.mangorage.mangobotmixin.mixin;
+package org.mangorage.mangobotmixin.mixin.core;
 
 import org.spongepowered.asm.logging.ILogger;
 import org.spongepowered.asm.logging.Level;
@@ -7,14 +7,14 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class MixinLogger extends LoggerAdapterAbstract {
+public class MangoBotMixinLoggerImpl extends LoggerAdapterAbstract {
     private static final Map<String, ILogger> LOGGER_MAP = new ConcurrentHashMap<>();
 
     public static ILogger get(String name) {
-        return LOGGER_MAP.computeIfAbsent(name, MixinLogger::new);
+        return LOGGER_MAP.computeIfAbsent(name, MangoBotMixinLoggerImpl::new);
     }
 
-    protected MixinLogger(String id) {
+    protected MangoBotMixinLoggerImpl(String id) {
         super(id);
     }
 

…xin/mixin/core/MixinServiceMangoBot.java …mixin/core/MangoBotMixinServiceImpl.javasrc/main/java/org/mangorage/mangobotmixin/mixin/core/MixinServiceMangoBot.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinServiceImpl.java src/main/java/org/mangorage/mangobotmixin/mixin/core/MixinServiceMangoBot.java renamed to src/main/java/org/mangorage/mangobotmixin/mixin/core/MangoBotMixinServiceImpl.java

@@ -2,9 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mangorage.bootstrap.api.loader.MangoLoader;
-import org.mangorage.mangobotmixin.mixin.MixinContainer;
-import org.mangorage.mangobotmixin.mixin.MixinLogger;
-import org.mangorage.mangobotmixin.mixin.transformer.MangoBotTransformer;
+import org.mangorage.mangobotmixin.mixin.SpongeMixinImpl;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
@@ -29,9 +27,9 @@
 import java.util.Collection;
 import java.util.List;
 
-public final class MixinServiceMangoBot implements IMixinService, IClassProvider, IClassBytecodeProvider, ITransformerProvider, IClassTracker {
+public final class MangoBotMixinServiceImpl implements IMixinService, IClassProvider, IClassBytecodeProvider, ITransformerProvider, IClassTracker {
     private final ReEntranceLock lock = new ReEntranceLock(1);
-    private final MixinContainer container = new MixinContainer("mangobot");
+    private final MangoBotMixinContainerImpl container = new MangoBotMixinContainerImpl("mangobot");
 
     @Override
     public String getName() {
@@ -56,7 +54,7 @@ public MixinEnvironment.Phase getInitialPhase() {
     @Override
     public void offer(IMixinInternal iMixinInternal) {
         if (iMixinInternal instanceof IMixinTransformerFactory factory) {
-            MangoBotTransformer.getInstance().set(factory, container);
+            SpongeMixinImpl.setFactory(factory);
         }
     }
 
@@ -142,7 +140,7 @@ public MixinEnvironment.CompatibilityLevel getMaxCompatibilityLevel() {
 
     @Override
     public ILogger getLogger(String s) {
-        return MixinLogger.get(s);
+        return MangoBotMixinLoggerImpl.get(s);
     }
 
     @Override