Rename storage blocks to be more inline with vanilla naming of storage blocks

Author: pupnewfster

src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55

@@ -6,7 +6,6 @@
 import mekanism.common.MekanismLang;
 import net.minecraft.Util;
 
-//TODO - 1.20.5: Osmium Block (and other storage blocks) -> Block of Osmium (etc, though maybe we want to change the base lang entry instead for some to better match vanilla)
 @NothingNullByDefault
 public enum MekanismAliases implements IAliasedTranslation {
     BIN_DRAWER("bin.drawer", "Drawer"),
@@ -16,6 +15,11 @@ public enum MekanismAliases implements IAliasedTranslation {
     REDSTONE_CONTROL("redstone_control", "Redstone Control"),
     ROUND_ROBIN("round_robin", "Round-Robin"),
     TAG_CONVERTER("tag_converter", "Tag Converter"),
+    //Storage Block
+    BLOCK_BRONZE("block.bronze", "Bronze Block"),
+    BLOCK_CHARCOAL("block.charcoal", "Charcoal Block"),
+    BLOCK_STEEL("block.steel", "Steel Block"),
+    BLOCK_FLUORITE("block.fluorite", "Fluorite Block"),
     //Canteen
     CANTEEN_EDIBLE("canteen.edible", "Edible"),
     CANTEEN_FOOD_STORAGE("canteen.storage", "Food Storage"),

src/datagen/generated/mekanism/.cache/c2007283a832f570d2167eeffdb50ecb2f811654

@@ -2,16 +2,19 @@
 
 import dev.emi.emi.api.stack.EmiStack;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.client.integration.MekanismAliases;
 import mekanism.common.Mekanism;
 import mekanism.common.content.blocktype.FactoryType;
 import mekanism.common.item.block.ItemBlockEnergyCube;
+import mekanism.common.registration.impl.BlockRegistryObject;
 import mekanism.common.registries.MekanismBlocks;
 import mekanism.common.registries.MekanismFluids;
 import mekanism.common.registries.MekanismGases;
 import mekanism.common.registries.MekanismItems;
+import mekanism.common.resource.IResource;
 import mekanism.common.tier.FactoryTier;
 import mekanism.common.util.EnumUtils;
 import mekanism.common.util.FluidUtils;
@@ -180,6 +183,7 @@ private void addMultiblockAliases() {
     }
 
     private void addStorageAliases() {
+        addStorageBlockAliases();
         addQIOAliases();
         addAliases(List.of(
               MekanismBlocks.BASIC_BIN,
@@ -237,6 +241,18 @@ private void addStorageAliases() {
         ), MekanismAliases.STORAGE_TRASHCAN, MekanismAliases.STORAGE_VOID);
     }
 
+    private void addStorageBlockAliases() {
+        addAliases(MekanismBlocks.BRONZE_BLOCK, MekanismAliases.BLOCK_BRONZE);
+        addAliases(MekanismBlocks.CHARCOAL_BLOCK, MekanismAliases.BLOCK_CHARCOAL);
+        addAliases(MekanismBlocks.STEEL_BLOCK, MekanismAliases.BLOCK_STEEL);
+        addAliases(MekanismBlocks.FLUORITE_BLOCK, MekanismAliases.BLOCK_FLUORITE);
+        //Dynamic storage blocks
+        for (Map.Entry<IResource, BlockRegistryObject<?, ?>> entry : MekanismBlocks.PROCESSED_RESOURCE_BLOCKS.entrySet()) {
+            BlockRegistryObject<?, ?> block = entry.getValue();
+            addAliases(block, () -> Util.makeDescriptionId("alias", block.getId().withPath(entry.getKey().getRegistrySuffix())));
+        }
+    }
+
     private void addQIOAliases() {
         addAliases(MekanismBlocks.QIO_REDSTONE_ADAPTER, MekanismAliases.QIO_FULL, MekanismAliases.QIO_ADAPTER_EMITTER);
         addAliases(MekanismBlocks.QIO_DRIVE_ARRAY, MekanismAliases.QIO_FULL, MekanismAliases.QIO_DRIVE_BAY);

src/datagen/generated/mekanism/assets/emi/aliases/mekanism.json

@@ -466,17 +466,18 @@ private void addBlocks() {
         addOre(OreType.URANIUM, "A common, heavy metal, which can yield massive amounts of energy when properly processed. In its naturally-occurring form, it is not radioactive enough to cause harm.");
         addOre(OreType.LEAD, "A somewhat rare metal that is excellent at resisting radioactive particles.");
         //Storage blocks
-        add(MekanismBlocks.BRONZE_BLOCK, "Bronze Block");
+        add(MekanismBlocks.BRONZE_BLOCK, "Block of Bronze");
+        add(MekanismBlocks.CHARCOAL_BLOCK, "Block of Charcoal");
+        add(MekanismBlocks.STEEL_BLOCK, "Block of Steel");
+        add(MekanismBlocks.FLUORITE_BLOCK, "Block of Fluorite");
         add(MekanismBlocks.REFINED_OBSIDIAN_BLOCK, "Refined Obsidian");
-        add(MekanismBlocks.CHARCOAL_BLOCK, "Charcoal Block");
         add(MekanismBlocks.REFINED_GLOWSTONE_BLOCK, "Refined Glowstone");
-        add(MekanismBlocks.STEEL_BLOCK, "Steel Block");
-        add(MekanismBlocks.FLUORITE_BLOCK, "Fluorite Block");
         //Dynamic storage blocks
         for (Map.Entry<IResource, BlockRegistryObject<?, ?>> entry : MekanismBlocks.PROCESSED_RESOURCE_BLOCKS.entrySet()) {
             IResource key = entry.getKey();
             String name = formatAndCapitalize(key.getRegistrySuffix());
-            add(entry.getValue(), name + " Block");
+            add(entry.getValue(), "Block of " + name);
+            addAlias(key.getRegistrySuffix(), name + " Block");
             addTag(MekanismTags.Items.PROCESSED_RESOURCE_BLOCKS.get(key), name + " Storage Blocks");
         }
 

src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json

@@ -151,7 +151,6 @@ protected SerializedHashedItem(HashedItem other) {
 
         public Tag getNbtRepresentation(@NotNull HolderLookup.Provider provider) {
             if (nbtRepresentation == null) {
-                //TODO - 1.20.5: Only bother converting the patch to nbt so that we have a smaller save and also if defaults change then they get properly updated?
                 nbtRepresentation = internalToNBT(provider);
                 //Override to ensure that it gets stored with a count of one in case it was raw
                 // and that then when we read it we don't create it with extra size