Skip to content

Commit

Permalink
some item model generator mappings (#657)
Browse files Browse the repository at this point in the history 
* some item model generator mappings

* equipmentmodels constants

* finish up

* fixes

* Apply suggestions from code review

Co-authored-by: Will <[email protected]>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Will <[email protected]>
  • Loading branch information
@ix0rai @github-actions @supersaiyansubtlety
3 people authored Nov 4, 2024
1 parent b1342a9 commit a17a803
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 0 deletions.
1 change: 1 addition & 0 deletions buildSrc/src/main/resources/minecraft_specific_words.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ whitelisted
shorthair
highlightable
timespan
chainmail

// commands
deop
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/data/EquipmentModelDefinitionsProvider.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
CLASS net/minecraft/unmapped/C_vsteyhwp net/minecraft/data/EquipmentModelDefinitionsProvider
FIELD f_yjnzvdng resolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;
METHOD <init> (Lnet/minecraft/unmapped/C_ugkmwocs;)V
ARG 1 output
8 changes: 8 additions & 0 deletions mappings/net/minecraft/data/client/ItemModelGenerator.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ CLASS net/minecraft/unmapped/C_cfvrpkog net/minecraft/data/client/ItemModelGener
METHOD m_llpeiyoc createArmorJson (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;Lnet/minecraft/unmapped/C_ncpywfca;)Lcom/google/gson/JsonObject;
ARG 1 id
ARG 2 textures
ARG 3 materialOverrideId
METHOD m_mppeudhx registerArmor (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_mgbzsqdv;Lnet/minecraft/unmapped/C_yuycoehb;)V
ARG 1 item
ARG 2 materialOverrideId
ARG 3 model
ARG 4 slot
METHOD m_pmffjxfg registerClock (Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 1 clock
METHOD m_uirjkeyq uploadLayeredItem (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V
Expand All @@ -39,3 +44,6 @@ CLASS net/minecraft/unmapped/C_cfvrpkog net/minecraft/data/client/ItemModelGener
ARG 3 model
METHOD m_zkttuqam register ()V
CLASS C_cutcputf TrimModelData
FIELD f_ylvazehh armorMaterialOverrides Ljava/util/Map;
METHOD m_ovkesrzp armorMaterialOverrides ()Ljava/util/Map;
METHOD m_qfpygivh getArmorMaterialOverride (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/lang/String;
23 changes: 23 additions & 0 deletions mappings/net/minecraft/item/equipment/EquipmentModel.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
CLASS net/minecraft/unmapped/C_mgbzsqdv net/minecraft/item/equipment/EquipmentModel
FIELD f_lbwxvdfm CODEC Lcom/mojang/serialization/Codec;
FIELD f_oycysyiq LAYER_LIST_CODEC Lcom/mojang/serialization/Codec;
METHOD m_jyfxgynh getLayers (Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;)Ljava/util/List;
METHOD m_stlhhglk builder ()Lnet/minecraft/unmapped/C_mgbzsqdv$C_lidehtcr;
CLASS C_jyzwvubc Layer
METHOD m_czayfcey create (Lnet/minecraft/unmapped/C_ncpywfca;Z)Lnet/minecraft/unmapped/C_mgbzsqdv$C_jyzwvubc;
ARG 1 dyeable
METHOD m_txlehlnz getTextureLocation (Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 type
METHOD m_wstkrcxk createLeather (Lnet/minecraft/unmapped/C_ncpywfca;Z)Lnet/minecraft/unmapped/C_mgbzsqdv$C_jyzwvubc;
ARG 1 dyeable
CLASS C_lidehtcr Builder
FIELD f_zryleihw layers Ljava/util/Map;
METHOD m_etkqomyx addHumanoidLayers (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_mgbzsqdv$C_lidehtcr;
METHOD m_kleeaogh build ()Lnet/minecraft/unmapped/C_mgbzsqdv;
METHOD m_szqwgbrg addHumanoidLayers (Lnet/minecraft/unmapped/C_ncpywfca;Z)Lnet/minecraft/unmapped/C_mgbzsqdv$C_lidehtcr;
ARG 2 dyeable
METHOD m_xmfwjeqr addMainHumanoidLayer (Lnet/minecraft/unmapped/C_ncpywfca;Z)Lnet/minecraft/unmapped/C_mgbzsqdv$C_lidehtcr;
METHOD m_yyvtxpwa addLayers (Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;[Lnet/minecraft/unmapped/C_mgbzsqdv$C_jyzwvubc;)Lnet/minecraft/unmapped/C_mgbzsqdv$C_lidehtcr;
CLASS C_maevzcff Dyeable
CLASS C_otwvbrdf LayerType
FIELD f_hoqfleaj id Ljava/lang/String;
16 changes: 16 additions & 0 deletions mappings/net/minecraft/item/equipment/EquipmentModels.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CLASS net/minecraft/unmapped/C_gvxmissl net/minecraft/item/equipment/EquipmentModels
FIELD f_brlprmll ARMADILLO_SCUTE Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_bxvjucae IRON Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_ftmlzyon DIAMOND Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_ghsxyfgh NETHERITE Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_juzunkjt LEATHER Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_jygutpnk CARPETS_BY_COLOR Ljava/util/Map;
FIELD f_nbqpvcek CHAINMAIL Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_ogemasfh TRADER_LLAMA Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_rboepblq ELYTRA Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_wemvazeh TURTLE_SCUTE Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_yflwgfvn GOLD Lnet/minecraft/unmapped/C_ncpywfca;
METHOD m_cburozhh withHumanoidLayers (Ljava/lang/String;)Lnet/minecraft/unmapped/C_mgbzsqdv;
METHOD m_gpvytjtb bootstrap (Ljava/util/function/BiConsumer;)V
ARG 0 equipmentModelConsumer
METHOD m_yjbykbok withHumanoidAndHorseLayers (Ljava/lang/String;)Lnet/minecraft/unmapped/C_mgbzsqdv;
3 changes: 3 additions & 0 deletions mappings/net/minecraft/util/Util.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ CLASS net/minecraft/unmapped/C_lvarvugc net/minecraft/util/Util
METHOD m_rjgutuoq (Ljava/nio/file/spi/FileSystemProvider;)Z
ARG 0 fileSystemProvider
METHOD m_rmfqlirq getOperatingSystem ()Lnet/minecraft/unmapped/C_lvarvugc$C_fqjbnqwz;
METHOD m_rpwoeqxt mapEnum (Ljava/lang/Class;Ljava/util/function/Function;)Ljava/util/EnumMap;
ARG 0 enumClass
ARG 1 mapper
METHOD m_rtqfrpal (Ljava/lang/Object;)Z
ARG 0 unused
METHOD m_rucymwoq (Ljava/lang/String;)V
Expand Down

1 comment on commit a17a803

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit a17a803, 16 file(s) were updated with 103 line(s) added and 99 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-11-04 23:52:15.023895080 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-11-04 23:51:05.299666860 +0000
@@ -9,9 +9,9 @@
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.unmapped.C_btosngnd;
 import net.minecraft.unmapped.C_gxghjvma;
-import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Identifier;
 
 /**
@@ -103,7 +103,7 @@
          this.getContextModel().m_dffrctaa(model);
          this.setVisible(model, armorSlot);
          Identifier lv2 = (Identifier)lv.model().orElseThrow();
-         C_mgbzsqdv.C_otwvbrdf lv3 = this.usesInnerModel(armorSlot) ? C_mgbzsqdv.C_otwvbrdf.HUMANOID_LEGGINGS : C_mgbzsqdv.C_otwvbrdf.HUMANOID;
+         EquipmentModel.LayerType lv3 = this.usesInnerModel(armorSlot) ? EquipmentModel.LayerType.HUMANOID_LEGGINGS : EquipmentModel.LayerType.HUMANOID;
          this.f_weisbvtn.m_llhjytlk(lv3, lv2, model, stack, matrices, vertexConsumers, light);
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-11-04 23:52:15.311896038 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-11-04 23:51:05.559667669 +0000
@@ -15,7 +15,7 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_mgbzsqdv;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.unmapped.C_miillwpg;
 import net.minecraft.unmapped.C_pkqgufgx;
 import net.minecraft.unmapped.C_rxqlqsot;
@@ -48,13 +48,13 @@
 
    /**
     * @mapping {@literal hashed m_nmlegkzt Lnet/minecraft/unmapped/C_sdwvdanz;m_nmlegkzt(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;)Z}
-    * @mapping {@literal named m_nmlegkzt Lnet/minecraft/client/render/entity/feature/CapeFeatureRenderer;m_nmlegkzt(Lnet/minecraft/item/ItemStack;Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;)Z}
+    * @mapping {@literal named m_nmlegkzt Lnet/minecraft/client/render/entity/feature/CapeFeatureRenderer;m_nmlegkzt(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/equipment/EquipmentModel$LayerType;)Z}
     */
-   private boolean m_nmlegkzt(ItemStack stack, C_mgbzsqdv.C_otwvbrdf key) {
+   private boolean m_nmlegkzt(ItemStack stack, EquipmentModel.LayerType key) {
       EquippableComponent lv = stack.get(DataComponentTypes.EQUIPPABLE);
       if (lv != null && !lv.model().isEmpty()) {
-         C_mgbzsqdv lv2 = this.f_rilqngmm.m_kszmxske((Identifier)lv.model().get());
-         return !lv2.m_jyfxgynh(key).isEmpty();
+         EquipmentModel lv2 = this.f_rilqngmm.m_kszmxske((Identifier)lv.model().get());
+         return !lv2.getLayers(key).isEmpty();
       } else {
          return false;
       }
@@ -68,9 +68,9 @@
       if (!arg3.f_qcpkjxfw && arg3.f_vnifwvmf) {
          PlayerSkin lv = arg3.f_ttmtxfcs;
          if (lv.capeTexture() != null) {
-            if (!this.m_nmlegkzt(arg3.f_yculljvb, C_mgbzsqdv.C_otwvbrdf.WINGS)) {
+            if (!this.m_nmlegkzt(arg3.f_yculljvb, EquipmentModel.LayerType.WINGS)) {
                matrices.push();
-               if (this.m_nmlegkzt(arg3.f_yculljvb, C_mgbzsqdv.C_otwvbrdf.HUMANOID)) {
+               if (this.m_nmlegkzt(arg3.f_yculljvb, EquipmentModel.LayerType.HUMANOID)) {
                   matrices.translate(0.0F, -0.053125F, 0.06875F);
                }
 
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-11-04 23:52:15.031895107 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-11-04 23:51:05.303666872 +0000
@@ -10,9 +10,9 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.unmapped.C_gxghjvma;
 import net.minecraft.unmapped.C_jmqrtfry;
-import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Identifier;
 
 /**
@@ -56,7 +56,7 @@
          HorseEntityModel lv3 = arg3.f_vetzpkzw ? this.f_qnxftgno : this.f_chbtqerl;
          Identifier lv4 = (Identifier)lv2.model().get();
          lv3.setAngles(arg3);
-         this.f_efbriogz.m_llhjytlk(C_mgbzsqdv.C_otwvbrdf.HORSE_BODY, lv4, lv3, lv, matrices, vertexConsumers, i);
+         this.f_efbriogz.m_llhjytlk(EquipmentModel.LayerType.HORSE_BODY, lv4, lv3, lv, matrices, vertexConsumers, i);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-11-04 23:52:15.027895093 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-11-04 23:51:05.299666860 +0000
@@ -10,10 +10,10 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_gvxmissl;
+import net.minecraft.item.equipment.EquipmentModel;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.unmapped.C_gxghjvma;
 import net.minecraft.unmapped.C_ivvdyrnm;
-import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Identifier;
 
 /**
@@ -56,7 +56,7 @@
       if (lv2 != null && lv2.model().isPresent()) {
          this.m_mfgrmedl(matrices, vertexConsumers, arg3, lv, (Identifier)lv2.model().get(), i);
       } else if (arg3.f_xvktkzok) {
-         this.m_mfgrmedl(matrices, vertexConsumers, arg3, ItemStack.EMPTY, C_gvxmissl.f_ogemasfh, i);
+         this.m_mfgrmedl(matrices, vertexConsumers, arg3, ItemStack.EMPTY, EquipmentModels.TRADER_LLAMA, i);
       }
    }
 
@@ -67,6 +67,6 @@
    private void m_mfgrmedl(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_ivvdyrnm arg3, ItemStack stack, Identifier id, int i) {
       LlamaEntityModel lv = arg3.f_vetzpkzw ? this.f_vgmqtflz : this.f_gwhswcjl;
       lv.setAngles(arg3);
-      this.f_cdikxozv.m_llhjytlk(C_mgbzsqdv.C_otwvbrdf.LLAMA_BODY, id, lv, stack, matrices, vertexConsumers, i);
+      this.f_cdikxozv.m_llhjytlk(EquipmentModel.LayerType.LLAMA_BODY, id, lv, stack, matrices, vertexConsumers, i);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-11-04 23:52:15.031895107 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-11-04 23:51:05.303666872 +0000
@@ -15,10 +15,10 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.unmapped.C_fudcfuiw;
 import net.minecraft.unmapped.C_gveqshad;
 import net.minecraft.unmapped.C_gxghjvma;
-import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Identifier;
 
 /**
@@ -74,7 +74,7 @@
          WolfEntityModel lv3 = arg3.f_vetzpkzw ? this.f_lacitret : this.f_slmmbgwl;
          Identifier lv4 = (Identifier)lv2.model().get();
          lv3.setAngles(arg3);
-         this.f_arcttovh.m_llhjytlk(C_mgbzsqdv.C_otwvbrdf.WOLF_BODY, lv4, lv3, lv, matrices, vertexConsumers, i);
+         this.f_arcttovh.m_llhjytlk(EquipmentModel.LayerType.WOLF_BODY, lv4, lv3, lv, matrices, vertexConsumers, i);
          this.m_tcxlaqpy(matrices, vertexConsumers, i, lv, lv3);
       }
    }
diff -bur namedTargetSrc/net/minecraft/component/type/EquippableComponent.java namedSrc/net/minecraft/component/type/EquippableComponent.java
--- namedTargetSrc/net/minecraft/component/type/EquippableComponent.java	2024-11-04 23:52:15.039895133 +0000
+++ namedSrc/net/minecraft/component/type/EquippableComponent.java	2024-11-04 23:51:05.311666896 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.codec.PacketCodecs;
@@ -19,7 +20,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_gvxmissl;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
@@ -85,7 +85,7 @@
    public static EquippableComponent m_vrowzmfm(DyeColor arg) {
       return m_dvyqpxuk(EquipmentSlot.BODY)
          .m_mclyyioh(SoundEvents.ENTITY_LLAMA_SWAG)
-         .m_pwasgbhq((Identifier)C_gvxmissl.f_jygutpnk.get(arg))
+         .m_pwasgbhq((Identifier)EquipmentModels.CARPETS_BY_COLOR.get(arg))
          .m_hgxcwman(EntityType.LLAMA, EntityType.TRADER_LLAMA)
          .m_fpnylzxv();
    }
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-11-04 23:52:15.287895958 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-11-04 23:51:05.531667582 +0000
@@ -19,9 +19,9 @@
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
+import net.minecraft.item.equipment.EquipmentModel;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.registry.Registries;
-import net.minecraft.unmapped.C_gvxmissl;
-import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Identifier;
 
 /**
@@ -40,13 +40,13 @@
     */
    private static final List<ItemModelGenerator.TrimModelData> TRIM_MATERIALS = List.of(
       new ItemModelGenerator.TrimModelData("quartz", 0.1F, Map.of()),
-      new ItemModelGenerator.TrimModelData("iron", 0.2F, Map.of(C_gvxmissl.f_bxvjucae, "iron_darker")),
-      new ItemModelGenerator.TrimModelData("netherite", 0.3F, Map.of(C_gvxmissl.f_ghsxyfgh, "netherite_darker")),
+      new ItemModelGenerator.TrimModelData("iron", 0.2F, Map.of(EquipmentModels.IRON, "iron_darker")),
+      new ItemModelGenerator.TrimModelData("netherite", 0.3F, Map.of(EquipmentModels.NETHERITE, "netherite_darker")),
       new ItemModelGenerator.TrimModelData("redstone", 0.4F, Map.of()),
       new ItemModelGenerator.TrimModelData("copper", 0.5F, Map.of()),
-      new ItemModelGenerator.TrimModelData("gold", 0.6F, Map.of(C_gvxmissl.f_yflwgfvn, "gold_darker")),
+      new ItemModelGenerator.TrimModelData("gold", 0.6F, Map.of(EquipmentModels.GOLD, "gold_darker")),
       new ItemModelGenerator.TrimModelData("emerald", 0.7F, Map.of()),
-      new ItemModelGenerator.TrimModelData("diamond", 0.8F, Map.of(C_gvxmissl.f_ftmlzyon, "diamond_darker")),
+      new ItemModelGenerator.TrimModelData("diamond", 0.8F, Map.of(EquipmentModels.DIAMOND, "diamond_darker")),
       new ItemModelGenerator.TrimModelData("lapis", 0.9F, Map.of()),
       new ItemModelGenerator.TrimModelData("amethyst", 1.0F, Map.of())
    );
@@ -146,7 +146,7 @@
     * @mapping {@literal hashed m_llpeiyoc Lnet/minecraft/unmapped/C_cfvrpkog;m_llpeiyoc(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;Lnet/minecraft/unmapped/C_ncpywfca;)Lcom/google/gson/JsonObject;}
     * @mapping {@literal named createArmorJson Lnet/minecraft/data/client/ItemModelGenerator;createArmorJson(Lnet/minecraft/util/Identifier;Ljava/util/Map;Lnet/minecraft/util/Identifier;)Lcom/google/gson/JsonObject;}
     */
-   private JsonObject createArmorJson(Identifier id, Map<TextureKey, Identifier> textures, Identifier arg2) {
+   private JsonObject createArmorJson(Identifier id, Map<TextureKey, Identifier> textures, Identifier materialOverrideId) {
       JsonObject jsonObject = Models.DOUBLE_LAYER_ITEM.createJson(id, textures);
       JsonArray jsonArray = new JsonArray();
 
@@ -155,7 +155,7 @@
          JsonObject jsonObject3 = new JsonObject();
          jsonObject3.addProperty(TRIM_TYPE.getPath(), lv.itemModelIndex());
          jsonObject2.add("predicate", jsonObject3);
-         jsonObject2.addProperty("model", this.suffixTrim(id, lv.m_qfpygivh(arg2)).toString());
+         jsonObject2.addProperty("model", this.suffixTrim(id, lv.getArmorMaterialOverride(materialOverrideId)).toString());
          jsonArray.add(jsonObject2);
       }
 
@@ -165,21 +165,21 @@
 
    /**
     * @mapping {@literal hashed m_mppeudhx Lnet/minecraft/unmapped/C_cfvrpkog;m_mppeudhx(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_mgbzsqdv;Lnet/minecraft/unmapped/C_yuycoehb;)V}
-    * @mapping {@literal named registerArmor Lnet/minecraft/data/client/ItemModelGenerator;registerArmor(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/unmapped/C_mgbzsqdv;Lnet/minecraft/entity/EquipmentSlot;)V}
+    * @mapping {@literal named registerArmor Lnet/minecraft/data/client/ItemModelGenerator;registerArmor(Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/item/equipment/EquipmentModel;Lnet/minecraft/entity/EquipmentSlot;)V}
     */
-   private void registerArmor(Item arg, Identifier id, C_mgbzsqdv arg3, EquipmentSlot arg4) {
-      List<C_mgbzsqdv.C_jyzwvubc> list = arg3.m_jyfxgynh(C_mgbzsqdv.C_otwvbrdf.HUMANOID);
+   private void registerArmor(Item item, Identifier materialOverrideId, EquipmentModel model, EquipmentSlot slot) {
+      List<EquipmentModel.Layer> list = model.getLayers(EquipmentModel.LayerType.HUMANOID);
       if (!list.isEmpty()) {
-         boolean bl = list.size() == 2 && ((C_mgbzsqdv.C_jyzwvubc)list.getFirst()).dyeable().isPresent();
-         Identifier lv = ModelIds.getItemModelId(arg);
-         Identifier lv2 = Texture.getId(arg);
-         Identifier lv3 = Texture.getSubId(arg, "_overlay");
+         boolean bl = list.size() == 2 && ((EquipmentModel.Layer)list.getFirst()).dyeable().isPresent();
+         Identifier lv = ModelIds.getItemModelId(item);
+         Identifier lv2 = Texture.getId(item);
+         Identifier lv3 = Texture.getSubId(item, "_overlay");
          if (bl) {
-            Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, id));
+            Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, materialOverrideId));
          } else {
-            Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, id));
+            Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, materialOverrideId));
          }
-         String string = switch (arg4) {
+         String string = switch (slot) {
             case HEAD -> "helmet";
             case CHEST -> "chestplate";
             case LEGS -> "leggings";
@@ -188,7 +188,7 @@
          };
 
          for (ItemModelGenerator.TrimModelData lv4 : TRIM_MATERIALS) {
-            String string2 = lv4.m_qfpygivh(id);
+            String string2 = lv4.getArmorMaterialOverride(materialOverrideId);
             Identifier lv5 = this.suffixTrim(lv, string2);
             String string3 = string + "_trim_" + string2;
             Identifier lv6 = Identifier.ofDefault(string3).withPrefix("trims/items/");
@@ -471,14 +471,14 @@
       this.register(Items.BOLT_ARMOR_TRIM_SMITHING_TEMPLATE, Models.SINGLE_LAYER_ITEM);
       this.register(Items.DEBUG_STICK, Items.STICK, Models.HANDHELD);
       this.register(Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_APPLE, Models.SINGLE_LAYER_ITEM);
-      Map<Identifier, C_mgbzsqdv> map = new HashMap();
-      C_gvxmissl.m_gpvytjtb(map::put);
+      Map<Identifier, EquipmentModel> map = new HashMap();
+      EquipmentModels.bootstrap(map::put);
 
       for (Item lv : Registries.ITEM) {
          EquippableComponent lv2 = lv.getComponents().get(DataComponentTypes.EQUIPPABLE);
          if (lv2 != null && lv2.slot().getType() == EquipmentSlot.Type.HUMANOID_ARMOR && lv2.model().isPresent()) {
             Identifier lv3 = (Identifier)lv2.model().get();
-            C_mgbzsqdv lv4 = (C_mgbzsqdv)map.get(lv3);
+            EquipmentModel lv4 = (EquipmentModel)map.get(lv3);
             if (lv4 == null) {
                throw new IllegalStateException("Referenced equipment model does not exist: " + lv3);
             }
@@ -536,13 +536,13 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_cfvrpkog$C_cutcputf}
     * @mapping {@literal named net/minecraft/data/client/ItemModelGenerator$TrimModelData}
     */
-   static record TrimModelData(String name, float itemModelIndex, Map<Identifier, String> overrideArmorMaterials) {
+   static record TrimModelData(String name, float itemModelIndex, Map<Identifier, String> armorMaterialOverrides) {
       /**
        * @mapping {@literal hashed m_qfpygivh Lnet/minecraft/unmapped/C_cfvrpkog$C_cutcputf;m_qfpygivh(Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/lang/String;}
-       * @mapping {@literal named m_qfpygivh Lnet/minecraft/data/client/ItemModelGenerator$TrimModelData;m_qfpygivh(Lnet/minecraft/util/Identifier;)Ljava/lang/String;}
+       * @mapping {@literal named getArmorMaterialOverride Lnet/minecraft/data/client/ItemModelGenerator$TrimModelData;getArmorMaterialOverride(Lnet/minecraft/util/Identifier;)Ljava/lang/String;}
        */
-      public String m_qfpygivh(Identifier id) {
-         return (String)this.overrideArmorMaterials.getOrDefault(id, this.name);
+      public String getArmorMaterialOverride(Identifier id) {
+         return (String)this.armorMaterialOverrides.getOrDefault(id, this.name);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/EquipmentModelDefinitionsProvider.java namedSrc/net/minecraft/data/EquipmentModelDefinitionsProvider.java
--- namedTargetSrc/net/minecraft/data/EquipmentModelDefinitionsProvider.java	2024-11-04 23:52:15.183895612 +0000
+++ namedSrc/net/minecraft/data/EquipmentModelDefinitionsProvider.java	2024-11-04 23:51:05.447667320 +0000
@@ -3,8 +3,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import net.minecraft.unmapped.C_gvxmissl;
-import net.minecraft.unmapped.C_mgbzsqdv;
+import net.minecraft.item.equipment.EquipmentModel;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.util.Identifier;
 
 /**
@@ -13,16 +13,17 @@
  */
 public class EquipmentModelDefinitionsProvider implements DataProvider {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yjnzvdng Lnet/minecraft/unmapped/C_vsteyhwp;f_yjnzvdng:Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;}
+    * @mapping {@literal named resolver Lnet/minecraft/data/EquipmentModelDefinitionsProvider;resolver:Lnet/minecraft/data/DataPackOutput$PathResolver;}
     */
-   private final DataPackOutput.PathResolver f_yjnzvdng;
+   private final DataPackOutput.PathResolver resolver;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_vsteyhwp;<init>(Lnet/minecraft/unmapped/C_ugkmwocs;)V}
     * @mapping {@literal named <init> Lnet/minecraft/data/EquipmentModelDefinitionsProvider;<init>(Lnet/minecraft/data/DataPackOutput;)V}
     */
-   public EquipmentModelDefinitionsProvider(DataPackOutput arg) {
-      this.f_yjnzvdng = arg.createPathResolver(DataPackOutput.Type.RESOURCE_PACK, "models/equipment");
+   public EquipmentModelDefinitionsProvider(DataPackOutput output) {
+      this.resolver = output.createPathResolver(DataPackOutput.Type.RESOURCE_PACK, "models/equipment");
    }
 
    /**
@@ -30,13 +31,13 @@
     */
    @Override
    public CompletableFuture<?> run(DataWriter writer) {
-      Map<Identifier, C_mgbzsqdv> map = new HashMap();
-      C_gvxmissl.m_gpvytjtb((id, arg2) -> {
+      Map<Identifier, EquipmentModel> map = new HashMap();
+      EquipmentModels.bootstrap((id, arg2) -> {
          if (map.putIfAbsent(id, arg2) != null) {
             throw new IllegalStateException("Tried to register equipment model twice for id: " + id);
          }
       });
-      return DataProvider.m_wpkivhvh(writer, C_mgbzsqdv.f_lbwxvdfm, this.f_yjnzvdng, map);
+      return DataProvider.m_wpkivhvh(writer, EquipmentModel.CODEC, this.resolver, map);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/item/ArmorMaterials.java namedSrc/net/minecraft/item/ArmorMaterials.java
--- namedTargetSrc/net/minecraft/item/ArmorMaterials.java	2024-11-04 23:52:15.219895732 +0000
+++ namedSrc/net/minecraft/item/ArmorMaterials.java	2024-11-04 23:51:05.475667408 +0000
@@ -1,10 +1,10 @@
 package net.minecraft.item;
 
 import java.util.EnumMap;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_cebksdnb;
-import net.minecraft.unmapped.C_gvxmissl;
 import net.minecraft.util.Util;
 
 /**
@@ -21,7 +21,7 @@
       map.put(C_cebksdnb.CHESTPLATE, 3);
       map.put(C_cebksdnb.HELMET, 1);
       map.put(C_cebksdnb.BODY, 3);
-   }), 15, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.0F, 0.0F, ItemTags.REPAIRS_LEATHER_ARMOR, C_gvxmissl.f_juzunkjt);
+   }), 15, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.0F, 0.0F, ItemTags.REPAIRS_LEATHER_ARMOR, EquipmentModels.LEATHER);
    /**
     * Mapping not found
     */
@@ -31,7 +31,7 @@
       enumMap.put(C_cebksdnb.CHESTPLATE, 5);
       enumMap.put(C_cebksdnb.HELMET, 2);
       enumMap.put(C_cebksdnb.BODY, 4);
-   }), 12, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, 0.0F, 0.0F, ItemTags.REPAIRS_CHAIN_ARMOR, C_gvxmissl.f_nbqpvcek);
+   }), 12, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, 0.0F, 0.0F, ItemTags.REPAIRS_CHAIN_ARMOR, EquipmentModels.CHAINMAIL);
    /**
     * Mapping not found
     */
@@ -41,7 +41,7 @@
       map.put(C_cebksdnb.CHESTPLATE, 6);
       map.put(C_cebksdnb.HELMET, 2);
       map.put(C_cebksdnb.BODY, 5);
-   }), 9, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, ItemTags.REPAIRS_IRON_ARMOR, C_gvxmissl.f_bxvjucae);
+   }), 9, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, ItemTags.REPAIRS_IRON_ARMOR, EquipmentModels.IRON);
    /**
     * Mapping not found
     */
@@ -51,7 +51,7 @@
       enumMap.put(C_cebksdnb.CHESTPLATE, 5);
       enumMap.put(C_cebksdnb.HELMET, 2);
       enumMap.put(C_cebksdnb.BODY, 7);
-   }), 25, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, ItemTags.REPAIRS_GOLD_ARMOR, C_gvxmissl.f_yflwgfvn);
+   }), 25, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, ItemTags.REPAIRS_GOLD_ARMOR, EquipmentModels.GOLD);
    /**
     * Mapping not found
     */
@@ -61,7 +61,7 @@
       map.put(C_cebksdnb.CHESTPLATE, 8);
       map.put(C_cebksdnb.HELMET, 3);
       map.put(C_cebksdnb.BODY, 11);
-   }), 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, ItemTags.REPAIRS_DIAMOND_ARMOR, C_gvxmissl.f_ftmlzyon);
+   }), 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, ItemTags.REPAIRS_DIAMOND_ARMOR, EquipmentModels.DIAMOND);
    /**
     * Mapping not found
     */
@@ -71,7 +71,7 @@
       enumMap.put(C_cebksdnb.CHESTPLATE, 6);
       enumMap.put(C_cebksdnb.HELMET, 2);
       enumMap.put(C_cebksdnb.BODY, 5);
-   }), 9, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, ItemTags.REPAIRS_TURTLE_HELMET, C_gvxmissl.f_wemvazeh);
+   }), 9, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, 0.0F, ItemTags.REPAIRS_TURTLE_HELMET, EquipmentModels.TURTLE_SCUTE);
    /**
     * Mapping not found
     */
@@ -81,7 +81,7 @@
       map.put(C_cebksdnb.CHESTPLATE, 8);
       map.put(C_cebksdnb.HELMET, 3);
       map.put(C_cebksdnb.BODY, 11);
-   }), 15, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 3.0F, 0.1F, ItemTags.REPAIRS_NETHERITE_ARMOR, C_gvxmissl.f_ghsxyfgh);
+   }), 15, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 3.0F, 0.1F, ItemTags.REPAIRS_NETHERITE_ARMOR, EquipmentModels.NETHERITE);
    /**
     * Mapping not found
     */
@@ -91,5 +91,5 @@
       enumMap.put(C_cebksdnb.CHESTPLATE, 8);
       enumMap.put(C_cebksdnb.HELMET, 3);
       enumMap.put(C_cebksdnb.BODY, 11);
-   }), 10, SoundEvents.ITEM_ARMOR_EQUIP_WOLF, 0.0F, 0.0F, ItemTags.REPAIRS_WOLF_ARMOR, C_gvxmissl.f_brlprmll);
+   }), 10, SoundEvents.ITEM_ARMOR_EQUIP_WOLF, 0.0F, 0.0F, ItemTags.REPAIRS_WOLF_ARMOR, EquipmentModels.ARMADILLO_SCUTE);
 }
Only in namedSrc/net/minecraft/item: equipment
diff -bur namedTargetSrc/net/minecraft/item/Items.java namedSrc/net/minecraft/item/Items.java
--- namedTargetSrc/net/minecraft/item/Items.java	2024-11-04 23:52:15.035895120 +0000
+++ namedSrc/net/minecraft/item/Items.java	2024-11-04 23:51:05.307666885 +0000
@@ -26,6 +26,7 @@
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.feature_flags.FeatureFlags;
 import net.minecraft.fluid.Fluids;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
@@ -37,7 +38,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_bemqmqey;
 import net.minecraft.unmapped.C_cebksdnb;
-import net.minecraft.unmapped.C_gvxmissl;
 import net.minecraft.unmapped.C_gzmmqgkx;
 import net.minecraft.unmapped.C_npqbextr;
 import net.minecraft.unmapped.C_uaiigijw;
@@ -4188,7 +4188,7 @@
             DataComponentTypes.EQUIPPABLE,
             EquippableComponent.m_dvyqpxuk(EquipmentSlot.CHEST)
                .m_mclyyioh(SoundEvents.ITEM_ARMOR_EQUIP_ELYTRA)
-               .m_pwasgbhq(C_gvxmissl.f_rboepblq)
+               .m_pwasgbhq(EquipmentModels.ELYTRA)
                .m_sastippl(false)
                .m_fpnylzxv()
          )
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterials.java namedSrc/net/minecraft/item/trim/ArmorTrimMaterials.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterials.java	2024-11-04 23:52:15.311896038 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimMaterials.java	2024-11-04 23:51:05.559667669 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.equipment.EquipmentModels;
 import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderLookup;
@@ -12,7 +13,6 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_gvxmissl;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 
@@ -78,13 +78,13 @@
     */
    public static void bootstrap(BootstrapContext<ArmorTrimMaterial> trimMaterials) {
       register(trimMaterials, QUARTZ, Items.QUARTZ, Style.EMPTY.withColor(14931140), 0.1F);
-      register(trimMaterials, IRON, Items.IRON_INGOT, Style.EMPTY.withColor(15527148), 0.2F, Map.of(C_gvxmissl.f_bxvjucae, "iron_darker"));
-      register(trimMaterials, NETHERITE, Items.NETHERITE_INGOT, Style.EMPTY.withColor(6445145), 0.3F, Map.of(C_gvxmissl.f_ghsxyfgh, "netherite_darker"));
+      register(trimMaterials, IRON, Items.IRON_INGOT, Style.EMPTY.withColor(15527148), 0.2F, Map.of(EquipmentModels.IRON, "iron_darker"));
+      register(trimMaterials, NETHERITE, Items.NETHERITE_INGOT, Style.EMPTY.withColor(6445145), 0.3F, Map.of(EquipmentModels.NETHERITE, "netherite_darker"));
       register(trimMaterials, REDSTONE, Items.REDSTONE, Style.EMPTY.withColor(9901575), 0.4F);
       register(trimMaterials, COPPER, Items.COPPER_INGOT, Style.EMPTY.withColor(11823181), 0.5F);
-      register(trimMaterials, GOLD, Items.GOLD_INGOT, Style.EMPTY.withColor(14594349), 0.6F, Map.of(C_gvxmissl.f_yflwgfvn, "gold_darker"));
+      register(trimMaterials, GOLD, Items.GOLD_INGOT, Style.EMPTY.withColor(14594349), 0.6F, Map.of(EquipmentModels.GOLD, "gold_darker"));
       register(trimMaterials, EMERALD, Items.EMERALD, Style.EMPTY.withColor(1155126), 0.7F);
-      register(trimMaterials, DIAMOND, Items.DIAMOND, Style.EMPTY.withColor(7269586), 0.8F, Map.of(C_gvxmissl.f_ftmlzyon, "diamond_darker"));
+      register(trimMaterials, DIAMOND, Items.DIAMOND, Style.EMPTY.withColor(7269586), 0.8F, Map.of(EquipmentModels.DIAMOND, "diamond_darker"));
       register(trimMaterials, LAPIS, Items.LAPIS_LAZULI, Style.EMPTY.withColor(4288151), 0.9F);
       register(trimMaterials, AMETHYST, Items.AMETHYST_SHARD, Style.EMPTY.withColor(10116294), 1.0F);
    }
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimPermutation.java namedSrc/net/minecraft/item/trim/ArmorTrimPermutation.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimPermutation.java	2024-11-04 23:52:15.195895652 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimPermutation.java	2024-11-04 23:51:05.455667345 +0000
@@ -7,13 +7,13 @@
 import net.minecraft.client.item.TooltipConfig;
 import net.minecraft.item.Item;
 import net.minecraft.item.TooltipAppender;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.codec.PacketCodecs;
 import net.minecraft.registry.Holder;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -82,9 +82,9 @@
 
    /**
     * @mapping {@literal hashed m_phhuxkxr Lnet/minecraft/unmapped/C_vglbnrob;m_phhuxkxr(Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named m_phhuxkxr Lnet/minecraft/item/trim/ArmorTrimPermutation;m_phhuxkxr(Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;}
+    * @mapping {@literal named m_phhuxkxr Lnet/minecraft/item/trim/ArmorTrimPermutation;m_phhuxkxr(Lnet/minecraft/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;}
     */
-   public Identifier m_phhuxkxr(C_mgbzsqdv.C_otwvbrdf arg, Identifier id) {
+   public Identifier m_phhuxkxr(EquipmentModel.LayerType arg, Identifier id) {
       Identifier lv = this.pattern.getValue().assetId();
       String string = getColorPaletteSuffix(this.material, id);
       return lv.withPath((UnaryOperator<String>)(string2 -> "trims/entity/" + arg.asString() + "/" + string2 + "_" + string));
Only in namedTargetSrc/net/minecraft/unmapped: C_gvxmissl.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_gxghjvma.java namedSrc/net/minecraft/unmapped/C_gxghjvma.java
--- namedTargetSrc/net/minecraft/unmapped/C_gxghjvma.java	2024-11-04 23:52:15.279895932 +0000
+++ namedSrc/net/minecraft/unmapped/C_gxghjvma.java	2024-11-04 23:51:05.523667558 +0000
@@ -18,6 +18,7 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.DyedColorComponent;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.item.trim.ArmorTrimPermutation;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.util.ArgbHelper;
@@ -54,7 +55,7 @@
     */
    public C_gxghjvma(C_rxqlqsot arg, SpriteAtlasTexture arg2) {
       this.f_uvuntrqw = arg;
-      this.f_dxlhtevn = Util.memoize((Function<C_gxghjvma.C_mxmejhxz, Identifier>)(argx -> argx.layer.m_txlehlnz(argx.layerType)));
+      this.f_dxlhtevn = Util.memoize((Function<C_gxghjvma.C_mxmejhxz, Identifier>)(argx -> argx.layer.getTextureLocation(argx.layerType)));
       this.f_wxbaqcxs = Util.memoize((Function<C_gxghjvma.C_gljqinsc, Sprite>)(arg2x -> {
          Identifier lv = arg2x.trim.m_phhuxkxr(arg2x.layerType, arg2x.equipmentModelId);
          return arg2.getSprite(lv);
@@ -63,20 +64,20 @@
 
    /**
     * @mapping {@literal hashed m_llhjytlk Lnet/minecraft/unmapped/C_gxghjvma;m_llhjytlk(Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_lzwtpfka;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;I)V}
-    * @mapping {@literal named m_llhjytlk Lnet/minecraft/unmapped/C_gxghjvma;m_llhjytlk(Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
+    * @mapping {@literal named m_llhjytlk Lnet/minecraft/unmapped/C_gxghjvma;m_llhjytlk(Lnet/minecraft/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
     */
    public void m_llhjytlk(
-      C_mgbzsqdv.C_otwvbrdf key, Identifier id, Model arg3, ItemStack stack, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i
+      EquipmentModel.LayerType key, Identifier id, Model arg3, ItemStack stack, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i
    ) {
       this.m_rzzkspxz(key, id, arg3, stack, matrices, vertexConsumers, i, null);
    }
 
    /**
     * @mapping {@literal hashed m_rzzkspxz Lnet/minecraft/unmapped/C_gxghjvma;m_rzzkspxz(Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_lzwtpfka;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_ncpywfca;)V}
-    * @mapping {@literal named m_rzzkspxz Lnet/minecraft/unmapped/C_gxghjvma;m_rzzkspxz(Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;)V}
+    * @mapping {@literal named m_rzzkspxz Lnet/minecraft/unmapped/C_gxghjvma;m_rzzkspxz(Lnet/minecraft/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/model/Model;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/util/Identifier;)V}
     */
    public void m_rzzkspxz(
-      C_mgbzsqdv.C_otwvbrdf arg,
+      EquipmentModel.LayerType arg,
       Identifier arg2,
       Model arg3,
       ItemStack stack,
@@ -85,12 +86,12 @@
       int i,
       @Nullable Identifier arg7
    ) {
-      List<C_mgbzsqdv.C_jyzwvubc> list = this.f_uvuntrqw.m_kszmxske(arg2).m_jyfxgynh(arg);
+      List<EquipmentModel.Layer> list = this.f_uvuntrqw.m_kszmxske(arg2).getLayers(arg);
       if (!list.isEmpty()) {
          int j = stack.isIn(ItemTags.DYEABLE) ? DyedColorComponent.getColorOrDefault(stack, 0) : 0;
          boolean bl = stack.hasGlint();
 
-         for (C_mgbzsqdv.C_jyzwvubc lv : list) {
+         for (EquipmentModel.Layer lv : list) {
             int k = m_tbekogki(lv, j);
             if (k != 0) {
                Identifier lv2 = lv.usePlayerTexture() && arg7 != null ? arg7 : (Identifier)this.f_dxlhtevn.apply(new C_gxghjvma.C_mxmejhxz(arg, lv));
@@ -114,10 +115,10 @@
    /**
     * Mapping not found
     */
-   private static int m_tbekogki(C_mgbzsqdv.C_jyzwvubc arg, int i) {
-      Optional<C_mgbzsqdv.C_maevzcff> optional = arg.dyeable();
+   private static int m_tbekogki(EquipmentModel.Layer arg, int i) {
+      Optional<EquipmentModel.Dyeable> optional = arg.dyeable();
       if (optional.isPresent()) {
-         int j = (Integer)((C_mgbzsqdv.C_maevzcff)optional.get()).colorWhenUndyed().map(ArgbHelper::opaque).orElse(0);
+         int j = (Integer)((EquipmentModel.Dyeable)optional.get()).colorWhenUndyed().map(ArgbHelper::opaque).orElse(0);
          return i != 0 ? i : j;
       } else {
          return -1;
@@ -129,7 +130,7 @@
     * @mapping {@literal named net/minecraft/unmapped/C_gxghjvma$C_gljqinsc}
     */
    @Environment(EnvType.CLIENT)
-   static record C_gljqinsc(ArmorTrimPermutation trim, C_mgbzsqdv.C_otwvbrdf layerType, Identifier equipmentModelId) {
+   static record C_gljqinsc(ArmorTrimPermutation trim, EquipmentModel.LayerType layerType, Identifier equipmentModelId) {
    }
 
    /**
@@ -137,6 +138,6 @@
     * @mapping {@literal named net/minecraft/unmapped/C_gxghjvma$C_mxmejhxz}
     */
    @Environment(EnvType.CLIENT)
-   static record C_mxmejhxz(C_mgbzsqdv.C_otwvbrdf layerType, C_mgbzsqdv.C_jyzwvubc layer) {
+   static record C_mxmejhxz(EquipmentModel.LayerType layerType, EquipmentModel.Layer layer) {
    }
 }
Only in namedTargetSrc/net/minecraft/unmapped: C_mgbzsqdv.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_rxqlqsot.java namedSrc/net/minecraft/unmapped/C_rxqlqsot.java
--- namedTargetSrc/net/minecraft/unmapped/C_rxqlqsot.java	2024-11-04 23:52:15.091895306 +0000
+++ namedSrc/net/minecraft/unmapped/C_rxqlqsot.java	2024-11-04 23:51:05.363667059 +0000
@@ -3,6 +3,7 @@
 import java.util.Map;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.resource.JsonDataLoader;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
@@ -13,37 +14,37 @@
  * @mapping {@literal named net/minecraft/unmapped/C_rxqlqsot}
  */
 @Environment(EnvType.CLIENT)
-public class C_rxqlqsot extends JsonDataLoader<C_mgbzsqdv> {
+public class C_rxqlqsot extends JsonDataLoader<EquipmentModel> {
    /**
     * Mapping not found
     */
-   public static final C_mgbzsqdv f_ifcupbjo = new C_mgbzsqdv(Map.of());
+   public static final EquipmentModel f_ifcupbjo = new EquipmentModel(Map.of());
    /**
     * Mapping not found
     */
-   private Map<Identifier, C_mgbzsqdv> f_ifqviucp = Map.of();
+   private Map<Identifier, EquipmentModel> f_ifqviucp = Map.of();
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rxqlqsot;<init>()V}
     * @mapping {@literal named <init> Lnet/minecraft/unmapped/C_rxqlqsot;<init>()V}
     */
    public C_rxqlqsot() {
-      super(C_mgbzsqdv.f_lbwxvdfm, "models/equipment");
+      super(EquipmentModel.CODEC, "models/equipment");
    }
 
    /**
     * @mapping {@literal hashed m_ywdmnujl Lnet/minecraft/unmapped/C_rxqlqsot;m_ywdmnujl(Ljava/util/Map;Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
     * @mapping {@literal named apply Lnet/minecraft/unmapped/C_rxqlqsot;apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V}
     */
-   protected void apply(Map<Identifier, C_mgbzsqdv> map, ResourceManager resourceManager, Profiler profiler) {
+   protected void apply(Map<Identifier, EquipmentModel> map, ResourceManager resourceManager, Profiler profiler) {
       this.f_ifqviucp = Map.copyOf(map);
    }
 
    /**
     * @mapping {@literal hashed m_kszmxske Lnet/minecraft/unmapped/C_rxqlqsot;m_kszmxske(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_mgbzsqdv;}
-    * @mapping {@literal named m_kszmxske Lnet/minecraft/unmapped/C_rxqlqsot;m_kszmxske(Lnet/minecraft/util/Identifier;)Lnet/minecraft/unmapped/C_mgbzsqdv;}
+    * @mapping {@literal named m_kszmxske Lnet/minecraft/unmapped/C_rxqlqsot;m_kszmxske(Lnet/minecraft/util/Identifier;)Lnet/minecraft/item/equipment/EquipmentModel;}
     */
-   public C_mgbzsqdv m_kszmxske(Identifier id) {
-      return (C_mgbzsqdv)this.f_ifqviucp.getOrDefault(id, f_ifcupbjo);
+   public EquipmentModel m_kszmxske(Identifier id) {
+      return (EquipmentModel)this.f_ifqviucp.getOrDefault(id, f_ifcupbjo);
    }
 }
diff -bur namedTargetSrc/net/minecraft/unmapped/C_zcxkgrzh.java namedSrc/net/minecraft/unmapped/C_zcxkgrzh.java
--- namedTargetSrc/net/minecraft/unmapped/C_zcxkgrzh.java	2024-11-04 23:52:15.287895958 +0000
+++ namedSrc/net/minecraft/unmapped/C_zcxkgrzh.java	2024-11-04 23:51:05.531667582 +0000
@@ -14,6 +14,7 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.equipment.EquipmentModel;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
@@ -61,7 +62,7 @@
          matrices.push();
          matrices.translate(0.0F, 0.0F, 0.125F);
          lv4.setAngles(arg3);
-         this.f_qeuvzpqy.m_rzzkspxz(C_mgbzsqdv.C_otwvbrdf.WINGS, lv5, lv4, lv, matrices, vertexConsumers, i, lv3);
+         this.f_qeuvzpqy.m_rzzkspxz(EquipmentModel.LayerType.WINGS, lv5, lv4, lv, matrices, vertexConsumers, i, lv3);
          matrices.pop();
       }
    }
diff -bur namedTargetSrc/net/minecraft/util/Util.java namedSrc/net/minecraft/util/Util.java
--- namedTargetSrc/net/minecraft/util/Util.java	2024-11-04 23:52:14.995894986 +0000
+++ namedSrc/net/minecraft/util/Util.java	2024-11-04 23:51:05.271666772 +0000
@@ -813,13 +813,13 @@
 
    /**
     * @mapping {@literal hashed m_rpwoeqxt Lnet/minecraft/unmapped/C_lvarvugc;m_rpwoeqxt(Ljava/lang/Class;Ljava/util/function/Function;)Ljava/util/EnumMap;}
-    * @mapping {@literal named m_rpwoeqxt Lnet/minecraft/util/Util;m_rpwoeqxt(Ljava/lang/Class;Ljava/util/function/Function;)Ljava/util/EnumMap;}
+    * @mapping {@literal named mapEnum Lnet/minecraft/util/Util;mapEnum(Ljava/lang/Class;Ljava/util/function/Function;)Ljava/util/EnumMap;}
     */
-   public static <K extends Enum<K>, V> EnumMap<K, V> m_rpwoeqxt(Class<K> keyType, Function<K, V> function) {
-      EnumMap<K, V> enumMap = new EnumMap(keyType);
+   public static <K extends Enum<K>, V> EnumMap<K, V> mapEnum(Class<K> enumClass, Function<K, V> mapper) {
+      EnumMap<K, V> enumMap = new EnumMap(enumClass);
 
-      for (K lv : (Enum[])keyType.getEnumConstants()) {
-         enumMap.put(lv, function.apply(lv));
+      for (K lv : (Enum[])enumClass.getEnumConstants()) {
+         enumMap.put(lv, mapper.apply(lv));
       }
 
       return enumMap;

Please sign in to comment.