Remove OptifabricMixinPlugin in favor of OptifabricSetup

Chocohead · Sep 25, 2023 · a50939d · a50939d
1 parent 85ff607
commit a50939d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/src/main/java/me/modmuss50/optifabric/compat/OptifabricMixinPlugin.java b/src/main/java/me/modmuss50/optifabric/compat/OptifabricMixinPlugin.java
diff --git a/src/main/java/me/modmuss50/optifabric/mod/OptifabricSetup.java b/src/main/java/me/modmuss50/optifabric/mod/OptifabricSetup.java
@@ -29,8 +29,11 @@
 import net.fabricmc.loader.util.version.SemanticVersionImpl;
 import net.fabricmc.loader.util.version.SemanticVersionPredicateParser;
 
+import me.modmuss50.optifabric.compat.MixinFixerExtension;
+import me.modmuss50.optifabric.compat.OptifabricMixinErrorHandler;
 import me.modmuss50.optifabric.mod.OptifineVersion.JarType;
 import me.modmuss50.optifabric.patcher.ClassCache;
+import me.modmuss50.optifabric.util.MixinInternals;
 import me.modmuss50.optifabric.util.RemappingUtils;
 
 import com.chocohead.mm.api.ClassTinkerers;
@@ -48,6 +51,9 @@ public class OptifabricSetup implements Runnable {
 	//This is called early on to allow us to get the transformers in before minecraft starts
 	@Override
 	public void run() {
+		MixinInternals.registerExtension(new MixinFixerExtension());
+		Mixins.registerErrorHandlerClass(OptifabricMixinErrorHandler.class.getName());
+
 		OptifineInjector injector;
 		try {
 			Pair<File, ClassCache> runtime = OptifineSetup.getRuntime();

diff --git a/src/main/resources/optifabric.mixins.json b/src/main/resources/optifabric.mixins.json
@@ -2,7 +2,6 @@
   "required": true,
   "package": "me.modmuss50.optifabric.mixin",
   "compatibilityLevel": "JAVA_8",
-  "plugin": "me.modmuss50.optifabric.compat.OptifabricMixinPlugin",
   "mixins": [
     "MixinTitleScreen",
     "CrashReportMixin"