Fix crash with Trinkets 3.2.0

itsmeow · Feb 1, 2022 · c441e4a · c441e4a
1 parent d50467e
commit c441e4a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 40 deletions.
diff --git a/common/src/main/resources/data/trinkets/slots/chest/cape.json b/common/src/main/resources/data/trinkets/slots/chest/cape.json
@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "validator_predicates": [
+        "betteranimalsplus:cape_allowed"
+    ]
+}
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -51,7 +51,7 @@ dependencies {
         exclude(group: "net.fabricmc")
         exclude(group: "net.fabricmc.fabric-api")
     }
-    modImplementation("dev.emi:trinkets:${rootProject.trinkets_version}") {
+    modImplementation("curse.maven:341284-trinkets:${rootProject.trinkets_version}") {
         transitive = false
     }
     modRuntimeOnly("com.terraformersmc:modmenu:3.0.1") {

diff --git a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/compat/trinkets/TrinketsModCompat.java b/fabric/src/main/java/dev/itsmeow/betteranimalsplus/compat/trinkets/TrinketsModCompat.java
@@ -1,14 +1,23 @@
 package dev.itsmeow.betteranimalsplus.compat.trinkets;
 
 import dev.emi.trinkets.api.TrinketsApi;
+import dev.itsmeow.betteranimalsplus.Ref;
 import dev.itsmeow.betteranimalsplus.common.item.ItemCape;
-import dev.itsmeow.betteranimalsplus.common.item.ItemModeledArmor;
+import net.fabricmc.fabric.api.util.TriState;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 
 public class TrinketsModCompat {
 
     public static void init() {
-        ItemCape.can_equip = (stack, armorType, entity) -> !TrinketsApi.getTrinketComponent((LivingEntity) entity).get().isEquipped(s -> s.getItem() instanceof ItemModeledArmor);
+        ItemCape.can_equip = (stack, armorType, entity) -> !TrinketsApi.getTrinketComponent((LivingEntity) entity).get().isEquipped(s -> s.getItem() instanceof ItemCape);
+        TrinketsApi.registerTrinketPredicate(new ResourceLocation(Ref.MOD_ID, "cape_allowed"), (stack, slot, entity) -> {
+            if (stack.getItem() instanceof ItemCape && entity.getItemBySlot(EquipmentSlot.CHEST).getItem() instanceof ItemCape) {
+                return TriState.FALSE;
+            }
+            return TriState.TRUE;
+        });
     }
 
 }
diff --git a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/fabric/FabricMixinPlugin.java b/fabric/src/main/java/dev/itsmeow/betteranimalsplus/fabric/FabricMixinPlugin.java
@@ -1,6 +1,7 @@
 package dev.itsmeow.betteranimalsplus.fabric;
 
 import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.Version;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -21,7 +22,7 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        return (!mixinClassName.equals("dev.itsmeow.betteranimalsplus.mixin.fabric.ItemCapeMixin") && !mixinClassName.equals("dev.itsmeow.betteranimalsplus.mixin.fabric.TrinketSlotMixin")) || FabricLoader.getInstance().isModLoaded("trinkets");
+        return !mixinClassName.equals("dev.itsmeow.betteranimalsplus.mixin.fabric.ItemCapeMixin") || FabricLoader.getInstance().isModLoaded("trinkets");
     }
 
     @Override

diff --git a/...java/dev/itsmeow/betteranimalsplus/mixin/fabric/SimpleReloadableResourceManagerMixin.java b/...java/dev/itsmeow/betteranimalsplus/mixin/fabric/SimpleReloadableResourceManagerMixin.java
@@ -24,7 +24,7 @@ public abstract class SimpleReloadableResourceManagerMixin implements Reloadable
     private void listResources(String parent, Predicate<String> loadFilter, CallbackInfoReturnable<Collection<ResourceLocation>> callback, Set<ResourceLocation> foundResources, List<ResourceLocation> sortedResources) {
         for (ResourceLocation id : new ArrayList<>(sortedResources)) {
             if(Ref.MOD_ID.equals(id.getNamespace())) {
-                if(("advancements/ultimate_succening.json".equals(id.getPath()) && !FabricLoader.getInstance().isModLoaded("whisperwoods")) || (("trinkets/entities/betteranimalsplus.json".equals(id.getPath()) || "trinkets/tags/items/chest/cape.json".equals(id.getPath())) && !FabricLoader.getInstance().isModLoaded("trinkets"))) {
+                if(("advancements/ultimate_succening.json".equals(id.getPath()) && !FabricLoader.getInstance().isModLoaded("whisperwoods")) || (id.getPath().startsWith("trinkets") && !FabricLoader.getInstance().isModLoaded("trinkets"))) {
                     sortedResources.remove(id);
                 }
             }

diff --git a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/mixin/fabric/TrinketSlotMixin.java b/fabric/src/main/java/dev/itsmeow/betteranimalsplus/mixin/fabric/TrinketSlotMixin.java
diff --git a/fabric/src/main/resources/betteranimalsplus-fabric.mixins.json b/fabric/src/main/resources/betteranimalsplus-fabric.mixins.json
@@ -9,7 +9,6 @@
     "LivingEntityMixin",
     "SimpleReloadableResourceManagerMixin",
     "ItemCapeMixin",
-    "TrinketSlotMixin",
     "ServerPlayerMixin"
   ],
   "client": [

diff --git a/gradle.properties b/gradle.properties
@@ -31,4 +31,5 @@
     org.gradle.jvmargs = -Xmx4G
     org.gradle.daemon = true
     curios_version = 1.18.1-5.0.4.1
-    trinkets_version = 3.1.0
+    # 3.2.0
+    trinkets_version = 3629559