Add MixinSquared

Author: Wyvest

bootstrap/build.gradle.kts

@@ -32,6 +32,9 @@ repositories {
     maven("https://jitpack.io") {
         content { includeGroupAndSubgroups("com.github") }
     }
+    maven("https://maven.bawnorton.com/releases") {
+        content { includeGroup("com.github.bawnorton.mixinsquared") }
+    }
 }
 
 dependencies {

buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt

@@ -230,6 +230,7 @@ fun Project.provideIncludedDependencies(version: Triple<Int, Int, Int>?, loader:
         deps.add(libs.findLibrary("asm").get().get())
     }
     deps.add(libs.findLibrary("mixin-extras").get().get())
+    deps.add(libs.findLibrary("mixin-squared").get().get())
     val actualDeps = mutableListOf<OCDependency>()
     for (dep in deps) {
         actualDeps.add(OCDependency(dep))

gradle/libs.versions.toml

@@ -28,6 +28,7 @@ lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader
 # Legacy only
 mixin = "0.8.4+build.6"
 mixin-extras = "0.5.0"
+mixin-squared = "0.3.7-beta.1"
 asm = "5.2"
 brigadier = "1.0.18"
 
@@ -51,6 +52,7 @@ junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-bom" }
 
 mixin = { module = "org.polyfrost:polymixin", version.ref = "mixin" }
 mixin-extras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixin-extras" }
+mixin-squared = { module = "com.github.bawnorton.mixinsquared:mixinsquared-common", version.ref = "mixin-squared" }
 asm = { module = "org.ow2.asm:asm-debug-all", version.ref = "asm" }
 
 brigadier = { module = "com.mojang:brigadier", version.ref = "brigadier" }

minecraft/build.gradle.kts

@@ -93,6 +93,9 @@ repositories {
     maven("https://maven.azureaaron.net/releases") {
         content { includeGroup("net.azureaaron") }
     }
+    maven("https://maven.bawnorton.com/releases") {
+        content { includeGroup("com.github.bawnorton.mixinsquared") }
+    }
 }
 
 if (mcData.isLegacyForge) { // Quick substitution for relaunch in dev env, so that mixinextras works properly (yay!)
@@ -297,6 +300,7 @@ dependencies {
     }
 
     annotationProcessor(libs.mixin.extras)
+    annotationProcessor(libs.mixin.squared)
 
     for (dep in listOf("-nanovg").run {
         if (mcData.version < MinecraftVersions.VERSION_1_13) this else this + listOf(

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigEarlyMixinInit.java

@@ -1,16 +1,58 @@
 package org.polyfrost.oneconfig.internal;
 
+import com.bawnorton.mixinsquared.MixinSquaredBootstrap;
+import com.bawnorton.mixinsquared.adjuster.MixinAnnotationAdjusterRegistrar;
+import com.bawnorton.mixinsquared.api.MixinAnnotationAdjuster;
+import com.bawnorton.mixinsquared.api.MixinCanceller;
+import com.bawnorton.mixinsquared.canceller.MixinCancellerRegistrar;
 import com.llamalad7.mixinextras.MixinExtrasBootstrap;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
 import java.util.List;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 public class OneConfigEarlyMixinInit implements IMixinConfigPlugin {
+    //#if FORGE-LIKE
+    private static final ServiceLoader<MixinCanceller> CANCELLERS = ServiceLoader.load(MixinCanceller.class);
+    private static final ServiceLoader<MixinAnnotationAdjuster> ANNOTATION_ADJUSTERS = ServiceLoader.load(MixinAnnotationAdjuster.class);
+    //#endif
+
+
+    public static void load() {
+        //#if FORGE-LIKE
+        CANCELLERS.forEach(MixinCancellerRegistrar::register);
+        ANNOTATION_ADJUSTERS.forEach(MixinAnnotationAdjusterRegistrar::register);
+        //#else
+        //$$ net.fabricmc.loader.api.FabricLoader.getInstance().getEntrypointContainers("mixinsquared", MixinCanceller.class).forEach(container -> {
+        //$$			String id = container.getProvider().getMetadata().getId();
+        //$$			try {
+        //$$				MixinCanceller canceller = container.getEntrypoint();
+        //$$				MixinCancellerRegistrar.register(canceller);
+        //$$			} catch (Throwable e) {
+        //$$				System.err.printf("Mod %s provides a broken MixinCanceller implementation:\n", id);
+        //$$				e.printStackTrace(System.err);
+        //$$			}
+        //$$		});
+        //$$		net.fabricmc.loader.api.FabricLoader.getInstance().getEntrypointContainers("mixinsquared-adjuster", MixinAnnotationAdjuster.class).forEach(container -> {
+        //$$			String id = container.getProvider().getMetadata().getId();
+        //$$			try {
+        //$$				MixinAnnotationAdjuster annotationAdjuster = container.getEntrypoint();
+        //$$				MixinAnnotationAdjusterRegistrar.register(annotationAdjuster);
+        //$$			} catch (Throwable e) {
+        //$$				System.err.printf("Mod %s provides a broken MixinAnnotationAdjuster implementation:\n", id);
+        //$$				e.printStackTrace(System.err);
+        //$$			}
+        //$$		});
+        //#endif
+    }
+
     @Override
     public void onLoad(String mixinPackage) {
+        MixinSquaredBootstrap.init();
+        load();
         MixinExtrasBootstrap.init();
     }
 
@@ -31,6 +73,7 @@ public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
 
     @Override
     public List<String> getMixins() {
+        MixinSquaredBootstrap.reOrderExtensions();
         return null;
     }
 

modules/dependencies/legacy/build.gradle.kts

@@ -4,6 +4,12 @@ plugins {
     id("gg.essential.loom")
 }
 
+repositories {
+    maven("https://maven.bawnorton.com/releases") {
+        content { includeGroup("com.github.bawnorton.mixinsquared") }
+    }
+}
+
 dependencies {
     minecraft("com.mojang:minecraft:1.16.5")
     mappings("net.fabricmc:yarn:1.16.5+build.10:v2")