feat: Add compatibility layer for Curios and Trinkets #121

common/src/main/java/net/blay09/mods/balm/api/Balm.java

@@ -4,6 +4,7 @@
 import net.blay09.mods.balm.api.block.BalmBlocks;
 import net.blay09.mods.balm.api.command.BalmCommands;
 import net.blay09.mods.balm.api.component.BalmComponents;
+import net.blay09.mods.balm.api.compat.BalmModSupport;
 import net.blay09.mods.balm.api.config.BalmConfig;
 import net.blay09.mods.balm.api.entity.BalmEntities;
 import net.blay09.mods.balm.api.event.BalmEvents;
@@ -17,7 +18,6 @@
 import net.blay09.mods.balm.api.sound.BalmSounds;
 import net.blay09.mods.balm.api.stats.BalmStats;
 import net.blay09.mods.balm.api.world.BalmWorldGen;
-import net.blay09.mods.balm.config.ExampleConfig;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.server.packs.resources.ResourceManager;
@@ -131,4 +131,8 @@ public static BalmLootTables getLootTables() {
     public static BalmStats getStats() {
         return runtime.getStats();
     }
+
+    public static BalmModSupport getModSupport() {
+        return runtime.getModSupport();
+    }
 }

common/src/main/java/net/blay09/mods/balm/api/BalmRuntime.java

@@ -4,6 +4,7 @@
 import net.blay09.mods.balm.api.block.BalmBlocks;
 import net.blay09.mods.balm.api.command.BalmCommands;
 import net.blay09.mods.balm.api.component.BalmComponents;
+import net.blay09.mods.balm.api.compat.BalmModSupport;
 import net.blay09.mods.balm.api.config.BalmConfig;
 import net.blay09.mods.balm.api.entity.BalmEntities;
 import net.blay09.mods.balm.api.event.BalmEvents;
@@ -58,6 +59,8 @@ public interface BalmRuntime<TLoadContext extends BalmRuntimeLoadContext> {
 
     BalmRecipes getRecipes();
 
+    BalmModSupport getModSupport();
+
     boolean isModLoaded(String modId);
     String getModName(String modId);
     <TProxy> SidedProxy<TProxy> sidedProxy(String commonName, String clientName);

common/src/main/java/net/blay09/mods/balm/api/compat/BalmModSupport.java

@@ -0,0 +1,7 @@
+package net.blay09.mods.balm.api.compat;
+
+import net.blay09.mods.balm.api.compat.trinkets.BalmModSupportTrinkets;
+
+public interface BalmModSupport {
+    BalmModSupportTrinkets trinkets();
+}

common/src/main/java/net/blay09/mods/balm/api/compat/trinkets/BalmModSupportTrinkets.java

@@ -0,0 +1,10 @@
+package net.blay09.mods.balm.api.compat.trinkets;
+
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.function.Predicate;
+
+public interface BalmModSupportTrinkets {
+    boolean isEquipped(Player player, Predicate<ItemStack> predicate);
+}

fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalmRuntime.java

@@ -8,12 +8,14 @@
 import net.blay09.mods.balm.api.block.BalmBlocks;
 import net.blay09.mods.balm.api.command.BalmCommands;
 import net.blay09.mods.balm.api.component.BalmComponents;
+import net.blay09.mods.balm.api.compat.BalmModSupport;
 import net.blay09.mods.balm.api.config.BalmConfig;
 import net.blay09.mods.balm.api.entity.BalmEntities;
 import net.blay09.mods.balm.api.event.BalmEvents;
 import net.blay09.mods.balm.api.recipe.BalmRecipes;
 import net.blay09.mods.balm.api.stats.BalmStats;
 import net.blay09.mods.balm.fabric.component.FabricBalmComponents;
+import net.blay09.mods.balm.fabric.compat.FabricBalmModSupport;
 import net.blay09.mods.balm.fabric.event.FabricBalmCommonEvents;
 import net.blay09.mods.balm.fabric.event.FabricBalmEvents;
 import net.blay09.mods.balm.api.item.BalmItems;
@@ -74,6 +76,7 @@ public class FabricBalmRuntime implements BalmRuntime<EmptyLoadContext> {
     private final BalmStats stats = new FabricBalmStats();
     private final BalmRecipes recipes = new FabricBalmRecipes();
     private final BalmComponents components = new FabricBalmComponents();
+    private final BalmModSupport modSupport = new FabricBalmModSupport();
 
     public FabricBalmRuntime() {
         FabricBalmCommonEvents.registerEvents(events);
@@ -240,4 +243,9 @@ public ResourceLocation getFabricId() {
     public BalmComponents getComponents() {
         return components;
     }
+
+    @Override
+    public BalmModSupport getModSupport() {
+        return modSupport;
+    }
 }

fabric/src/main/java/net/blay09/mods/balm/fabric/compat/FabricBalmModSupport.java

@@ -0,0 +1,14 @@
+package net.blay09.mods.balm.fabric.compat;
+
+import net.blay09.mods.balm.api.compat.BalmModSupport;
+import net.blay09.mods.balm.api.compat.trinkets.BalmModSupportTrinkets;
+import net.blay09.mods.balm.fabric.compat.trinkets.FabricBalmModSupportTrinkets;
+
+public class FabricBalmModSupport implements BalmModSupport {
+    private final FabricBalmModSupportTrinkets trinkets = new FabricBalmModSupportTrinkets();
+
+    @Override
+    public BalmModSupportTrinkets trinkets() {
+        return trinkets;
+    }
+}

fabric/src/main/java/net/blay09/mods/balm/fabric/compat/trinkets/FabricBalmModSupportTrinkets.java

@@ -0,0 +1,18 @@
+package net.blay09.mods.balm.fabric.compat.trinkets;
+
+import net.blay09.mods.balm.api.Balm;
+import net.blay09.mods.balm.api.compat.trinkets.BalmModSupportTrinkets;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.function.Predicate;
+
+public class FabricBalmModSupportTrinkets implements BalmModSupportTrinkets {
+    @Override
+    public boolean isEquipped(Player player, Predicate<ItemStack> predicate) {
+        if (Balm.isModLoaded("trinkets")) {
+            return TrinketsModCompat.isEquipped(player, predicate);
+        }
+        return false;
+    }
+}

fabric/src/main/java/net/blay09/mods/balm/fabric/compat/trinkets/TrinketsModCompat.java

@@ -0,0 +1,13 @@
+package net.blay09.mods.balm.fabric.compat.trinkets;
+
+import dev.emi.trinkets.api.TrinketsApi;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.function.Predicate;
+
+public class TrinketsModCompat {
+    public static boolean isEquipped(Player player, Predicate<ItemStack> predicate) {
+        return TrinketsApi.getTrinketComponent(player).map(trinkets -> trinkets.isEquipped(predicate)).orElse(false);
+    }
+}

forge/src/main/java/net/blay09/mods/balm/forge/ForgeBalmRuntime.java

@@ -8,13 +8,15 @@
 import net.blay09.mods.balm.api.block.BalmBlocks;
 import net.blay09.mods.balm.api.command.BalmCommands;
 import net.blay09.mods.balm.api.component.BalmComponents;
+import net.blay09.mods.balm.api.compat.BalmModSupport;
 import net.blay09.mods.balm.api.config.BalmConfig;
 import net.blay09.mods.balm.api.entity.BalmEntities;
 import net.blay09.mods.balm.api.event.BalmEvents;
 import net.blay09.mods.balm.api.recipe.BalmRecipes;
 import net.blay09.mods.balm.api.stats.BalmStats;
 import net.blay09.mods.balm.common.CommonBalmLootTables;
 import net.blay09.mods.balm.forge.component.ForgeBalmComponents;
+import net.blay09.mods.balm.forge.compat.ForgeBalmModSupport;
 import net.blay09.mods.balm.forge.event.ForgeBalmEvents;
 import net.blay09.mods.balm.api.item.BalmItems;
 import net.blay09.mods.balm.api.loot.BalmLootTables;
@@ -73,6 +75,7 @@ public class ForgeBalmRuntime implements BalmRuntime<EmptyLoadContext> {
     private final BalmStats stats = new ForgeBalmStats();
     private final BalmRecipes recipes = new ForgeBalmRecipes();
     private final BalmComponents components = new ForgeBalmComponents();
+    private final BalmModSupport modSupport = new ForgeBalmModSupport();
 
     private final List<String> addonClasses = new ArrayList<>();
 
@@ -237,4 +240,8 @@ public void addServerReloadListener(ResourceLocation identifier, Consumer<Resour
     public BalmComponents getComponents() {
         return components;
     }
+    @Override
+    public BalmModSupport getModSupport() {
+        return modSupport;
+    }
 }

forge/src/main/java/net/blay09/mods/balm/forge/compat/ForgeBalmModSupport.java

@@ -0,0 +1,14 @@
+package net.blay09.mods.balm.forge.compat;
+
+import net.blay09.mods.balm.api.compat.BalmModSupport;
+import net.blay09.mods.balm.api.compat.trinkets.BalmModSupportTrinkets;
+import net.blay09.mods.balm.forge.compat.trinkets.ForgeBalmModSupportTrinkets;
+
+public class ForgeBalmModSupport implements BalmModSupport {
+    private final ForgeBalmModSupportTrinkets trinkets = new ForgeBalmModSupportTrinkets();
+
+    @Override
+    public BalmModSupportTrinkets trinkets() {
+        return trinkets;
+    }
+}

forge/src/main/java/net/blay09/mods/balm/forge/compat/trinkets/CuriosModCompat.java

@@ -0,0 +1,13 @@
+package net.blay09.mods.balm.forge.compat.trinkets;
+
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import top.theillusivec4.curios.api.CuriosApi;
+
+import java.util.function.Predicate;
+
+public class CuriosModCompat {
+    public static boolean isEquipped(Player player, Predicate<ItemStack> predicate) {
+        return CuriosApi.getCuriosInventory(player).map(trinkets -> trinkets.isEquipped(predicate)).orElse(false);
+    }
+}

forge/src/main/java/net/blay09/mods/balm/forge/compat/trinkets/ForgeBalmModSupportTrinkets.java

@@ -0,0 +1,18 @@
+package net.blay09.mods.balm.forge.compat.trinkets;
+
+import net.blay09.mods.balm.api.Balm;
+import net.blay09.mods.balm.api.compat.trinkets.BalmModSupportTrinkets;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.function.Predicate;
+
+public class ForgeBalmModSupportTrinkets implements BalmModSupportTrinkets {
+    @Override
+    public boolean isEquipped(Player player, Predicate<ItemStack> predicate) {
+        if (Balm.isModLoaded("curios")) {
+            return CuriosModCompat.isEquipped(player, predicate);
+        }
+        return false;
+    }
+}