From 0174fdbf734ce512e193129de75e6f7b165cf15b Mon Sep 17 00:00:00 2001
From: cech12 <cech12@gmail.com>
Date: Thu, 18 Jul 2024 19:10:48 +0200
Subject: [PATCH] updated NeoForge to 21.0.102-beta for better model
 registering

---
 CHANGELOG.md                                  |  3 +++
 gradle.properties                             |  4 +--
 .../UsefulHatsNeoForgeClientEvents.java       |  6 +++++
 .../de/cech12/usefulhats/mixin/ItemMixin.java | 25 -------------------
 .../resources/usefulhats.neoforge.mixins.json |  1 -
 5 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 neoforge/src/main/java/de/cech12/usefulhats/mixin/ItemMixin.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3bf12c..d8aca58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ 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.4.0.0] - 2024-07-18
+### Changed
+- updated NeoForge to 21.0.102-beta for better model registering
+
 ### Fixed
 - the recipe of Postman Hat contained a wrong lapis item tag (Fabric/Quilt & Neoforge) (thanks to WhitePhant0m for the report) #66  
 
diff --git a/gradle.properties b/gradle.properties
index 3943904..b97968b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,8 +30,8 @@ forge_version_range=[51.0.18,)
 forge_loader_version_range=[50,)
 
 # NeoForge
-neoforge_version=21.0.94-beta
-neoforge_version_range=[21.0.94-beta,)
+neoforge_version=21.0.102-beta
+neoforge_version_range=[21.0.102-beta,)
 neoforge_loader_version_range=[2,)
 
 # Baubles 2
diff --git a/neoforge/src/main/java/de/cech12/usefulhats/client/UsefulHatsNeoForgeClientEvents.java b/neoforge/src/main/java/de/cech12/usefulhats/client/UsefulHatsNeoForgeClientEvents.java
index 0f05052..ba16eb7 100644
--- a/neoforge/src/main/java/de/cech12/usefulhats/client/UsefulHatsNeoForgeClientEvents.java
+++ b/neoforge/src/main/java/de/cech12/usefulhats/client/UsefulHatsNeoForgeClientEvents.java
@@ -18,6 +18,7 @@
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
+import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
 
 @SuppressWarnings("unused")
 @EventBusSubscriber(modid = Constants.MOD_ID, value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
@@ -27,6 +28,11 @@ public class UsefulHatsNeoForgeClientEvents {
 
     public static UsefulHatModel<LivingEntity> usefulHatModel = null;
 
+    @SubscribeEvent
+    public static void registerItemExtensions(RegisterClientExtensionsEvent event) {
+        event.registerItem(UsefulHatItemExtension.INSTANCE, Services.REGISTRY.getAllHatItems().toArray(new Item[0]));
+    }
+
     @SubscribeEvent
     public static void registerLayers(EntityRenderersEvent.RegisterLayerDefinitions event) {
         event.registerLayerDefinition(USEFUL_HAT_LAYER, () -> UsefulHatModel.createLayer(LayerDefinitions.INNER_ARMOR_DEFORMATION, 0));
diff --git a/neoforge/src/main/java/de/cech12/usefulhats/mixin/ItemMixin.java b/neoforge/src/main/java/de/cech12/usefulhats/mixin/ItemMixin.java
deleted file mode 100644
index 66c7c90..0000000
--- a/neoforge/src/main/java/de/cech12/usefulhats/mixin/ItemMixin.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.cech12.usefulhats.mixin;
-
-import de.cech12.usefulhats.client.UsefulHatItemExtension;
-import de.cech12.usefulhats.item.AbstractHatItem;
-import net.minecraft.world.item.Item;
-import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions;
-import org.jetbrains.annotations.NotNull;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.function.Consumer;
-
-@Mixin(value = Item.class, remap = false)
-public class ItemMixin {
-
-    @Inject(at = @At("RETURN"), method = "initializeClient")
-    public void initializeClient(@NotNull Consumer<IClientItemExtensions> consumer, CallbackInfo ci) {
-        if ((Object) this instanceof AbstractHatItem) {
-            consumer.accept(UsefulHatItemExtension.INSTANCE);
-        }
-    }
-
-}
diff --git a/neoforge/src/main/resources/usefulhats.neoforge.mixins.json b/neoforge/src/main/resources/usefulhats.neoforge.mixins.json
index 7a36884..3e5ed96 100644
--- a/neoforge/src/main/resources/usefulhats.neoforge.mixins.json
+++ b/neoforge/src/main/resources/usefulhats.neoforge.mixins.json
@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_17",
   "refmap": "${mod_id}.refmap.json",
   "mixins": [
-    "ItemMixin"
   ],
   "client": [
     "HumanoidArmorLayerMixin"