Tweaks. Mostly around not duplicating block translations

Author: Technici4n

docs/ADDING_MACHINES.md

@@ -332,7 +332,7 @@ MIMachineEvents.registerCasings(event => {
     event.registerNamed("fancy_casing", "Fancy");
 
     // This registers a new casing with the same model as a diamond block!
-    event.registerNamedBlockImitation("diamond_casing", "Diamond", "minecraft:diamond_block");
+    event.registerBlockImitation("diamond_casing", "minecraft:diamond_block");
 })
 ```
 

src/client/java/aztech/modern_industrialization/datagen/model/MachineCasingsProvider.java

@@ -29,14 +29,8 @@
 import aztech.modern_industrialization.machines.models.MachineBakedModel;
 import aztech.modern_industrialization.machines.models.MachineCasing;
 import aztech.modern_industrialization.machines.models.MachineCasings;
-import aztech.modern_industrialization.materials.MIMaterials;
-import aztech.modern_industrialization.materials.part.MIParts;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.data.PackOutput;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
 import net.neoforged.neoforge.client.model.generators.BlockModelBuilder;
 import net.neoforged.neoforge.client.model.generators.ModelProvider;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
@@ -48,36 +42,22 @@ public MachineCasingsProvider(PackOutput output, ExistingFileHelper existingFile
 
     @Override
     protected void registerModels() {
+        for (var casing : MachineCasings.registeredCasings.values()) {
+            if (casing.imitatedBlock != null) {
+                imitateBlock(casing, casing.imitatedBlock.get());
+            }
+        }
+
         imitateBlock(CableTier.LV.casing, MIBlock.BASIC_MACHINE_HULL.asBlock());
         imitateBlock(CableTier.MV.casing, MIBlock.ADVANCED_MACHINE_HULL.asBlock());
         imitateBlock(CableTier.HV.casing, MIBlock.TURBO_MACHINE_HULL.asBlock());
         imitateBlock(CableTier.EV.casing, MIBlock.HIGHLY_ADVANCED_MACHINE_HULL.asBlock());
         imitateBlock(CableTier.SUPERCONDUCTOR.casing, MIBlock.QUANTUM_MACHINE_HULL.asBlock());
 
-        imitateBlock(MachineCasings.FIREBRICKS, MIBlock.BLOCK_FIRE_CLAY_BRICKS.asBlock());
-        imitateBlock(MachineCasings.BRICKS, Blocks.BRICKS);
-
-        imitateBlock(MachineCasings.BRONZE, MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING).asBlock());
-        imitateBlock(MachineCasings.BRONZE_PLATED_BRICKS, MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock());
-        imitateBlock(MachineCasings.CLEAN_STAINLESS_STEEL, MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock());
-        imitateBlock(MachineCasings.FROSTPROOF, MIMaterials.ALUMINUM.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock());
-        imitateBlock(MachineCasings.HEATPROOF, MIMaterials.INVAR.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock());
-        imitateBlock(MachineCasings.STAINLESS_STEEL_PIPE, MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_PIPE).asBlock());
-        imitateBlock(MachineCasings.STEEL, MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING).asBlock());
-        imitateBlock(MachineCasings.TITANIUM, MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING).asBlock());
-        imitateBlock(MachineCasings.TITANIUM_PIPE, MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING_PIPE).asBlock());
-        imitateBlock(MachineCasings.SOLID_TITANIUM, MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock());
-        imitateBlock(MachineCasings.NUCLEAR, MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock());
-        imitateBlock(MachineCasings.PLASMA_HANDLING_IRIDIUM, MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock());
-
         cubeBottomTop(MachineCasings.BRICKED_BRONZE, "block/casings/bricked_bronze", "block/fire_clay_bricks", "block/bronze_machine_casing");
         cubeBottomTop(MachineCasings.BRICKED_STEEL, "block/casings/bricked_steel", "block/fire_clay_bricks", "block/steel_machine_casing");
         cubeAll(MachineCasings.CONFIGURABLE_TANK, "block/casings/configurable_tank");
         cubeAll(MachineCasings.STEEL_CRATE, "block/casings/steel_crate");
-
-        for (var entry : MachineCasingImitations.imitationsToGenerate.entrySet()) {
-            imitateBlock(entry.getKey(), BuiltInRegistries.BLOCK.getOrThrow(ResourceKey.create(Registries.BLOCK, entry.getValue())));
-        }
     }
 
     private void imitateBlock(MachineCasing casing, Block block) {

src/client/java/aztech/modern_industrialization/machines/models/MachineBakedModel.java

@@ -38,7 +38,6 @@
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
@@ -66,12 +65,12 @@ public static BakedModel getCasingModel(MachineCasing casing) {
 
     private final MachineCasing baseCasing;
     private final TextureAtlasSprite[] defaultOverlays;
-    private final Map<ResourceLocation, TextureAtlasSprite[]> tieredOverlays;
+    private final Map<MachineCasing, TextureAtlasSprite[]> tieredOverlays;
     private final MachineModelClientData defaultData;
 
     MachineBakedModel(MachineCasing baseCasing,
             TextureAtlasSprite[] defaultOverlays,
-            Map<ResourceLocation, TextureAtlasSprite[]> tieredOverlays) {
+            Map<MachineCasing, TextureAtlasSprite[]> tieredOverlays) {
         this.baseCasing = baseCasing;
         this.defaultOverlays = defaultOverlays;
         this.tieredOverlays = tieredOverlays;
@@ -86,7 +85,7 @@ public TextureAtlasSprite[] getSprites(@Nullable MachineCasing casing) {
         if (casing == null) {
             return defaultOverlays;
         }
-        return tieredOverlays.getOrDefault(casing.key, defaultOverlays);
+        return tieredOverlays.getOrDefault(casing, defaultOverlays);
     }
 
     /**

src/client/java/aztech/modern_industrialization/machines/models/MachineUnbakedModel.java

@@ -54,7 +54,7 @@ public class MachineUnbakedModel implements IUnbakedGeometry<MachineUnbakedModel
 
     private final MachineCasing baseCasing;
     private final Material[] defaultOverlays;
-    private final Map<ResourceLocation, Material[]> tieredOverlays = new HashMap<>();
+    private final Map<MachineCasing, Material[]> tieredOverlays = new HashMap<>();
 
     private MachineUnbakedModel(JsonObject obj) {
         this.baseCasing = MachineCasings.get(GsonHelper.getAsString(obj, "casing"));
@@ -65,15 +65,15 @@ private MachineUnbakedModel(JsonObject obj) {
         var tieredOverlays = GsonHelper.getAsJsonObject(obj, "tiered_overlays", new JsonObject());
         for (var casingTier : tieredOverlays.keySet()) {
             var casingOverlaysJson = OverlaysJson.parse(GsonHelper.getAsJsonObject(tieredOverlays, casingTier), defaultOverlaysJson);
-            this.tieredOverlays.put(ResourceLocation.parse(casingTier), casingOverlaysJson.toSpriteIds());
+            this.tieredOverlays.put(MachineCasings.get(casingTier), casingOverlaysJson.toSpriteIds());
         }
     }
 
     @Override
     public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter,
             ModelState modelState, ItemOverrides overrides) {
         var defaultOverlays = loadSprites(spriteGetter, this.defaultOverlays);
-        var tieredOverlays = new HashMap<ResourceLocation, TextureAtlasSprite[]>();
+        var tieredOverlays = new HashMap<MachineCasing, TextureAtlasSprite[]>();
         for (var entry : this.tieredOverlays.entrySet()) {
             tieredOverlays.put(entry.getKey(), loadSprites(spriteGetter, entry.getValue()));
         }

src/generated/resources/assets/modern_industrialization/lang/en_us.json

@@ -1092,27 +1092,13 @@
   "key.modern_industrialization.toggle_flight": "Toggle Flight",
   "machine_casing.modern_industrialization.bricked_bronze": "Bricked Bronze",
   "machine_casing.modern_industrialization.bricked_steel": "Bricked Steel",
-  "machine_casing.modern_industrialization.bricks": "Bricks",
-  "machine_casing.modern_industrialization.bronze": "Bronze",
-  "machine_casing.modern_industrialization.bronze_plated_bricks": "Bronze Plated Bricks",
-  "machine_casing.modern_industrialization.clean_stainless_steel_machine_casing": "Clean Stainless Steel",
   "machine_casing.modern_industrialization.configurable_tank": "Configurable Tank",
   "machine_casing.modern_industrialization.ev": "EV",
-  "machine_casing.modern_industrialization.firebricks": "Firebricks",
-  "machine_casing.modern_industrialization.frostproof_machine_casing": "Frostproof",
-  "machine_casing.modern_industrialization.heatproof_machine_casing": "Heatproof",
   "machine_casing.modern_industrialization.hv": "HV",
   "machine_casing.modern_industrialization.lv": "LV",
   "machine_casing.modern_industrialization.mv": "MV",
-  "machine_casing.modern_industrialization.nuclear_casing": "Nuclear",
-  "machine_casing.modern_industrialization.plasma_handling_iridium_machine_casing": "Plasma Handling Iridium",
-  "machine_casing.modern_industrialization.solid_titanium_machine_casing": "Solid Titanium",
-  "machine_casing.modern_industrialization.stainless_steel_machine_casing_pipe": "Stainless Steel Pipe",
-  "machine_casing.modern_industrialization.steel": "Steel",
   "machine_casing.modern_industrialization.steel_crate": "Steel Crate",
   "machine_casing.modern_industrialization.superconductor": "Superconductor",
-  "machine_casing.modern_industrialization.titanium": "Titanium",
-  "machine_casing.modern_industrialization.titanium_machine_casing_pipe": "Titanium Pipe",
   "rei_categories.modern_industrialization.assembler": "Assembler",
   "rei_categories.modern_industrialization.bronze_compressor": "Compressor",
   "rei_categories.modern_industrialization.bronze_cutting_machine": "Cutting Machine",

src/main/java/aztech/modern_industrialization/api/energy/CableTier.java

@@ -23,6 +23,7 @@
  */
 package aztech.modern_industrialization.api.energy;
 
+import aztech.modern_industrialization.MI;
 import aztech.modern_industrialization.MIBlockKeys;
 import aztech.modern_industrialization.compat.kubejs.KubeJSProxy;
 import aztech.modern_industrialization.machines.models.MachineCasing;
@@ -83,7 +84,7 @@ public CableTier(String name, String shortEnglishName, String longEnglishName, l
         this.longEnglishName = longEnglishName;
         this.eu = eu;
         this.itemKey = itemKey;
-        this.casing = MachineCasings.create(name, shortEnglishName);
+        this.casing = MachineCasings.create(MI.id(name), shortEnglishName);
         this.builtin = builtin;
     }
 

src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterCasingsEventJS.java

@@ -23,10 +23,11 @@
  */
 package aztech.modern_industrialization.compat.kubejs.machine;
 
-import aztech.modern_industrialization.datagen.model.MachineCasingImitations;
+import aztech.modern_industrialization.MI;
 import aztech.modern_industrialization.machines.models.MachineCasings;
 import dev.latvian.mods.kubejs.event.KubeEvent;
 import java.util.Objects;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,21 +47,15 @@ public void registerNamed(String name, String englishName) {
         if (name.contains(":")) {
             throw new IllegalArgumentException("Casing name cannot contain ':'.");
         }
-        MachineCasings.create(name, englishName);
+        MachineCasings.create(MI.id(name), englishName);
     }
 
-    @Deprecated
     public void registerBlockImitation(String name, ResourceLocation block) {
-        LOGGER.warn("registerBlockImitation is deprecated, use registerNamedBlockImitation instead");
-        registerNamedBlockImitation(name, null, block);
-    }
-
-    public void registerNamedBlockImitation(String name, String englishName, ResourceLocation block) {
         Objects.requireNonNull(block, "block may not be null");
         if (name.contains(":")) {
             throw new IllegalArgumentException("Casing name cannot contain ':'.");
         }
 
-        MachineCasingImitations.imitationsToGenerate.put(MachineCasings.create(name, englishName), block);
+        MachineCasings.createBlockImitation(MI.id(name), () -> BuiltInRegistries.BLOCK.get(block));
     }
 }

src/main/java/aztech/modern_industrialization/datagen/model/MachineCasingImitations.java

@@ -134,9 +134,8 @@ private void collectTranslationEntries() {
             addTranslation(cableTier.longEnglishKey(), cableTier.longEnglishName);
         }
 
-        for (var casing : MachineCasings.registeredCasings.values()) {
-            var englishName = MachineCasings.casingNames.get(casing.key);
-            addTranslation(casing.getTranslationKey(), englishName);
+        for (var casingName : MachineCasings.translations) {
+            addTranslation(casingName.casing().getTranslationKey(), casingName.englishName());
         }
     }
 

src/main/java/aztech/modern_industrialization/datagen/translation/TranslationProvider.java

@@ -23,22 +23,39 @@
  */
 package aztech.modern_industrialization.machines.models;
 
+import java.util.function.Supplier;
+import net.minecraft.Util;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+import org.jetbrains.annotations.Nullable;
 
 public class MachineCasing {
     public final ResourceLocation key;
+    /**
+     * Not null when registered as an imitation. The actual model might not be an imitation since it is resource pack driven.
+     * Mostly used to pull the name of the casing from the block it imitates. Will also generate a corresponding casing model.
+     */
+    @Nullable
+    public final Supplier<? extends Block> imitatedBlock;
 
-    MachineCasing(ResourceLocation key) {
+    MachineCasing(ResourceLocation key, @Nullable Supplier<? extends Block> imitatedBlock) {
         this.key = key;
+        this.imitatedBlock = imitatedBlock;
     }
 
     public String getTranslationKey() {
-        return "machine_casing.%s.%s".formatted(key.getNamespace(), key.getPath());
+        if (imitatedBlock != null) {
+            throw new IllegalArgumentException("Cannot get translation key for casing imitating a block.");
+        }
+        return Util.makeDescriptionId("machine_casing", key);
     }
 
-    public MutableComponent getDisplayName() {
+    public MutableComponent getName() {
+        if (imitatedBlock != null) {
+            return imitatedBlock.get().getName();
+        }
         return Component.translatable(getTranslationKey());
     }
 }