fix trinket problems

gbl · Sep 26, 2023 · 6292ff3 · 6292ff3
1 parent 7873c99
commit 6292ff3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -75,7 +75,10 @@ dependencies {
     modImplementation "de.guntram.mcmod:GBfabrictools:${Versions['gbfabrictools_version']}"
     include    "de.guntram.mcmod:GBfabrictools:${Versions['gbfabrictools_version']}"
 
-    modImplementation "dev.emi:trinkets:3.0.0"
+    modImplementation "dev.emi:trinkets:3.7.0"
+    // these two are only needed due to a bug in the trinkets build.gradle, remove them later -- 20230629
+    modImplementation include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.0")
+    modImplementation include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.0")
 }
 
 java {

diff --git a/src/main/java/de/guntram/mcmod/durabilityviewer/client/gui/GuiItemDurability.java b/src/main/java/de/guntram/mcmod/durabilityviewer/client/gui/GuiItemDurability.java
@@ -80,8 +80,9 @@ public GuiItemDurability() {
         try {
             Class.forName("dev.emi.trinkets.api.TrinketsApi");
             LOGGER.info("Using trinkets in DurabilityViewer");
-            haveTrinketsApi = true;
-            trinketWarners = new ItemBreakingWarner[getTrinketSlotCount(minecraft.player)];
+            int slotCount = getTrinketSlotCount(minecraft.player);
+            haveTrinketsApi = (slotCount > 0);
+            trinketWarners = new ItemBreakingWarner[slotCount];
             for (int i=0; i<trinketWarners.length; i++) {
                 trinketWarners[i]=new ItemBreakingWarner();
             }
@@ -393,16 +394,14 @@ public int getTrinketSlotCount(LivingEntity player) {
         if (component.isEmpty()) {
             return 0;
         }
-        // return component.get().getEquipped(prdct -> true).size();
-        return 0;
+        return component.get().getEquipped(prdct -> true).size();
     }
 
     public List<ItemStack> getTrinkets(LivingEntity player) {
         Optional<TrinketComponent> component = TrinketsApi.getTrinketComponent(player);
         if (component.isEmpty()) {
             return null;
         }
-        // return component.get().getEquipped(prdct -> true).stream().map(pair -> pair.getRight()).toList();
-        return null;
+        return component.get().getEquipped(prdct -> true).stream().map(pair -> pair.getRight()).toList();
     }
 }