optimize config plugin

RawDiamondMC · Jan 29, 2023 · 8ee54b8 · 8ee54b8
1 parent f1c8c35
commit 8ee54b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/com/dm/earth/cabricality/plugin/CabfMixinConfigPlugin.java b/src/main/java/com/dm/earth/cabricality/plugin/CabfMixinConfigPlugin.java
@@ -2,8 +2,10 @@
 
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.dm.earth.cabricality.lib.util.mod.CabfModDeps;
 import org.objectweb.asm.tree.ClassNode;
-import org.quiltmc.loader.api.QuiltLoader;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 import com.dm.earth.cabricality.Cabricality;
@@ -20,11 +22,13 @@ public String getRefMapperConfig() {
 
 	@Override
 	public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-		if (targetClassName.matches(".*\\.ftbquests\\..*"))
-			return QuiltLoader.isModLoaded("ftbquests");
-		if (mixinClassName.matches(".*\\.log\\..*")) {
+		AtomicBoolean ret = new AtomicBoolean(true);
+		CabfModDeps.stream().filter(d -> !d.isRequired()).forEach(dep -> {
+			if (targetClassName.matches(".*\\." + dep.getModId() + "\\..*"))
+				ret.set(dep.isLoaded());
+		});
+		if (mixinClassName.matches(".*\\.log\\..*"))
 			return Cabricality.CONFIG.cleanerLog;
-		}
 		return true;
 	}
 

diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json
@@ -34,9 +34,7 @@
         "com.dm.earth.cabricality.tweak.RecipeTweaks",
         "com.dm.earth.cabricality.content.trading.data.recipe.Trading"
       ],
-      "rei_client": [
-        "com.dm.earth.cabricality.client.plugin.rei.CabfREIClientPlugin"
-      ],
+      "rei_client": "com.dm.earth.cabricality.client.plugin.rei.CabfREIClientPlugin",
       "modmenu": "com.dm.earth.cabricality.config.modmenu.CabfModMenuImpl"
     },
     "accessWidener": "cabricality.accesswidener",