Fix Chest Atlas registration for Iron Chest Models to no longer unintentionally add non-chest textures to the chest atlas, fix block names missing and bump version

Author: alexbegt

gradle.properties

@@ -31,7 +31,7 @@ mod_name=Iron Chests
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU General Public License v3.0
 # The mod version. See https://semver.org/
-mod_version=16.0
+mod_version=16.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/generated/resources/.cache/0dbbd54ceb2dbdad297666c0ed7345b878c15d35

@@ -1,2 +1,2 @@
-// 1.21.3	2025-01-05T17:50:41.718282	atlases generator for ironchest
-bba03f0849be21ea0fb2f99f25b892838b1ec7a2 assets/minecraft/atlases/chests.json
+// 1.21.3	2025-01-11T20:23:38.755165	atlases generator for ironchest
+34291928e0b4986474567815a26c170f6e6e270d assets/minecraft/atlases/chests.json

src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86

@@ -0,0 +1,2 @@
+// 1.21.3	2025-01-11T19:53:35.266962	Pack Metadata
+796aa3de45caa2aa28f39ce30c7723751feabdad pack.mcmeta

src/generated/resources/assets/minecraft/atlases/chests.json

@@ -1,9 +1,60 @@
 {
   "sources": [
     {
-      "type": "minecraft:directory",
-      "prefix": "model/",
-      "source": "model"
+      "type": "minecraft:single",
+      "resource": "ironchest:model/iron_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/trapped_iron_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/gold_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/trapped_gold_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/diamond_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/trapped_diamond_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/copper_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/trapped_copper_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/crystal_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/trapped_crystal_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/obsidian_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/trapped_obsidian_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/dirt_chest"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "ironchest:model/trapped_dirt_chest"
     }
   ]
 }

src/generated/resources/pack.mcmeta

@@ -0,0 +1,10 @@
+{
+  "pack": {
+    "description": "Resources for Iron Chests",
+    "pack_format": 57,
+    "supported_formats": [
+      0,
+      2147483647
+    ]
+  }
+}

src/main/java/com/progwml6/ironchest/IronChests.java

@@ -13,10 +13,16 @@
 import com.progwml6.ironchest.common.inventory.IronChestsMenuTypes;
 import com.progwml6.ironchest.common.item.IronChestsItems;
 import com.progwml6.ironchest.common.network.TopStacksSyncPacket;
+import net.minecraft.DetectedVersion;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
+import net.minecraft.data.metadata.PackMetadataGenerator;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
+import net.minecraft.util.InclusiveRange;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.capabilities.Capabilities;
@@ -26,10 +32,9 @@
 import net.neoforged.neoforge.items.wrapper.InvWrapper;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import java.util.Locale;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 @Mod(IronChests.MODID)
@@ -63,6 +68,10 @@ public void gatherData(GatherDataEvent event) {
     gen.addProvider(event.includeClient(), new IronChestsBlockTags(packOutput, lookupProvider, ext));
     gen.addProvider(event.includeClient(), new IronChestsSpriteSourceProvider(packOutput, ext, lookupProvider));
     gen.addProvider(event.includeClient(), new IronChestsLanguageProvider(packOutput, "en_us"));
+    gen.addProvider(true, new PackMetadataGenerator(packOutput).add(PackMetadataSection.TYPE, new PackMetadataSection(
+      Component.literal("Resources for Iron Chests"),
+      DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA),
+      Optional.of(new InclusiveRange<>(0, Integer.MAX_VALUE)))));
   }
 
   public void setupPackets(RegisterPayloadHandlersEvent event) {

src/main/java/com/progwml6/ironchest/client/model/IronChestsModels.java

@@ -2,48 +2,59 @@
 
 import com.progwml6.ironchest.IronChests;
 import com.progwml6.ironchest.common.block.IronChestsTypes;
+import net.minecraft.client.renderer.Sheets;
+import net.minecraft.client.resources.model.Material;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
 public class IronChestsModels {
 
-  public static final ResourceLocation IRON_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/iron_chest");
-  public static final ResourceLocation GOLD_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/gold_chest");
-  public static final ResourceLocation DIAMOND_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/diamond_chest");
-  public static final ResourceLocation COPPER_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/copper_chest");
-  public static final ResourceLocation CRYSTAL_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/crystal_chest");
-  public static final ResourceLocation OBSIDIAN_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/obsidian_chest");
-  public static final ResourceLocation DIRT_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/dirt_chest");
-  public static final ResourceLocation VANILLA_CHEST_LOCATION = ResourceLocation.withDefaultNamespace("entity/chest/normal");
-
-  public static final ResourceLocation TRAPPED_IRON_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/trapped_iron_chest");
-  public static final ResourceLocation TRAPPED_GOLD_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/trapped_gold_chest");
-  public static final ResourceLocation TRAPPED_DIAMOND_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/trapped_diamond_chest");
-  public static final ResourceLocation TRAPPED_COPPER_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/trapped_copper_chest");
-  public static final ResourceLocation TRAPPED_CRYSTAL_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/trapped_crystal_chest");
-  public static final ResourceLocation TRAPPED_OBSIDIAN_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/trapped_obsidian_chest");
-  public static final ResourceLocation TRAPPED_DIRT_CHEST_LOCATION = ResourceLocation.fromNamespaceAndPath(IronChests.MODID, "model/trapped_dirt_chest");
-  public static final ResourceLocation TRAPPED_VANILLA_CHEST_LOCATION = ResourceLocation.withDefaultNamespace("entity/chest/trapped");
-
-  public static ResourceLocation chooseChestTexture(IronChestsTypes type, boolean trapped) {
+  public static final Material IRON_CHEST_LOCATION = chestMaterial(false, "model/iron_chest");
+  public static final Material GOLD_CHEST_LOCATION = chestMaterial(false, "model/gold_chest");
+  public static final Material DIAMOND_CHEST_LOCATION = chestMaterial(false, "model/diamond_chest");
+  public static final Material COPPER_CHEST_LOCATION = chestMaterial(false, "model/copper_chest");
+  public static final Material CRYSTAL_CHEST_LOCATION = chestMaterial(false, "model/crystal_chest");
+  public static final Material OBSIDIAN_CHEST_LOCATION = chestMaterial(false, "model/obsidian_chest");
+  public static final Material DIRT_CHEST_LOCATION = chestMaterial(false, "model/dirt_chest");
+  public static final Material VANILLA_CHEST_LOCATION = chestMaterial(true, "normal");
+
+  public static final Material TRAPPED_IRON_CHEST_LOCATION = chestMaterial(false, "model/trapped_iron_chest");
+  public static final Material TRAPPED_GOLD_CHEST_LOCATION = chestMaterial(false, "model/trapped_gold_chest");
+  public static final Material TRAPPED_DIAMOND_CHEST_LOCATION = chestMaterial(false, "model/trapped_diamond_chest");
+  public static final Material TRAPPED_COPPER_CHEST_LOCATION = chestMaterial(false, "model/trapped_copper_chest");
+  public static final Material TRAPPED_CRYSTAL_CHEST_LOCATION = chestMaterial(false, "model/trapped_crystal_chest");
+  public static final Material TRAPPED_OBSIDIAN_CHEST_LOCATION = chestMaterial(false, "model/trapped_obsidian_chest");
+  public static final Material TRAPPED_DIRT_CHEST_LOCATION = chestMaterial(false, "model/trapped_dirt_chest");
+  public static final Material TRAPPED_VANILLA_CHEST_LOCATION = chestMaterial(true, "trapped");
+
+  public static Material chooseChestMaterial(IronChestsTypes type, boolean trapped) {
     if (trapped) {
-      return getResourceLocation(type, TRAPPED_IRON_CHEST_LOCATION, TRAPPED_GOLD_CHEST_LOCATION, TRAPPED_DIAMOND_CHEST_LOCATION, TRAPPED_COPPER_CHEST_LOCATION, TRAPPED_CRYSTAL_CHEST_LOCATION, TRAPPED_OBSIDIAN_CHEST_LOCATION, TRAPPED_DIRT_CHEST_LOCATION, TRAPPED_VANILLA_CHEST_LOCATION);
+      return getMaterial(type, TRAPPED_IRON_CHEST_LOCATION, TRAPPED_GOLD_CHEST_LOCATION, TRAPPED_DIAMOND_CHEST_LOCATION, TRAPPED_COPPER_CHEST_LOCATION, TRAPPED_CRYSTAL_CHEST_LOCATION, TRAPPED_OBSIDIAN_CHEST_LOCATION, TRAPPED_DIRT_CHEST_LOCATION, TRAPPED_VANILLA_CHEST_LOCATION);
     } else {
-      return getResourceLocation(type, IRON_CHEST_LOCATION, GOLD_CHEST_LOCATION, DIAMOND_CHEST_LOCATION, COPPER_CHEST_LOCATION, CRYSTAL_CHEST_LOCATION, OBSIDIAN_CHEST_LOCATION, DIRT_CHEST_LOCATION, VANILLA_CHEST_LOCATION);
+      return getMaterial(type, IRON_CHEST_LOCATION, GOLD_CHEST_LOCATION, DIAMOND_CHEST_LOCATION, COPPER_CHEST_LOCATION, CRYSTAL_CHEST_LOCATION, OBSIDIAN_CHEST_LOCATION, DIRT_CHEST_LOCATION, VANILLA_CHEST_LOCATION);
     }
   }
 
   @NotNull
-  private static ResourceLocation getResourceLocation(IronChestsTypes type, ResourceLocation ironChestLocation, ResourceLocation goldChestLocation, ResourceLocation diamondChestLocation, ResourceLocation copperChestLocation, ResourceLocation crystalChestLocation, ResourceLocation obsidianChestLocation, ResourceLocation dirtChestLocation, ResourceLocation vanillaChestLocation) {
+  private static Material getMaterial(IronChestsTypes type, Material ironChestMaterial, Material goldChestMaterial, Material diamondChestMaterial, Material copperChestMaterial, Material crystalChestMaterial, Material obsidianChestMaterial, Material dirtChestMaterial, Material vanillaChestMaterial) {
     return switch (type) {
-      case IRON -> ironChestLocation;
-      case GOLD -> goldChestLocation;
-      case DIAMOND -> diamondChestLocation;
-      case COPPER -> copperChestLocation;
-      case CRYSTAL -> crystalChestLocation;
-      case OBSIDIAN -> obsidianChestLocation;
-      case DIRT -> dirtChestLocation;
-      default -> vanillaChestLocation;
+      case IRON -> ironChestMaterial;
+      case GOLD -> goldChestMaterial;
+      case DIAMOND -> diamondChestMaterial;
+      case COPPER -> copperChestMaterial;
+      case CRYSTAL -> crystalChestMaterial;
+      case OBSIDIAN -> obsidianChestMaterial;
+      case DIRT -> dirtChestMaterial;
+      default -> vanillaChestMaterial;
     };
   }
+
+  private static Material chestMaterial(boolean vanillaChest, String chestName) {
+    if (vanillaChest) {
+      return new Material(Sheets.CHEST_SHEET, ResourceLocation.withDefaultNamespace("entity/chest/" + chestName));
+    } else {
+      return new Material(Sheets.CHEST_SHEET, IronChests.prefix(chestName));
+    }
+
+  }
 }

src/main/java/com/progwml6/ironchest/client/render/IronChestRenderer.java

@@ -15,7 +15,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.Sheets;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -93,7 +92,7 @@ public void render(T blockEntity, float partialTick, PoseStack poseStack, MultiB
 
       boolean trapped = blockEntity instanceof AbstractTrappedIronChestBlockEntity;
 
-      Material material = new Material(Sheets.CHEST_SHEET, IronChestsModels.chooseChestTexture(chestType, trapped));
+      Material material = IronChestsModels.chooseChestMaterial(chestType, trapped);
       VertexConsumer vertexConsumer = material.buffer(bufferSource, RenderType::entityCutout);
       this.render(poseStack, vertexConsumer, this.model, openness, packedLight, packedOverlay);
 

src/main/java/com/progwml6/ironchest/common/block/IronChestsBlocks.java

@@ -53,8 +53,9 @@ public class IronChestsBlocks {
   public static final DeferredBlock<TrappedDirtChestBlock> TRAPPED_DIRT_CHEST = registerWithItem("trapped_dirt_chest", TrappedDirtChestBlock::new, () -> properties, IronChestsTypes.DIRT, true);
 
   public static <T extends Block> DeferredBlock<T> registerWithItem(String name, Function<BlockBehaviour.Properties, T> block, Supplier<BlockBehaviour.Properties> properties, IronChestsTypes chestType, Boolean trapped) {
-    DeferredBlock<T> ret = BLOCKS.register(name, () -> block.apply(properties.get().setId(ResourceKey.create(Registries.BLOCK, IronChests.prefix(name)))));
-    IronChestsItems.register(name, itemProps -> new IronChestBlockItem(ret.get(), itemProps, chestType, trapped), Item.Properties::new);
+    ResourceKey<Block> blockResourceKey = ResourceKey.create(Registries.BLOCK, IronChests.prefix(name));
+    DeferredBlock<T> ret = BLOCKS.register(name, () -> block.apply(properties.get().setId(blockResourceKey)));
+    IronChestsItems.register(name, itemProps -> new IronChestBlockItem(ret.get(), itemProps, chestType, trapped), Item.Properties::new, blockResourceKey);
     return ret;
   }
 }

src/main/java/com/progwml6/ironchest/common/data/IronChestsSpriteSourceProvider.java

@@ -1,12 +1,15 @@
 package com.progwml6.ironchest.common.data;
 
 import com.progwml6.ironchest.IronChests;
-import net.minecraft.client.renderer.texture.atlas.sources.DirectoryLister;
+import com.progwml6.ironchest.client.model.IronChestsModels;
+import com.progwml6.ironchest.common.block.IronChestsTypes;
+import net.minecraft.client.renderer.texture.atlas.sources.SingleFile;
 import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.data.PackOutput;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.common.data.SpriteSourceProvider;
 
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 public class IronChestsSpriteSourceProvider extends SpriteSourceProvider {
@@ -17,6 +20,12 @@ public IronChestsSpriteSourceProvider(PackOutput output, ExistingFileHelper file
 
   @Override
   protected void gather() {
-    atlas(CHESTS_ATLAS).addSource(new DirectoryLister("model", "model/"));
+    for (IronChestsTypes type : IronChestsTypes.values()) {
+      if (type == IronChestsTypes.WOOD) {
+        continue;
+      }
+      atlas(CHESTS_ATLAS).addSource(new SingleFile(IronChestsModels.chooseChestMaterial(type, false).texture(), Optional.empty()));
+      atlas(CHESTS_ATLAS).addSource(new SingleFile(IronChestsModels.chooseChestMaterial(type, true).texture(), Optional.empty()));
+    }
   }
 }