Fix Fabric Shield Lib compatibility

MerchantPug · Jul 4, 2022 · b41c82d · b41c82d
1 parent 59a5fb3
commit b41c82d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/...ava/com/github/merchantpug/unwieldy/mixin/fabricshieldlib/FabricShieldLibMixinPlugin.java b/...ava/com/github/merchantpug/unwieldy/mixin/fabricshieldlib/FabricShieldLibMixinPlugin.java
@@ -20,7 +20,7 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        return !mixinClassName.contains("mixin.fabricshieldlib") || FabricLoader.getInstance().isModLoaded("fabricshieldlib");
+        return FabricLoader.getInstance().isModLoaded("fabricshieldlib");
     }
 
     @Override

diff --git a/src/main/java/com/github/merchantpug/unwieldy/mixin/fabricshieldlib/ItemsMixin.java b/src/main/java/com/github/merchantpug/unwieldy/mixin/fabricshieldlib/ItemsMixin.java
@@ -3,7 +3,6 @@
 import com.github.crimsondawn45.fabricshieldlib.lib.object.FabricShield;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
-import net.minecraft.item.ShieldItem;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/java/com/github/merchantpug/unwieldy/mixin/fabricshieldlib/RegistryMixin.java b/src/main/java/com/github/merchantpug/unwieldy/mixin/fabricshieldlib/RegistryMixin.java
@@ -1,6 +1,7 @@
 package com.github.merchantpug.unwieldy.mixin.fabricshieldlib;
 
 import com.github.crimsondawn45.fabricshieldlib.lib.object.FabricShield;
+import com.github.merchantpug.unwieldy.Unwieldy;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -23,7 +23,8 @@
     ]
   },
   "mixins": [
-    "unwieldy.mixins.json"
+    "unwieldy.mixins.json",
+    "unwieldy.fabricshieldlib.mixins.json"
   ],
   "depends": {
     "fabric": "*",