Updated to 1.21.4 - UNSOLVED - Models Not Working

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.3
-yarn_mappings=1.21.3+build.2
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
 loader_version=0.16.9
 
 # Mod Properties
@@ -14,4 +14,4 @@ maven_group=net.rafael.usefulcactus
 archives_base_name=rafaels-useful-cactus
 
 # Dependencies
-fabric_version=0.110.0+1.21.3
+fabric_version=0.111.0+1.21.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/net/rafael/usefulcactus/datagen/ModModelProvider.java

@@ -1,14 +1,11 @@
 package net.rafael.usefulcactus.datagen;
 
+import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
-import net.minecraft.data.client.BlockStateModelGenerator;
-import net.minecraft.data.client.ItemModelGenerator;
-import net.minecraft.data.client.Models;
-import net.minecraft.entity.EquipmentSlot;
-import net.minecraft.item.equipment.EquipmentModel;
-import net.minecraft.util.Identifier;
-import net.rafael.usefulcactus.RafaelsUsefulCactus;
+import net.minecraft.client.data.BlockStateModelGenerator;
+import net.minecraft.client.data.ItemModelGenerator;
+import net.minecraft.client.data.Models;
+import net.minecraft.item.equipment.EquipmentAssetKeys;
 import net.rafael.usefulcactus.block.ModBlocks;
 import net.rafael.usefulcactus.item.ModItems;
 
@@ -53,21 +50,27 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
         itemModelGenerator.register(ModItems.CACTUS_HAMMER, Models.HANDHELD);
 
         // Armor
-        itemModelGenerator.registerArmor(ModItems.CACTUS_HELMET,
-                Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
-                        .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
-                EquipmentSlot.HEAD);
-        itemModelGenerator.registerArmor(ModItems.CACTUS_CHESTPLATE,
-                Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
-                        .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
-                EquipmentSlot.CHEST);
-        itemModelGenerator.registerArmor(ModItems.CACTUS_LEGGINGS,
-                Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
-                        .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
-                EquipmentSlot.LEGS);
-        itemModelGenerator.registerArmor(ModItems.CACTUS_BOOTS,
-                Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
-                        .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
-                EquipmentSlot.FEET);
+        itemModelGenerator.registerArmor(ModItems.CACTUS_HELMET, EquipmentAssetKeys.register("cactus_skin"), "helmet", false);
+        itemModelGenerator.registerArmor(ModItems.CACTUS_CHESTPLATE, EquipmentAssetKeys.register("cactus_skin"), "chestplate", false);
+        itemModelGenerator.registerArmor(ModItems.CACTUS_LEGGINGS, EquipmentAssetKeys.register("cactus_skin"), "leggings", false);
+        itemModelGenerator.registerArmor(ModItems.CACTUS_BOOTS, EquipmentAssetKeys.register("cactus_skin"), "boots", false);
+
+        // itemModelGenerator.registerArmor(ModItems.CACTUS_HELMET,
+        //         Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
+        //                 .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
+        //         EquipmentSlot.HEAD);
+
+        // itemModelGenerator.registerArmor(ModItems.CACTUS_CHESTPLATE,
+        //         Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
+        //                 .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
+        //         EquipmentSlot.CHEST);
+        // itemModelGenerator.registerArmor(ModItems.CACTUS_LEGGINGS,
+        //         Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
+        //                 .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
+        //         EquipmentSlot.LEGS);
+        // itemModelGenerator.registerArmor(ModItems.CACTUS_BOOTS,
+        //         Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin"), EquipmentModel.builder()
+        //                 .addHumanoidLayers(Identifier.of(RafaelsUsefulCactus.MOD_ID, "cactus_skin")).build(),
+        //         EquipmentSlot.FEET);
     }
 }

src/main/java/net/rafael/usefulcactus/datagen/ModRecipeProvider.java

@@ -4,8 +4,8 @@
 
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeGenerator;
+import net.minecraft.data.recipe.RecipeExporter;
+import net.minecraft.data.recipe.RecipeGenerator;
 import net.minecraft.item.Items;
 import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.registry.RegistryWrapper;
@@ -205,4 +205,6 @@ public void generate() {
 
                 };
         }
+
+
 }

src/main/java/net/rafael/usefulcactus/item/ModArmorMaterials.java

@@ -4,11 +4,10 @@
 import java.util.EnumMap;
 
 import net.minecraft.item.equipment.ArmorMaterial;
+import net.minecraft.item.equipment.EquipmentAssetKeys;
 import net.minecraft.item.equipment.EquipmentType;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
-import net.rafael.usefulcactus.RafaelsUsefulCactus;
 import net.rafael.usefulcactus.util.ModTags;
 
 public class ModArmorMaterials {
@@ -20,6 +19,6 @@ public class ModArmorMaterials {
                 map.put(EquipmentType.CHESTPLATE,6);
                 map.put(EquipmentType.LEGGINGS,2);
                 map.put(EquipmentType.BODY,4);
-            }),20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND,0,0,ModTags.Items.CACTUS_REPAIR,
-                    Identifier.of(RafaelsUsefulCactus.MOD_ID,"cactus"));
+            }),20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND,0,0,ModTags.Items.CACTUS_REPAIR,EquipmentAssetKeys.register("cactus_skin"));
+
 }

src/main/java/net/rafael/usefulcactus/item/custom/ModArmorItem.java

@@ -85,13 +85,8 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
      * Checks if the player is wearing the correct set of armor for the given material.
      */
     private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-
-
-
         return player.getInventory().armor.stream()
                 .allMatch(stack -> stack.getItem() instanceof ArmorItem &&
-                ((EquippableComponent) stack.getComponents().get(DataComponentTypes.EQUIPPABLE)).model().get() == material.modelId());
-
-
+                ((EquippableComponent) stack.getComponents().get(DataComponentTypes.EQUIPPABLE)).equals(material));
     }
 }

src/main/resources/fabric.mod.json

@@ -30,7 +30,7 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.16.9",
-		"minecraft": "~1.21.3",
+		"minecraft": "~1.21.4",
 		"java": ">=21",
 		"fabric-api": "*"
 	}