Fix missing armor texture when using Minecraft 24w36a or later.

Author: leMaik

chunky/src/java/se/llbit/chunky/entity/PlayerEntity.java

@@ -180,17 +180,17 @@ static JsonObject buildGear(PlayerEntityData data) {
       gear = parseEquipment(data.equipment);
     } else {
       gear = new JsonObject();
-    if (!data.chestplate.asCompound().isEmpty()) {
-      gear.add("chest", parseItem(data.chestplate.asCompound()));
-    }
-    if (!data.feet.asCompound().isEmpty()) {
-      gear.add("feet", parseItem(data.feet.asCompound()));
-    }
-    if (!data.head.asCompound().isEmpty()) {
-      gear.add("head", parseItem(data.head.asCompound()));
-    }
-    if (!data.legs.asCompound().isEmpty()) {
-      gear.add("legs", parseItem(data.legs.asCompound()));
+      if (!data.chestplate.asCompound().isEmpty()) {
+        gear.add("chest", parseItem(data.chestplate.asCompound()));
+      }
+      if (!data.feet.asCompound().isEmpty()) {
+        gear.add("feet", parseItem(data.feet.asCompound()));
+      }
+      if (!data.head.asCompound().isEmpty()) {
+        gear.add("head", parseItem(data.head.asCompound()));
+      }
+      if (!data.legs.asCompound().isEmpty()) {
+        gear.add("legs", parseItem(data.legs.asCompound()));
       }
     }
     return gear;
@@ -831,52 +831,78 @@ static Texture getTexture(JsonObject item) {
         case "leather_boots":
         case "leather_helmet":
         case "leather_chestplate":
-          loader = leatherTexture("models/armor/leather_layer_1",
-            item.get("color").intValue(0x96613A), texture);
+          loader = new AlternateTextures(
+            leatherTexture("entity/equipment/humanoid/leather",
+              item.get("color").intValue(0x96613A), texture),
+            leatherTexture("models/armor/leather_layer_1",
+              item.get("color").intValue(0x96613A), texture));
           break;
         case "leather_leggings":
-          loader = leatherTexture("models/armor/leather_layer_2",
-            item.get("color").intValue(0x96613A), texture);
+          loader = new AlternateTextures(
+            leatherTexture("entity/equipment/humanoid_leggings/leather",
+              item.get("color").intValue(0x96613A), texture),
+            leatherTexture("models/armor/leather_layer_2",
+              item.get("color").intValue(0x96613A), texture));
           break;
         case "golden_boots":
         case "golden_helmet":
         case "golden_chestplate":
-          loader = simpleTexture("models/armor/gold_layer_1", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid/gold", texture),
+            simpleTexture("models/armor/gold_layer_1", texture));
           break;
         case "golden_leggings":
-          loader = simpleTexture("models/armor/gold_layer_2", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid_leggings/gold", texture),
+            simpleTexture("models/armor/gold_layer_2", texture));
           break;
         case "iron_boots":
         case "iron_helmet":
         case "iron_chestplate":
-          loader = simpleTexture("models/armor/iron_layer_1", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid/iron", texture),
+            simpleTexture("models/armor/iron_layer_1", texture));
           break;
         case "iron_leggings":
-          loader = simpleTexture("models/armor/iron_layer_2", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid_leggings/iron", texture),
+            loader = simpleTexture("models/armor/iron_layer_2", texture));
           break;
         case "chainmail_boots":
         case "chainmail_helmet":
         case "chainmail_chestplate":
-          loader = simpleTexture("models/armor/chainmail_layer_1", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid/chainmail", texture),
+            simpleTexture("models/armor/chainmail_layer_1", texture));
           break;
         case "chainmail_leggings":
-          loader = simpleTexture("models/armor/chainmail_layer_2", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid_leggings/chainmail", texture),
+            simpleTexture("models/armor/chainmail_layer_2", texture));
           break;
         case "diamond_boots":
         case "diamond_helmet":
         case "diamond_chestplate":
-          loader = simpleTexture("models/armor/diamond_layer_1", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid/diamond", texture),
+            simpleTexture("models/armor/diamond_layer_1", texture));
           break;
         case "diamond_leggings":
-          loader = simpleTexture("models/armor/diamond_layer_2", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid_leggings/diamond", texture),
+            simpleTexture("models/armor/diamond_layer_2", texture));
           break;
         case "netherite_boots":
         case "netherite_helmet":
         case "netherite_chestplate":
-          loader = simpleTexture("models/armor/netherite_layer_1", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid/netherite", texture),
+            simpleTexture("models/armor/netherite_layer_1", texture));
           break;
         case "netherite_leggings":
-          loader = simpleTexture("models/armor/netherite_layer_2", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid_leggings/netherite", texture),
+            simpleTexture("models/armor/netherite_layer_2", texture));
           break;
         case "copper_boots":
         case "copper_helmet":
@@ -887,7 +913,9 @@ static Texture getTexture(JsonObject item) {
           loader = simpleTexture("entity/equipment/humanoid_leggings/copper", texture);
           break;
         case "turtle_helmet":
-          loader = simpleTexture("models/armor/turtle_layer_1", texture);
+          loader = new AlternateTextures(
+            simpleTexture("entity/equipment/humanoid/turtle_scute", texture),
+            simpleTexture("models/armor/turtle_layer_1", texture));
           break;
         case "player_head":
           String skin = item.get("skin").asString("");