fix bug & bump version (0.1.1)

VulpixelMC · Jul 29, 2022 · 96dc423 · 96dc423
1 parent 88a9243
commit 96dc423
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,7 +73,7 @@ dependencies {
 
 	// QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps.
 	// Quilted Fabric API will automatically pull in the correct QSL version.
-	modImplementation(libs.quilted.fabric.api)
+	modRuntimeOnly(libs.quilted.fabric.api)
 
 	annotationProcessor("net.auoeke:uncheck:latest.release")
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,6 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-modVersion = 0.1.0
+modVersion = 0.1.1
 mavenGroup = net.cursedmc
 modId = yqh
diff --git a/src/main/java/net/cursedmc/yqh/api/mixin/Mixout.java b/src/main/java/net/cursedmc/yqh/api/mixin/Mixout.java
@@ -25,12 +25,14 @@ static void registerPostMixin(TransformEvent callback) {
 			POST_MIXIN.add(callback);
 		}
 
-		static void preMixin(String name, ClassNode cn) {
+		static boolean preMixin(String name, ClassNode cn) {
 			PRE_MIXIN.forEach(callback -> callback.transform(name, cn));
+			return PRE_MIXIN.isEmpty();
 		}
 
-		static void postMixin(String name, ClassNode cn) {
+		static boolean postMixin(String name, ClassNode cn) {
 			POST_MIXIN.forEach(callback -> callback.transform(name, cn));
+			return POST_MIXIN.isEmpty();
 		}
 	}
 

diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/HackedMixinProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/HackedMixinProcessor.java
@@ -15,9 +15,12 @@ public class HackedMixinProcessor extends MixinProcessor {
 
 	@Override
 	synchronized boolean applyMixins(MixinEnvironment environment, String name, ClassNode targetClassNode) {
-		Mixout.TransformEvent.preMixin(name, targetClassNode);
-		boolean applied = super.applyMixins(environment, name, targetClassNode);
-		Mixout.TransformEvent.postMixin(name, targetClassNode);
-		return applied;
+		boolean shouldApply;
+
+		shouldApply = Mixout.TransformEvent.preMixin(name, targetClassNode);
+		shouldApply |= super.applyMixins(environment, name, targetClassNode);
+		shouldApply |= Mixout.TransformEvent.postMixin(name, targetClassNode);
+
+		return shouldApply;
 	}
 }
diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json
@@ -25,7 +25,6 @@
 				"id": "quilt_loader",
 				"versions": ">=0.17.0-"
 			},
-			"quilted_fabric_api",
 			"minecraft"
 		],
 		"language_adapters": {