Skip to content

Commit

Permalink
Fix a couple armor-y things (#636)
Browse files Browse the repository at this point in the history 
* rename ArmorDyeRecipe -> DyeableRecipe, add javadoc

* fix ArmorFeatureRenderer model names
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety committed Aug 31, 2024
1 parent 8942d89 commit bb53855
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
13 changes: 8 additions & 5 deletions mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
CLASS net/minecraft/unmapped/C_giodsxsr net/minecraft/client/render/entity/feature/ArmorFeatureRenderer
FIELD f_nbwazbpw leggingsModel Lnet/minecraft/unmapped/C_kbsahqug;
FIELD f_bvfqvqnj smallOuterModel Lnet/minecraft/unmapped/C_kbsahqug;
FIELD f_nbwazbpw innerModel Lnet/minecraft/unmapped/C_kbsahqug;
FIELD f_rmdlnqgr armorAtlas Lnet/minecraft/unmapped/C_qwirmgcf;
FIELD f_uaapfnoe bodyModel Lnet/minecraft/unmapped/C_kbsahqug;
FIELD f_uaapfnoe outerModel Lnet/minecraft/unmapped/C_kbsahqug;
FIELD f_uewsfucf smallInnerModel Lnet/minecraft/unmapped/C_kbsahqug;
METHOD <init> (Lnet/minecraft/unmapped/C_mjeyymcw;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_wosoicga;)V
ARG 6 modelManager
METHOD <init> (Lnet/minecraft/unmapped/C_mjeyymcw;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_wosoicga;)V
ARG 1 context
ARG 2 leggingsModel
ARG 3 bodyModel
ARG 4 modelManager
METHOD m_flcuqnsy renderArmor (Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;ILnet/minecraft/unmapped/C_kbsahqug;)V
ARG 1 matrices
Expand All @@ -24,6 +26,7 @@ CLASS net/minecraft/unmapped/C_giodsxsr net/minecraft/client/render/entity/featu
ARG 1 bipedModel
ARG 2 slot
METHOD m_nqjkolqg renderArmor (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_vglbnrob;Lnet/minecraft/unmapped/C_kbsahqug;Z)V
ARG 1 material
ARG 2 matrices
ARG 3 vertexConsumers
ARG 4 light
Expand All @@ -35,5 +38,5 @@ CLASS net/minecraft/unmapped/C_giodsxsr net/minecraft/client/render/entity/featu
ARG 2 vertexConsumers
ARG 3 light
ARG 4 model
METHOD m_uqvpbazc usesSecondLayer (Lnet/minecraft/unmapped/C_yuycoehb;)Z
METHOD m_uqvpbazc usesInnerModel (Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 slot
1 change: 0 additions & 1 deletion mappings/net/minecraft/recipe/ArmorDyeRecipe.mapping
View file

This file was deleted.

11 changes: 11 additions & 0 deletions mappings/net/minecraft/recipe/DyeableRecipe.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/unmapped/C_efmveflh net/minecraft/recipe/DyeableRecipe
COMMENT Recipe that applies a {@link net.minecraft.item.DyeItem DyeItem} to an item in
COMMENT {@link net.minecraft.registry.tag.ItemTags#DYEABLE ItemTags.DYEABLE}.
COMMENT <p>
COMMENT If the {@link net.minecraft.registry.tag.ItemTags#DYEABLE DYEABLE} item already has a
COMMENT {@link net.minecraft.component.type.DyedColorComponent DyedColorComponent},
COMMENT its {@link net.minecraft.component.type.DyedColorComponent#rgb() color} is combined with the
COMMENT {@link net.minecraft.item.DyeItem DyeItem}'s {@link net.minecraft.item.DyeItem#getColor() color}.<br />
COMMENT Otherwise, a new {@link net.minecraft.component.type.DyedColorComponent component} is added to the
COMMENT {@link net.minecraft.registry.tag.ItemTags#DYEABLE DYEABLE} item with the
COMMENT {@link net.minecraft.item.DyeItem DyeItem}'s {@link net.minecraft.item.DyeItem#getColor() color}.

1 comment on commit bb53855

@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 bb53855, 15 file(s) were updated with 57 line(s) added and 53 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/client/gui/ParentElement.java namedSrc/net/minecraft/client/gui/ParentElement.java
--- namedTargetSrc/net/minecraft/client/gui/ParentElement.java	2024-08-31 20:21:02.486596100 +0000
+++ namedSrc/net/minecraft/client/gui/ParentElement.java	2024-08-31 20:19:54.298519894 +0000
@@ -153,7 +153,7 @@
     * Mapping not found
     */
    @Override
-   default void setFocused(boolean bl) {
+   default void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-08-31 20:21:02.578596201 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-08-31 20:19:54.406520021 +0000
@@ -1507,9 +1507,9 @@
        * Mapping not found
        */
       @Override
-      public void setFocused(boolean bl) {
-         super.setFocused(bl);
-         this.button.setFocused(bl);
+      public void setFocused(boolean focused) {
+         super.setFocused(focused);
+         this.button.setFocused(focused);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-08-31 20:21:02.610596236 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-08-31 20:19:54.426520045 +0000
@@ -447,8 +447,8 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      this.focused = bl;
+   public void setFocused(boolean focused) {
+      this.focused = focused;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-08-31 20:21:02.490596105 +0000
+++ namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-08-31 20:19:54.306519903 +0000
@@ -121,7 +121,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      ParentElement.super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      ParentElement.super.setFocused(focused);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-08-31 20:21:02.562596184 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-08-31 20:19:54.390520003 +0000
@@ -342,9 +342,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (focused) {
          this.focusTime = Util.getMeasuringTimeMs();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java namedSrc/net/minecraft/client/gui/widget/HeaderBar.java
--- namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-08-31 20:21:02.654596284 +0000
+++ namedSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-08-31 20:19:54.470520098 +0000
@@ -122,10 +122,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
       if (this.getFocused() != null) {
-         this.getFocused().setFocused(bl);
+         this.getFocused().setFocused(focused);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-08-31 20:21:02.418596026 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-08-31 20:19:54.194519770 +0000
@@ -896,7 +896,7 @@
        * @mapping {@literal named setFocused Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;setFocused(Z)V}
        */
       @Override
-      public void setFocused(boolean bl) {
+      public void setFocused(boolean focused) {
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-08-31 20:21:02.490596105 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-08-31 20:19:54.306519903 +0000
@@ -240,7 +240,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-08-31 20:21:02.618596245 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-08-31 20:19:54.434520055 +0000
@@ -684,7 +684,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
+   public void setFocused(boolean focused) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java namedSrc/net/minecraft/client/gui/widget/SliderWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-08-31 20:21:02.406596013 +0000
+++ namedSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-08-31 20:19:54.182519756 +0000
@@ -151,9 +151,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      super.setFocused(bl);
-      if (!bl) {
+   public void setFocused(boolean focused) {
+      super.setFocused(focused);
+      if (!focused) {
          this.mutable = false;
       } else {
          InputType lv = MinecraftClient.getInstance().getLastInputType();
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-08-31 20:21:02.434596044 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-08-31 20:19:54.222519804 +0000
@@ -736,10 +736,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean bl) {
-      if (this.focusUnlocked || bl) {
-         super.setFocused(bl);
-         if (bl) {
+   public void setFocused(boolean focused) {
+      if (this.focusUnlocked || focused) {
+         super.setFocused(focused);
+         if (focused) {
             this.lastFocusTime = Util.getMeasuringTimeMs();
          }
       }
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-08-31 20:21:02.414596022 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-08-31 20:19:54.190519765 +0000
@@ -33,22 +33,24 @@
 public class ArmorFeatureRenderer<S extends C_btosngnd, M extends BipedEntityModel<S>, A extends BipedEntityModel<S>> extends FeatureRenderer<S, M> {
    /**
     * @mapping {@literal hashed f_nbwazbpw Lnet/minecraft/unmapped/C_giodsxsr;f_nbwazbpw:Lnet/minecraft/unmapped/C_kbsahqug;}
-    * @mapping {@literal named leggingsModel Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;leggingsModel:Lnet/minecraft/client/render/entity/model/BipedEntityModel;}
+    * @mapping {@literal named innerModel Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;innerModel:Lnet/minecraft/client/render/entity/model/BipedEntityModel;}
     */
-   private final A leggingsModel;
+   private final A innerModel;
    /**
     * @mapping {@literal hashed f_uaapfnoe Lnet/minecraft/unmapped/C_giodsxsr;f_uaapfnoe:Lnet/minecraft/unmapped/C_kbsahqug;}
-    * @mapping {@literal named bodyModel Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;bodyModel:Lnet/minecraft/client/render/entity/model/BipedEntityModel;}
+    * @mapping {@literal named outerModel Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;outerModel:Lnet/minecraft/client/render/entity/model/BipedEntityModel;}
     */
-   private final A bodyModel;
+   private final A outerModel;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uewsfucf Lnet/minecraft/unmapped/C_giodsxsr;f_uewsfucf:Lnet/minecraft/unmapped/C_kbsahqug;}
+    * @mapping {@literal named smallInnerModel Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;smallInnerModel:Lnet/minecraft/client/render/entity/model/BipedEntityModel;}
     */
-   private final A f_uewsfucf;
+   private final A smallInnerModel;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bvfqvqnj Lnet/minecraft/unmapped/C_giodsxsr;f_bvfqvqnj:Lnet/minecraft/unmapped/C_kbsahqug;}
+    * @mapping {@literal named smallOuterModel Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;smallOuterModel:Lnet/minecraft/client/render/entity/model/BipedEntityModel;}
     */
-   private final A f_bvfqvqnj;
+   private final A smallOuterModel;
    /**
     * @mapping {@literal hashed f_rmdlnqgr Lnet/minecraft/unmapped/C_giodsxsr;f_rmdlnqgr:Lnet/minecraft/unmapped/C_qwirmgcf;}
     * @mapping {@literal named armorAtlas Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;armorAtlas:Lnet/minecraft/client/texture/SpriteAtlasTexture;}
@@ -59,21 +61,23 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_giodsxsr;<init>(Lnet/minecraft/unmapped/C_mjeyymcw;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_wosoicga;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;<init>(Lnet/minecraft/client/render/entity/feature/FeatureRendererContext;Lnet/minecraft/client/render/entity/model/BipedEntityModel;Lnet/minecraft/client/render/entity/model/BipedEntityModel;Lnet/minecraft/client/render/model/BakedModelManager;)V}
     */
-   public ArmorFeatureRenderer(FeatureRendererContext<S, M> context, A leggingsModel, A bodyModel, BakedModelManager modelManager) {
-      this(context, leggingsModel, bodyModel, leggingsModel, bodyModel, modelManager);
+   public ArmorFeatureRenderer(FeatureRendererContext<S, M> context, A arg2, A arg3, BakedModelManager modelManager) {
+      this(context, arg2, arg3, arg2, arg3, modelManager);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_giodsxsr;<init>(Lnet/minecraft/unmapped/C_mjeyymcw;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_kbsahqug;Lnet/minecraft/unmapped/C_wosoicga;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;<init>(Lnet/minecraft/client/render/entity/feature/FeatureRendererContext;Lnet/minecraft/client/render/entity/model/BipedEntityModel;Lnet/minecraft/client/render/entity/model/BipedEntityModel;Lnet/minecraft/client/render/entity/model/BipedEntityModel;Lnet/minecraft/client/render/entity/model/BipedEntityModel;Lnet/minecraft/client/render/model/BakedModelManager;)V}
     */
-   public ArmorFeatureRenderer(FeatureRendererContext<S, M> context, A leggingsModel, A bodyModel, A arg4, A arg5, BakedModelManager arg6) {
+   public ArmorFeatureRenderer(
+      FeatureRendererContext<S, M> context, A innerModel, A outerModel, A smallInnerModel, A smallOuterModel, BakedModelManager modelManager
+   ) {
       super(context);
-      this.leggingsModel = leggingsModel;
-      this.bodyModel = bodyModel;
-      this.f_uewsfucf = arg4;
-      this.f_bvfqvqnj = arg5;
-      this.armorAtlas = arg6.getAtlas(TexturedRenderLayers.ARMOR_TRIMS_ATLAS_TEXTURE);
+      this.innerModel = innerModel;
+      this.outerModel = outerModel;
+      this.smallInnerModel = smallInnerModel;
+      this.smallOuterModel = smallOuterModel;
+      this.armorAtlas = modelManager.getAtlas(TexturedRenderLayers.ARMOR_TRIMS_ATLAS_TEXTURE);
    }
 
    /**
@@ -96,7 +100,7 @@
          if (lv.getPreferredSlot() == armorSlot) {
             this.getContextModel().setAttributes(model);
             this.setVisible(model, armorSlot);
-            boolean bl = this.usesSecondLayer(armorSlot);
+            boolean bl = this.usesInnerModel(armorSlot);
             ArmorMaterial lv3 = lv.getMaterial().value();
             int j = stack.isIn(ItemTags.DYEABLE) ? ArgbHelper.opaque(DyedColorComponent.getColorOrDefault(stack, -6265536)) : -1;
 
@@ -158,7 +162,7 @@
     * @mapping {@literal named renderArmor Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;renderArmor(Lnet/minecraft/registry/Holder;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/item/trim/ArmorTrimPermutation;Lnet/minecraft/client/render/entity/model/BipedEntityModel;Z)V}
     */
    private void renderArmor(
-      Holder<ArmorMaterial> arg,
+      Holder<ArmorMaterial> material,
       MatrixStack matrices,
       VertexConsumerProvider vertexConsumers,
       int light,
@@ -166,7 +170,7 @@
       A model,
       boolean hasGlint
    ) {
-      Sprite lv = this.armorAtlas.getSprite(hasGlint ? permutation.getLeggingsTexture(arg) : permutation.getBodyTexture(arg));
+      Sprite lv = this.armorAtlas.getSprite(hasGlint ? permutation.getLeggingsTexture(material) : permutation.getBodyTexture(material));
       VertexConsumer lv2 = lv.getTextureSpecificVertexConsumer(
          vertexConsumers.getBuffer(TexturedRenderLayers.getArmorTrim(permutation.getPattern().value().decal()))
       );
@@ -186,18 +190,18 @@
     * @mapping {@literal named getArmor Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;getArmor(Lnet/minecraft/unmapped/C_btosngnd;Lnet/minecraft/entity/EquipmentSlot;)Lnet/minecraft/client/render/entity/model/BipedEntityModel;}
     */
    private A getArmor(S arg, EquipmentSlot slot) {
-      if (this.usesSecondLayer(slot)) {
-         return arg.f_vetzpkzw ? this.f_uewsfucf : this.leggingsModel;
+      if (this.usesInnerModel(slot)) {
+         return arg.f_vetzpkzw ? this.smallInnerModel : this.innerModel;
       } else {
-         return arg.f_vetzpkzw ? this.f_bvfqvqnj : this.bodyModel;
+         return arg.f_vetzpkzw ? this.smallOuterModel : this.outerModel;
       }
    }
 
    /**
     * @mapping {@literal hashed m_uqvpbazc Lnet/minecraft/unmapped/C_giodsxsr;m_uqvpbazc(Lnet/minecraft/unmapped/C_yuycoehb;)Z}
-    * @mapping {@literal named usesSecondLayer Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;usesSecondLayer(Lnet/minecraft/entity/EquipmentSlot;)Z}
+    * @mapping {@literal named usesInnerModel Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;usesInnerModel(Lnet/minecraft/entity/EquipmentSlot;)Z}
     */
-   private boolean usesSecondLayer(EquipmentSlot slot) {
+   private boolean usesInnerModel(EquipmentSlot slot) {
       return slot == EquipmentSlot.LEGS;
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ZombieBaseEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ZombieBaseEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ZombieBaseEntityRenderer.java	2024-08-31 20:21:02.538596158 +0000
+++ namedSrc/net/minecraft/client/render/entity/ZombieBaseEntityRenderer.java	2024-08-31 20:19:54.362519969 +0000
@@ -25,9 +25,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_yjltamqs;<init>(Lnet/minecraft/unmapped/C_ycdfjsnw$C_bnclqjzp;Lnet/minecraft/unmapped/C_faamnhiu;Lnet/minecraft/unmapped/C_faamnhiu;Lnet/minecraft/unmapped/C_faamnhiu;Lnet/minecraft/unmapped/C_faamnhiu;Lnet/minecraft/unmapped/C_faamnhiu;Lnet/minecraft/unmapped/C_faamnhiu;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/render/entity/ZombieBaseEntityRenderer;<init>(Lnet/minecraft/client/render/entity/EntityRendererFactory$Context;Lnet/minecraft/client/render/entity/model/ZombieEntityModel;Lnet/minecraft/client/render/entity/model/ZombieEntityModel;Lnet/minecraft/client/render/entity/model/ZombieEntityModel;Lnet/minecraft/client/render/entity/model/ZombieEntityModel;Lnet/minecraft/client/render/entity/model/ZombieEntityModel;Lnet/minecraft/client/render/entity/model/ZombieEntityModel;)V}
     */
-   protected ZombieBaseEntityRenderer(EntityRendererFactory.Context arg, M arg2, M arg3, M leggingsModel, M bodyModel, M arg6, M arg7) {
+   protected ZombieBaseEntityRenderer(EntityRendererFactory.Context arg, M arg2, M arg3, M innerModel, M outerModel, M smallInnerModel, M smallOuterModel) {
       super(arg, arg2, arg3, 0.5F);
-      this.addFeature(new ArmorFeatureRenderer<>(this, leggingsModel, bodyModel, arg6, arg7, arg.getModelManager()));
+      this.addFeature(new ArmorFeatureRenderer<>(this, innerModel, outerModel, smallInnerModel, smallOuterModel, arg.getModelManager()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/VanillaRecipesProvider.java namedSrc/net/minecraft/data/server/VanillaRecipesProvider.java
--- namedTargetSrc/net/minecraft/data/server/VanillaRecipesProvider.java	2024-08-31 20:21:02.550596171 +0000
+++ namedSrc/net/minecraft/data/server/VanillaRecipesProvider.java	2024-08-31 20:19:54.378519988 +0000
@@ -21,11 +21,11 @@
 import net.minecraft.item.Items;
 import net.minecraft.item.SuspiciousStewEffectContainer;
 import net.minecraft.predicate.NumberRange;
-import net.minecraft.recipe.ArmorDyeRecipe;
 import net.minecraft.recipe.BannerDuplicateRecipe;
 import net.minecraft.recipe.BookCloningRecipe;
 import net.minecraft.recipe.CampfireCookingRecipe;
 import net.minecraft.recipe.DecoratedPotRecipe;
+import net.minecraft.recipe.DyeableRecipe;
 import net.minecraft.recipe.FireworkRocketRecipe;
 import net.minecraft.recipe.FireworkStarFadeRecipe;
 import net.minecraft.recipe.FireworkStarRecipe;
@@ -2076,7 +2076,7 @@
          .criterion("has_amethyst_shard", this.conditionsFromItem(Items.AMETHYST_SHARD))
          .offerTo(this.exporter);
       this.m_eoyaoavo(RecipeCategory.MISC, Items.MUSIC_DISC_5, Items.DISC_FRAGMENT_5);
-      ComplexRecipeJsonFactory.create(ArmorDyeRecipe::new).offerTo(this.exporter, "armor_dye");
+      ComplexRecipeJsonFactory.create(DyeableRecipe::new).offerTo(this.exporter, "armor_dye");
       ComplexRecipeJsonFactory.create(BannerDuplicateRecipe::new).offerTo(this.exporter, "banner_duplicate");
       ComplexRecipeJsonFactory.create(BookCloningRecipe::new).offerTo(this.exporter, "book_cloning");
       ComplexRecipeJsonFactory.create(FireworkRocketRecipe::new).offerTo(this.exporter, "firework_rocket");
Only in namedTargetSrc/net/minecraft/recipe: ArmorDyeRecipe.java
Only in namedSrc/net/minecraft/recipe: DyeableRecipe.java
diff -bur namedTargetSrc/net/minecraft/recipe/RecipeSerializer.java namedSrc/net/minecraft/recipe/RecipeSerializer.java
--- namedTargetSrc/net/minecraft/recipe/RecipeSerializer.java	2024-08-31 20:21:02.610596236 +0000
+++ namedSrc/net/minecraft/recipe/RecipeSerializer.java	2024-08-31 20:19:54.430520050 +0000
@@ -37,7 +37,7 @@
     * @mapping {@literal hashed f_rgjlthcc Lnet/minecraft/unmapped/C_xfxrkzjt;f_rgjlthcc:Lnet/minecraft/unmapped/C_xfxrkzjt;}
     * @mapping {@literal named ARMOR_DYE Lnet/minecraft/recipe/RecipeSerializer;ARMOR_DYE:Lnet/minecraft/recipe/RecipeSerializer;}
     */
-   RecipeSerializer<ArmorDyeRecipe> ARMOR_DYE = register("crafting_special_armordye", new SpecialRecipeSerializer<>(ArmorDyeRecipe::new));
+   RecipeSerializer<DyeableRecipe> ARMOR_DYE = register("crafting_special_armordye", new SpecialRecipeSerializer<>(DyeableRecipe::new));
    /**
     * @mapping {@literal hashed f_ehotoanp Lnet/minecraft/unmapped/C_xfxrkzjt;f_ehotoanp:Lnet/minecraft/unmapped/C_xfxrkzjt;}
     * @mapping {@literal named BOOK_CLONING Lnet/minecraft/recipe/RecipeSerializer;BOOK_CLONING:Lnet/minecraft/recipe/RecipeSerializer;}

Please sign in to comment.