re-added Trinkets support #60

cech12 · Jul 15, 2024 · 0391d7f · 0391d7f
1 parent 297d789
commit 0391d7f
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
+## [1.21-6.3.1.0] - 2024-07-15
+### Changed
+- re-added Trinkets support (1.21-3.10.0) (Fabric/Quilt)
+
 ## [1.21-6.3.0.0] - 2024-07-14
 ### Changed
 - updated NeoForge to 21.0.94-beta

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     }
     modImplementation("com.terraformersmc:modmenu:${mod_menu_version}")
 
-    //modImplementation("dev.emi:trinkets:${trinkets_version}")
+    modImplementation("dev.emi:trinkets:${trinkets_version}")
     modImplementation("io.wispforest:accessories-fabric:${accessories_version}")
 
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'

diff --git a/fabric/src/main/java/de/cech12/usefulhats/UsefulHatsFabricMod.java b/fabric/src/main/java/de/cech12/usefulhats/UsefulHatsFabricMod.java
@@ -1,6 +1,7 @@
 package de.cech12.usefulhats;
 
 import de.cech12.usefulhats.compat.AccessoriesCompat;
+import de.cech12.usefulhats.compat.TrinketsCompat;
 import de.cech12.usefulhats.init.ModCreativeTabs;
 import de.cech12.usefulhats.init.ModItems;
 import de.cech12.usefulhats.platform.Services;
@@ -14,11 +15,9 @@ public void onInitialize() {
         ModItems.init();
         ModCreativeTabs.init();
 
-        /* TODO
         if (Services.PLATFORM.isModLoaded(TrinketsCompat.MOD_ID)) {
             TrinketsCompat.register();
         }
-         */
         if (Services.PLATFORM.isModLoaded(Constants.ACCESSORIES_MOD_ID)) {
             AccessoriesCompat.register();
         }

diff --git a/fabric/src/main/java/de/cech12/usefulhats/client/UsefulHatsFabricClientMod.java b/fabric/src/main/java/de/cech12/usefulhats/client/UsefulHatsFabricClientMod.java
@@ -2,6 +2,8 @@
 
 import de.cech12.usefulhats.Constants;
 import de.cech12.usefulhats.client.compat.AccessoriesClientCompat;
+import de.cech12.usefulhats.client.compat.TrinketsClientCompat;
+import de.cech12.usefulhats.compat.TrinketsCompat;
 import de.cech12.usefulhats.item.AbstractHatItem;
 import de.cech12.usefulhats.platform.Services;
 import net.fabricmc.api.ClientModInitializer;
@@ -30,11 +32,9 @@ public void onInitializeClient() {
             //register armor renderer
             ArmorRenderer.register(renderer, item);
         });
-        /* TODO
         if (Services.PLATFORM.isModLoaded(TrinketsCompat.MOD_ID)) {
             TrinketsClientCompat.register();
         }
-         */
         if (Services.PLATFORM.isModLoaded(Constants.ACCESSORIES_MOD_ID)) {
             AccessoriesClientCompat.register();
         }

diff --git a/fabric/src/main/java/de/cech12/usefulhats/client/compat/TrinketsClientCompat.java b/fabric/src/main/java/de/cech12/usefulhats/client/compat/TrinketsClientCompat.java
@@ -1,5 +1,5 @@
 package de.cech12.usefulhats.client.compat;
-/* TODO
+
 import com.mojang.blaze3d.vertex.PoseStack;
 import de.cech12.usefulhats.client.AbstractUsefulHatsRenderer;
 import de.cech12.usefulhats.platform.Services;
@@ -38,4 +38,3 @@ protected void followBodyRotations(LivingEntity livingEntity, HumanoidModel<Livi
     }
 
 }
- */
diff --git a/fabric/src/main/java/de/cech12/usefulhats/compat/TrinketsCompat.java b/fabric/src/main/java/de/cech12/usefulhats/compat/TrinketsCompat.java
@@ -1,5 +1,5 @@
 package de.cech12.usefulhats.compat;
-/* TODO
+
 import de.cech12.usefulhats.UsefulHatsEventUtils;
 import de.cech12.usefulhats.item.AbstractHatItem;
 import de.cech12.usefulhats.platform.Services;
@@ -13,7 +13,7 @@
 
 public class TrinketsCompat {
 
-    public static String MOD_ID = "trinkets";
+    public static final String MOD_ID = "trinkets";
 
     public static void register() {
         Trinket usefulHatsTrinket = new UsefulHatTrinket();
@@ -55,4 +55,3 @@ public void onUnequip(ItemStack stack, SlotReference slot, LivingEntity entity)
     }
 
 }
- */
diff --git a/fabric/src/main/java/de/cech12/usefulhats/platform/FabricRegistryHelper.java b/fabric/src/main/java/de/cech12/usefulhats/platform/FabricRegistryHelper.java
@@ -2,10 +2,11 @@
 
 import de.cech12.usefulhats.Constants;
 import de.cech12.usefulhats.compat.AccessoriesCompat;
+import de.cech12.usefulhats.compat.TrinketsCompat;
 import de.cech12.usefulhats.init.ModItems;
 import de.cech12.usefulhats.item.AbstractHatItem;
 import de.cech12.usefulhats.platform.services.IRegistryHelper;
-import net.fabricmc.fabric.api.tag.convention.v1.ConventionalEntityTypeTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -43,11 +44,9 @@ public List<ItemStack> getEquippedHatItemStacks(LivingEntity entity) {
         if (headItemStack.getItem() instanceof AbstractHatItem) {
             stacks.add(headItemStack);
         }
-        /* TODO
         if (Services.PLATFORM.isModLoaded(TrinketsCompat.MOD_ID)) {
             TrinketsCompat.addEquippedHatsToList(entity, stacks);
         }
-         */
         if (Services.PLATFORM.isModLoaded(Constants.ACCESSORIES_MOD_ID)) {
             AccessoriesCompat.addEquippedHatsToList(entity, stacks);
         }

diff --git a/...rces/data/trinkets/entity/usefulhats.json → ...es/data/trinkets/entities/usefulhats.json b/...rces/data/trinkets/entity/usefulhats.json → ...es/data/trinkets/entities/usefulhats.json
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -40,6 +40,7 @@
   },
   "suggests": {
     "modmenu": ">=${mod_menu_version}",
-    "accessories": ">=${accessories_version}"
+    "accessories": ">=${accessories_version}",
+    "trinkets": ">=${trinkets_version}"
   }
 }
diff --git a/forge/src/main/java/de/cech12/usefulhats/platform/ForgeConfigHelper.java b/forge/src/main/java/de/cech12/usefulhats/platform/ForgeConfigHelper.java
@@ -17,7 +17,7 @@
  */
 public class ForgeConfigHelper implements IConfigHelper {
 
-    public static ForgeConfigSpec SERVER_CONFIG;
+    public static final ForgeConfigSpec SERVER_CONFIG;
 
     public static final ForgeConfigSpec.BooleanValue AQUANAUT_HELMET_DAMAGE_ENABLED;
     public static final ForgeConfigSpec.IntValue AQUANAUT_HELMET_DURABILITY;

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 
 # Project
 group=de.cech12.usefulhats
-mod_version=6.3.0.0
+mod_version=6.3.1.0
 mod_id=usefulhats
 mod_name=Useful Hats
 mod_author=Cech12
@@ -39,7 +39,7 @@ baubles2_file_id=5477738
 baubles2_version_range=[0.5,)
 
 # Trinkets
-trinkets_version=3.9.0
+trinkets_version=3.10.0
 
 # Accessories
 accessories_version=1.0.0-beta.5+1.21

diff --git a/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgeConfigHelper.java b/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgeConfigHelper.java
@@ -10,7 +10,7 @@
  */
 public class NeoForgeConfigHelper implements IConfigHelper {
 
-    public static ModConfigSpec SERVER_CONFIG;
+    public static final ModConfigSpec SERVER_CONFIG;
 
     public static final ModConfigSpec.BooleanValue AQUANAUT_HELMET_DAMAGE_ENABLED;
     public static final ModConfigSpec.IntValue AQUANAUT_HELMET_DURABILITY;