Modify the localization of `MetaGeneratedBlockItem` (#116)

Former-commit-id: adc3bad9f25f279266fb6957af6f864c5b27160b

7 files changed, 32 insertions, 36 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java
index cbde0f80e6..9875da9eab 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java
@@ -36,6 +36,8 @@ import net.minecraft.world.World;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.werkstoffHashMap;
+
 public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks {
 
     public BW_MetaGeneratedBlock_Item(Block par1) {
@@ -51,6 +53,15 @@ public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks {
     }
 
     public String getItemStackDisplayName(ItemStack aStack) {
+        Block block = Block.getBlockFromItem(aStack.getItem());
+        if (block != null) {
+            if (block instanceof BW_MetaGenerated_Blocks) {
+                int aMetaData = aStack.getItemDamage();
+                Werkstoff werkstoff = werkstoffHashMap.get((short) aMetaData);
+                if (werkstoff == null) werkstoff = Werkstoff.default_null_Werkstoff;
+                return ((BW_MetaGenerated_Blocks) block).blockTypeLocalizedName.replace("%material", werkstoff.getLocalizedName());
+            }
+        }
         return GT_LanguageManager.getTranslation( getUnlocalizedName(aStack) + ".name");
     }
 
@@ -66,7 +77,7 @@ public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks {
         }
         Werkstoff werkstoff = Werkstoff.werkstoffHashMap.get((short) aStack.getItemDamage());
         if(werkstoff != null) {
-            aList.add(werkstoff.getToolTip());
+            aList.add(werkstoff.getLocalizedToolTip());
         }
         aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get());
     }
@@ -87,4 +98,4 @@ public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks {
         }
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java
index e13bca3bf5..9736e27566 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java
@@ -26,7 +26,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_LanguageManager;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -86,16 +85,6 @@ public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks imple
     @Override
     protected void doRegistrationStuff(Werkstoff tMaterial) {
         GregTech_API.registerMachineBlock(this, -1);
-        if (tMaterial == null) return;
-        if ((tMaterial.doesOreDictedItemExists(OrePrefixes.plate) && tMaterial.doesOreDictedItemExists(OrePrefixes.gearGtSmall)) || (tMaterial.hasItemType(OrePrefixes.plate) && tMaterial.hasItemType(OrePrefixes.gearGtSmall))) {
-            Optional.of(tMaterial)
-                    .ifPresent(pMaterial ->
-                            GT_LanguageManager.addStringLocalization(
-                                    this.getUnlocalizedName() + "." + pMaterial.getmID() + ".name",
-                                    _prefixes.mLocalizedMaterialPre + pMaterial.getDefaultName() + _prefixes.mLocalizedMaterialPost
-                            )
-                    );
-        }
     }
 
     @Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java
index 8a2143dba7..ad6e1f24ee 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java
@@ -28,6 +28,7 @@ import com.github.bartimaeusnek.bartworks.util.BW_Util;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_LanguageManager;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -43,6 +44,7 @@ public abstract class BW_MetaGenerated_Blocks extends BW_TileEntityContainer {
 
     public static ThreadLocal<BW_MetaGenerated_Block_TE> mTemporaryTileEntity = new ThreadLocal<>();
     protected OrePrefixes _prefixes;
+    protected String blockTypeLocalizedName;
 
     public BW_MetaGenerated_Blocks(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName) {
         this(p_i45386_1_, tileEntity, blockName, null);
@@ -55,6 +57,9 @@ public abstract class BW_MetaGenerated_Blocks extends BW_TileEntityContainer {
         this.setBlockTextureName("stone");
         this.setCreativeTab(metaTab);
         _prefixes = types;
+        if (_prefixes != null) {
+            this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization("bw.blocktype." + _prefixes, _prefixes.mLocalizedMaterialPre + "%material" + _prefixes.mLocalizedMaterialPost);
+        }
         Werkstoff.werkstoffHashSet.forEach(this::doRegistrationStuff);
     }
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java
index 1f86b274af..6e0ad77b8c 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java
@@ -44,6 +44,7 @@ public class BW_MetaGenerated_Ores extends BW_MetaGenerated_Blocks {
 
     public BW_MetaGenerated_Ores(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName) {
         super(p_i45386_1_, tileEntity, blockName);
+        this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization("bw.blocktype." + OrePrefixes.ore, OrePrefixes.ore.mLocalizedMaterialPre + "%material" + OrePrefixes.ore.mLocalizedMaterialPost);
     }
 
     protected void doRegistrationStuff(Werkstoff w) {
@@ -51,7 +52,6 @@ public class BW_MetaGenerated_Ores extends BW_MetaGenerated_Blocks {
             if (!w.hasItemType(OrePrefixes.ore) || ((w.getGenerationFeatures().blacklist & 0b1000) != 0))
                 return;
             GT_ModHandler.addValuableOre(this, w.getmID(), 1);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + w.getmID() + ".name", w.getDefaultName() + OrePrefixes.ore.mLocalizedMaterialPost);
         }
     }
 
@@ -127,4 +127,4 @@ public class BW_MetaGenerated_Ores extends BW_MetaGenerated_Blocks {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java
index dc1db4303a..d95de69f0a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java
@@ -36,6 +36,7 @@ import java.util.Arrays;
 public class BW_MetaGenerated_SmallOres extends BW_MetaGenerated_Ores {
     public BW_MetaGenerated_SmallOres(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName) {
         super(p_i45386_1_, tileEntity, blockName);
+        this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization("bw.blocktype." + OrePrefixes.oreSmall,  OrePrefixes.oreSmall.mLocalizedMaterialPre+"%material" + OrePrefixes.oreSmall.mLocalizedMaterialPost);
     }
 
     @Override
@@ -44,7 +45,6 @@ public class BW_MetaGenerated_SmallOres extends BW_MetaGenerated_Ores {
             if (!w.hasItemType(OrePrefixes.ore) || ((w.getGenerationFeatures().blacklist & 0b1000) != 0))
                 return;
             GT_ModHandler.addValuableOre(this, w.getmID(), 1);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + w.getmID() + ".name", "Small " + w.getDefaultName() + OrePrefixes.oreSmall.mLocalizedMaterialPost);
         }
     }
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java
index 166f9aef8d..d27d50941e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java
@@ -34,25 +34,16 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
 import java.util.List;
-import java.util.Optional;
 
 public class BW_MetaGenerated_WerkstoffBlocks extends BW_MetaGenerated_Blocks {
 
     public BW_MetaGenerated_WerkstoffBlocks(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName) {
         super(p_i45386_1_, tileEntity, blockName);
+        this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization("bw.blocktype." + OrePrefixes.block, OrePrefixes.block.mLocalizedMaterialPre + "%material" + OrePrefixes.block.mLocalizedMaterialPost);
     }
 
     @Override
-    protected void doRegistrationStuff(Werkstoff tMaterial) {
-        Optional.ofNullable(tMaterial)
-                .filter(pMaterial -> pMaterial.hasItemType(OrePrefixes.gem) || pMaterial.hasItemType(OrePrefixes.ingot))
-                .ifPresent(pMaterial ->
-                        GT_LanguageManager.addStringLocalization(
-                                this.getUnlocalizedName() + "." + pMaterial.getmID() + ".name",
-                                OrePrefixes.block.mLocalizedMaterialPre + pMaterial.getDefaultName() + OrePrefixes.block.mLocalizedMaterialPost
-                        )
-                );
-    }
+    protected void doRegistrationStuff(Werkstoff tMaterial) {}
 
     @Override
     public String getUnlocalizedName() {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
index 035f4f832c..119cf017d2 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
@@ -105,14 +105,14 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
      */
     public Werkstoff(Materials materials, Werkstoff.GenerationFeatures generationFeatures, Types type, int mID){
         this(   materials.mRGBa,
-                materials.mDefaultLocalName,
-                materials.getToolTip(),
-                type == null ? materials.mElement != null ? Types.ELEMENT : Types.UNDEFINED : type,
-                generationFeatures,
-                mID,
-                materials.mIconSet,
-                (List) materials.mOreByProducts,
-                new Pair<>(materials, 1)
+            materials.mDefaultLocalName,
+            materials.getToolTip(),
+            type == null ? materials.mElement != null ? Types.ELEMENT : Types.UNDEFINED : type,
+            generationFeatures,
+            mID,
+            materials.mIconSet,
+            (List) materials.mOreByProducts,
+            new Pair<>(materials, 1)
         );
         if(!(mID > 31_766 && mID <= 32_767))
             throw new IllegalArgumentException();
@@ -492,7 +492,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
 
     public float getToolSpeed() {
         return this.stats.getSpeedOverride() > 0f ? this.stats.getSpeedOverride() : Math.max(1f,
-                2f * ((float) -this.getStats().getMass() + 0.1f * (float) this.getStats().getMeltingPoint() + (float) this.getStats().getProtons()) * 0.1f / (float) this.getContents().getKey() * 0.1f * (float) this.getToolQuality()
+            2f * ((float) -this.getStats().getMass() + 0.1f * (float) this.getStats().getMeltingPoint() + (float) this.getStats().getProtons()) * 0.1f / (float) this.getContents().getKey() * 0.1f * (float) this.getToolQuality()
         );
     }