l10n improve

5 files changed, 395 insertions, 344 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
index 2f54c9c415..3598d602d4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
@@ -1,43 +1,43 @@
-package gregtech.common.blocks;
-
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-public class GT_Block_Metal extends GT_Block_Storage {
-    public Materials[] mMats;
-    public OrePrefixes mPrefix;
-    public IIconContainer[] mBlockIcons;
-    public boolean mHideBlocks;
-
-    public GT_Block_Metal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
-        super(GT_Item_Storage.class, aName, Material.iron);
-        mMats = aMats;
-        mPrefix = aPrefix;
-        mBlockIcons = aBlockIcons;
-        mHideBlocks = Loader.isModLoaded("NotEnoughItems");
-
-        for (int i = 0; i < aMats.length; i++) {
-            if (aMats[i].mMetaItemSubID > 0 && aMats[i].mHasParentMod) {
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + i + ".name", "Block of " + aMats[i].mDefaultLocalName);
-                GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
-            }
-        }
-        if (aMats.length<16 && Loader.isModLoaded("NotEnoughItems")) {
-            for (int i = aMats.length; i < 16; i++) codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));
-        }
-    }
-
-    public IIcon getIcon(int aSide, int aMeta) {
-        if ((aMeta >= 0) && (aMeta < 16) && aMeta < mMats.length) {
-            return mBlockIcons[aMeta].getIcon();
-        }
-        return null;
-    }
-}
+package gregtech.common.blocks;

+

+import cpw.mods.fml.common.Loader;

+import gregtech.api.enums.Materials;

+import gregtech.api.enums.OrePrefixes;

+import gregtech.api.interfaces.IIconContainer;

+import gregtech.api.util.GT_LanguageManager;

+import gregtech.api.util.GT_OreDictUnificator;

+import net.minecraft.block.material.Material;

+import net.minecraft.item.ItemStack;

+import net.minecraft.util.IIcon;

+

+public class GT_Block_Metal extends GT_Block_Storage {

+    public Materials[] mMats;

+    public OrePrefixes mPrefix;

+    public IIconContainer[] mBlockIcons;

+    public boolean mHideBlocks;

+

+    public GT_Block_Metal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {

+        super(GT_Item_Storage.class, aName, Material.iron);

+        mMats = aMats;

+        mPrefix = aPrefix;

+        mBlockIcons = aBlockIcons;

+        mHideBlocks = Loader.isModLoaded("NotEnoughItems");

+

+        for (int i = 0; i < aMats.length; i++) {

+            if (aMats[i].mMetaItemSubID > 0 && aMats[i].mHasParentMod) {

+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + i + ".name", "Block of %material");

+                GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));

+            }

+        }

+        if (aMats.length<16 && Loader.isModLoaded("NotEnoughItems")) {

+            for (int i = aMats.length; i < 16; i++) codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));

+        }

+    }

+

+    public IIcon getIcon(int aSide, int aMeta) {

+        if ((aMeta >= 0) && (aMeta < 16) && aMeta < mMats.length) {

+            return mBlockIcons[aMeta].getIcon();

+        }

+        return null;

+    }

+}

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index 5595fa8673..82da6f3a4c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -1,273 +1,278 @@
-package gregtech.common.blocks;
-
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.render.GT_Renderer_Block;
-import net.minecraft.block.Block;
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.boss.EntityDragon;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements ITileEntityProvider {
-    public static ThreadLocal<GT_TileEntity_Ores> mTemporaryTileEntity = new ThreadLocal();
-    public static boolean FUCKING_LOCK = false;
-    public static boolean tHideOres;
-    private final String aTextName = ".name";
-    private final String aTextSmall = "Small ";
-    public static Set aBlockedOres = new HashSet<Materials>();
-
-    protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta, Material aMaterial) {
-        super(GT_Item_Ores.class, aUnlocalizedName, aMaterial);
-        this.isBlockContainer = true;
-        setStepSound(soundTypeStone);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);
-        tHideOres = Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres;
-        if(aOreMetaCount > 8 || aOreMetaCount < 0) aOreMetaCount = 8;
-
-        for (int i = 0; i < 16; i++) {
-            GT_ModHandler.addValuableOre(this, i, 1);
-        }
-        for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            if (GregTech_API.sGeneratedMaterials[i] != null) {
-                for (int j = 0; j < aOreMetaCount; j++) {
-                    if (!this.getEnabledMetas()[j]) continue;
-                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + (j * 1000)) + aTextName, getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + aTextName, aTextSmall + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                    if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0 && !aBlockedOres.contains(GregTech_API.sGeneratedMaterials[i])) {
-                        GT_OreDictUnificator.registerOre(this.getProcessingPrefix()[j] != null ? this.getProcessingPrefix()[j].get(GregTech_API.sGeneratedMaterials[i]) : "", new ItemStack(this, 1, i + (j * 1000)));
-                        if (tHideOres) {
-                            if (!(j == 0 && !aHideFirstMeta)) {
-                                codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));
-                            }
-                            codechicken.nei.api.API.hideItem(new ItemStack(this, 1, (i + 16000) + (j * 1000)));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public int getBaseBlockHarvestLevel(int aMeta) {
-        return 0;
-    }
-
-    public void onNeighborChange(IBlockAccess aWorld, int aX, int aY, int aZ, int aTileX, int aTileY, int aTileZ) {
-        if (!FUCKING_LOCK) {
-            FUCKING_LOCK = true;
-            TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).onUpdated();
-            }
-        }
-        FUCKING_LOCK = false;
-    }
-
-    public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block aBlock) {
-        if (!FUCKING_LOCK) {
-            FUCKING_LOCK = true;
-            TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-                ((GT_TileEntity_Ores) tTileEntity).onUpdated();
-            }
-        }
-        FUCKING_LOCK = false;
-    }
-
-    public String getLocalizedName(Materials aMaterial) {
-        switch (aMaterial.mName) {
-            case "InfusedAir":
-            case "InfusedDull":
-            case "InfusedEarth":
-            case "InfusedEntropy":
-            case "InfusedFire":
-            case "InfusedOrder":
-            case "InfusedVis":
-            case "InfusedWater":
-                return aMaterial.mDefaultLocalName + " Infused Stone";
-            case "Vermiculite":
-            case "Bentonite":
-            case "Kaolinite":
-            case "Talc":
-            case "BasalticMineralSand":
-            case "GraniticMineralSand":
-            case "GlauconiteSand":
-            case "CassiteriteSand":
-            case "GarnetSand":
-            case "QuartzSand":
-            case "Pitchblende":
-            case "FullersEarth":
-                return aMaterial.mDefaultLocalName;
-            default:
-                return aMaterial.mDefaultLocalName + OrePrefixes.ore.mLocalizedMaterialPost;
-        }
-    }
-
-    public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_) {
-        super.onBlockEventReceived(p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, p_149696_5_, p_149696_6_);
-        TileEntity tileentity = p_149696_1_.getTileEntity(p_149696_2_, p_149696_3_, p_149696_4_);
-        return tileentity != null ? tileentity.receiveClientEvent(p_149696_5_, p_149696_6_) : false;
-    }
-
-    public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {
-        return (!(entity instanceof EntityDragon)) && (super.canEntityDestroy(world, x, y, z, entity));
-    }
-
-    public String getHarvestTool(int aMeta) {
-        return aMeta < 8 ? "pickaxe" : "shovel";
-    }
-
-    public int getHarvestLevel(int aMeta) {
-        return aMeta == 5 || aMeta == 6 ? 2 : aMeta % 8;
-    }
-
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return 1.0F + getHarvestLevel(aWorld.getBlockMetadata(aX, aY, aZ)) * 1.0F;
-    }
-
-    public float getExplosionResistance(Entity par1Entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) {
-        return 1.0F + getHarvestLevel(aWorld.getBlockMetadata(aX, aY, aZ)) * 1.0F;
-    }
-
-    protected boolean canSilkHarvest() {
-        return false;
-    }
-
-    public abstract String getUnlocalizedName();
-
-    public String getLocalizedName() {
-        return StatCollector.translateToLocal(getUnlocalizedName() + aTextName);
-    }
-
-    public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
-            return super.getRenderType();
-        }
-        return GT_Renderer_Block.INSTANCE.mRenderID;
-    }
-
-    public boolean canBeReplacedByLeaves(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return true;
-    }
-
-    public boolean hasTileEntity(int aMeta) {
-        return true;
-    }
-
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-
-    public boolean isOpaqueCube() {
-        return true;
-    }
-
-    public TileEntity createNewTileEntity(World aWorld, int aMeta) {
-        return createTileEntity(aWorld, aMeta);
-    }
-
-    public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) {
-        return Blocks.stone.getIcon(0, 0);
-    }
-
-    public IIcon getIcon(int aSide, int aMeta) {
-        return Blocks.stone.getIcon(0, 0);
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister aIconRegister) {
-    }
-
-    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if (((tTileEntity instanceof GT_TileEntity_Ores))) {
-            return ((GT_TileEntity_Ores) tTileEntity).getMetaData();
-        }
-        return 0;
-    }
-
-    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-            mTemporaryTileEntity.set((GT_TileEntity_Ores) tTileEntity);
-        }
-        super.breakBlock(aWorld, aX, aY, aZ, par5, par6);
-        aWorld.removeTileEntity(aX, aY, aZ);
-    }
-
-    public abstract OrePrefixes[] getProcessingPrefix(); //Must have 8 entries; an entry can be null to disable automatic recipes.
-
-    public abstract boolean[] getEnabledMetas(); //Must have 8 entries.
-
-    public abstract Block getDroppedBlock();
-
-    public abstract Materials[] getDroppedDusts(); //Must have 8 entries; can be null.
-
-    public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
-            return ((GT_TileEntity_Ores) tTileEntity).getDrops(getDroppedBlock(), aFortune);
-        }
-        return mTemporaryTileEntity.get() == null ? new ArrayList() : ((GT_TileEntity_Ores) mTemporaryTileEntity.get()).getDrops(getDroppedBlock(), aFortune);
-    }
-
-    public TileEntity createTileEntity(World aWorld, int aMeta) {
-        return new GT_TileEntity_Ores();
-    }
-
-    public abstract ITexture[] getTextureSet(); //Must have 16 entries.
-
-    @Override
-    public void getSubBlocks(Item aItem, CreativeTabs aTab, List aList) {
-        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i];
-            if ((tMaterial != null) && ((tMaterial.mTypes & 0x8) != 0)&& !aBlockedOres.contains(tMaterial)) {
-                if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i));
-                if (!(new ItemStack(aItem, 1, i + 1000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 1000));
-                if (!(new ItemStack(aItem, 1, i + 2000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 2000));
-                if (!(new ItemStack(aItem, 1, i + 3000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 3000));
-                if (!(new ItemStack(aItem, 1, i + 4000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 4000));
-                if (!(new ItemStack(aItem, 1, i + 5000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 5000));
-                if (!(new ItemStack(aItem, 1, i + 6000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 6000));
-                if (!(new ItemStack(aItem, 1, i + 7000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 7000));
-                if (!(new ItemStack(aItem, 1, i + 16000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 16000));
-                if (!(new ItemStack(aItem, 1, i + 17000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 17000));
-                if (!(new ItemStack(aItem, 1, i + 18000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 18000));
-                if (!(new ItemStack(aItem, 1, i + 19000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 19000));
-                if (!(new ItemStack(aItem, 1, i + 20000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 20000));
-                if (!(new ItemStack(aItem, 1, i + 21000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 21000));
-                if (!(new ItemStack(aItem, 1, i + 22000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 22000));
-                if (!(new ItemStack(aItem, 1, i + 23000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 23000));
-            }
-        }
-    }
+package gregtech.common.blocks;

+

+import cpw.mods.fml.common.Loader;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

+import gregtech.GT_Mod;

+import gregtech.api.GregTech_API;

+import gregtech.api.enums.Materials;

+import gregtech.api.enums.OrePrefixes;

+import gregtech.api.interfaces.ITexture;

+import gregtech.api.items.GT_Generic_Block;

+import gregtech.api.util.GT_LanguageManager;

+import gregtech.api.util.GT_ModHandler;

+import gregtech.api.util.GT_OreDictUnificator;

+import gregtech.common.render.GT_Renderer_Block;

+import net.minecraft.block.Block;

+import net.minecraft.block.ITileEntityProvider;

+import net.minecraft.block.material.Material;

+import net.minecraft.client.renderer.texture.IIconRegister;

+import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.Entity;

+import net.minecraft.entity.boss.EntityDragon;

+import net.minecraft.init.Blocks;

+import net.minecraft.item.Item;

+import net.minecraft.item.ItemStack;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraft.util.IIcon;

+import net.minecraft.util.StatCollector;

+import net.minecraft.world.IBlockAccess;

+import net.minecraft.world.World;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Set;

+

+public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements ITileEntityProvider {

+    public static ThreadLocal<GT_TileEntity_Ores> mTemporaryTileEntity = new ThreadLocal();

+    public static boolean FUCKING_LOCK = false;

+    public static boolean tHideOres;

+    private final String aTextName = ".name";

+    private final String aTextSmall = "Small ";

+    public static Set aBlockedOres = new HashSet<Materials>();

+

+    protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta, Material aMaterial) {

+        super(GT_Item_Ores.class, aUnlocalizedName, aMaterial);

+        this.isBlockContainer = true;

+        setStepSound(soundTypeStone);

+        setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);

+        tHideOres = Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres;

+        if(aOreMetaCount > 8 || aOreMetaCount < 0) aOreMetaCount = 8;

+

+        for (int i = 0; i < 16; i++) {

+            GT_ModHandler.addValuableOre(this, i, 1);

+        }

+        for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {

+            if (GregTech_API.sGeneratedMaterials[i] != null) {

+                for (int j = 0; j < aOreMetaCount; j++) {

+                    if (!this.getEnabledMetas()[j]) continue;

+                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + (j * 1000)) + aTextName, getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i]));

+                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + aTextName, aTextSmall + getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i]));

+                    if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0 && !aBlockedOres.contains(GregTech_API.sGeneratedMaterials[i])) {

+                        GT_OreDictUnificator.registerOre(this.getProcessingPrefix()[j] != null ? this.getProcessingPrefix()[j].get(GregTech_API.sGeneratedMaterials[i]) : "", new ItemStack(this, 1, i + (j * 1000)));

+                        if (tHideOres) {

+                            if (!(j == 0 && !aHideFirstMeta)) {

+                                codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));

+                            }

+                            codechicken.nei.api.API.hideItem(new ItemStack(this, 1, (i + 16000) + (j * 1000)));

+                        }

+                    }

+                }

+            }

+        }

+    }

+

+    public int getBaseBlockHarvestLevel(int aMeta) {

+        return 0;

+    }

+

+    public void onNeighborChange(IBlockAccess aWorld, int aX, int aY, int aZ, int aTileX, int aTileY, int aTileZ) {

+        if (!FUCKING_LOCK) {

+            FUCKING_LOCK = true;

+            TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

+            if ((tTileEntity instanceof GT_TileEntity_Ores)) {

+                ((GT_TileEntity_Ores) tTileEntity).onUpdated();

+            }

+        }

+        FUCKING_LOCK = false;

+    }

+

+    public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block aBlock) {

+        if (!FUCKING_LOCK) {

+            FUCKING_LOCK = true;

+            TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

+            if ((tTileEntity instanceof GT_TileEntity_Ores)) {

+                ((GT_TileEntity_Ores) tTileEntity).onUpdated();

+            }

+        }

+        FUCKING_LOCK = false;

+    }

+

+    public String getLocalizedNameFormat(Materials aMaterial) {

+    	switch (aMaterial.mName) {

+        case "InfusedAir":

+        case "InfusedDull":

+        case "InfusedEarth":

+        case "InfusedEntropy":

+        case "InfusedFire":

+        case "InfusedOrder":

+        case "InfusedVis":

+        case "InfusedWater":

+            return "%material Infused Stone";

+        case "Vermiculite":

+        case "Bentonite":

+        case "Kaolinite":

+        case "Talc":

+        case "BasalticMineralSand":

+        case "GraniticMineralSand":

+        case "GlauconiteSand":

+        case "CassiteriteSand":

+        case "GarnetSand":

+        case "QuartzSand":

+        case "Pitchblende":

+        case "FullersEarth":

+            return "%material";

+        default:

+            return "%material" + OrePrefixes.ore.mLocalizedMaterialPost;

+    	}

+    }

+

+    @Deprecated

+    public String getLocalizedName(Materials aMaterial) {

+        return aMaterial.getLocalizedNameForItem(getLocalizedNameFormat(aMaterial));

+    }

+

+    public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_) {

+        super.onBlockEventReceived(p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, p_149696_5_, p_149696_6_);

+        TileEntity tileentity = p_149696_1_.getTileEntity(p_149696_2_, p_149696_3_, p_149696_4_);

+        return tileentity != null ? tileentity.receiveClientEvent(p_149696_5_, p_149696_6_) : false;

+    }

+

+    public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {

+        return (!(entity instanceof EntityDragon)) && (super.canEntityDestroy(world, x, y, z, entity));

+    }

+

+    public String getHarvestTool(int aMeta) {

+        return aMeta < 8 ? "pickaxe" : "shovel";

+    }

+

+    public int getHarvestLevel(int aMeta) {

+        return aMeta == 5 || aMeta == 6 ? 2 : aMeta % 8;

+    }

+

+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {

+        return 1.0F + getHarvestLevel(aWorld.getBlockMetadata(aX, aY, aZ)) * 1.0F;

+    }

+

+    public float getExplosionResistance(Entity par1Entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) {

+        return 1.0F + getHarvestLevel(aWorld.getBlockMetadata(aX, aY, aZ)) * 1.0F;

+    }

+

+    protected boolean canSilkHarvest() {

+        return false;

+    }

+

+    public abstract String getUnlocalizedName();

+

+    public String getLocalizedName() {

+        return StatCollector.translateToLocal(getUnlocalizedName() + aTextName);

+    }

+

+    public int getRenderType() {

+        if (GT_Renderer_Block.INSTANCE == null) {

+            return super.getRenderType();

+        }

+        return GT_Renderer_Block.INSTANCE.mRenderID;

+    }

+

+    public boolean canBeReplacedByLeaves(IBlockAccess aWorld, int aX, int aY, int aZ) {

+        return false;

+    }

+

+    public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {

+        return true;

+    }

+

+    public boolean hasTileEntity(int aMeta) {

+        return true;

+    }

+

+    public boolean renderAsNormalBlock() {

+        return true;

+    }

+

+    public boolean isOpaqueCube() {

+        return true;

+    }

+

+    public TileEntity createNewTileEntity(World aWorld, int aMeta) {

+        return createTileEntity(aWorld, aMeta);

+    }

+

+    public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) {

+        return Blocks.stone.getIcon(0, 0);

+    }

+

+    public IIcon getIcon(int aSide, int aMeta) {

+        return Blocks.stone.getIcon(0, 0);

+    }

+

+    @SideOnly(Side.CLIENT)

+    public void registerBlockIcons(IIconRegister aIconRegister) {

+    }

+

+    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {

+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

+        if (((tTileEntity instanceof GT_TileEntity_Ores))) {

+            return ((GT_TileEntity_Ores) tTileEntity).getMetaData();

+        }

+        return 0;

+    }

+

+    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) {

+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

+        if ((tTileEntity instanceof GT_TileEntity_Ores)) {

+            mTemporaryTileEntity.set((GT_TileEntity_Ores) tTileEntity);

+        }

+        super.breakBlock(aWorld, aX, aY, aZ, par5, par6);

+        aWorld.removeTileEntity(aX, aY, aZ);

+    }

+

+    public abstract OrePrefixes[] getProcessingPrefix(); //Must have 8 entries; an entry can be null to disable automatic recipes.

+

+    public abstract boolean[] getEnabledMetas(); //Must have 8 entries.

+

+    public abstract Block getDroppedBlock();

+

+    public abstract Materials[] getDroppedDusts(); //Must have 8 entries; can be null.

+

+    public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {

+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

+        if ((tTileEntity instanceof GT_TileEntity_Ores)) {

+            return ((GT_TileEntity_Ores) tTileEntity).getDrops(getDroppedBlock(), aFortune);

+        }

+        return mTemporaryTileEntity.get() == null ? new ArrayList() : ((GT_TileEntity_Ores) mTemporaryTileEntity.get()).getDrops(getDroppedBlock(), aFortune);

+    }

+

+    public TileEntity createTileEntity(World aWorld, int aMeta) {

+        return new GT_TileEntity_Ores();

+    }

+

+    public abstract ITexture[] getTextureSet(); //Must have 16 entries.

+

+    @Override

+    public void getSubBlocks(Item aItem, CreativeTabs aTab, List aList) {

+        for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {

+            Materials tMaterial = GregTech_API.sGeneratedMaterials[i];

+            if ((tMaterial != null) && ((tMaterial.mTypes & 0x8) != 0)&& !aBlockedOres.contains(tMaterial)) {

+                if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i));

+                if (!(new ItemStack(aItem, 1, i + 1000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 1000));

+                if (!(new ItemStack(aItem, 1, i + 2000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 2000));

+                if (!(new ItemStack(aItem, 1, i + 3000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 3000));

+                if (!(new ItemStack(aItem, 1, i + 4000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 4000));

+                if (!(new ItemStack(aItem, 1, i + 5000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 5000));

+                if (!(new ItemStack(aItem, 1, i + 6000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 6000));

+                if (!(new ItemStack(aItem, 1, i + 7000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 7000));

+                if (!(new ItemStack(aItem, 1, i + 16000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 16000));

+                if (!(new ItemStack(aItem, 1, i + 17000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 17000));

+                if (!(new ItemStack(aItem, 1, i + 18000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 18000));

+                if (!(new ItemStack(aItem, 1, i + 19000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 19000));

+                if (!(new ItemStack(aItem, 1, i + 20000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 20000));

+                if (!(new ItemStack(aItem, 1, i + 21000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 21000));

+                if (!(new ItemStack(aItem, 1, i + 22000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 22000));

+                if (!(new ItemStack(aItem, 1, i + 23000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 23000));

+            }

+        }

+    }

 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
index aa54506468..7586787505 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -2,7 +2,12 @@ package gregtech.common.blocks;
 

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.GT_Values;

+import gregtech.api.enums.Materials;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item;

 import gregtech.api.util.GT_ItsNotMyFaultException;

 import gregtech.api.util.GT_LanguageManager;

 import gregtech.api.util.GT_Log;

@@ -100,6 +105,27 @@ public class GT_Item_Machines
         return "";

     }

 

+    public String getItemStackDisplayName(ItemStack aStack) {

+    	String aName = super.getItemStackDisplayName(aStack);

+    	short aDamage = (short) getDamage(aStack);

+    	if (aDamage >= 0 && aDamage < GregTech_API.METATILEENTITIES.length && GregTech_API.METATILEENTITIES[aDamage] != null) {

+            Materials aMaterial = null;

+            if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Item) {

+            	aMaterial = ((GT_MetaPipeEntity_Item) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;

+            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Fluid) {

+            	aMaterial = ((GT_MetaPipeEntity_Fluid) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;

+            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Cable) {

+            	aMaterial = ((GT_MetaPipeEntity_Cable) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;

+            } else if (GregTech_API.METATILEENTITIES[aDamage] instanceof GT_MetaPipeEntity_Frame) {

+            	aMaterial = ((GT_MetaPipeEntity_Frame) GregTech_API.METATILEENTITIES[aDamage]).mMaterial;

+            }

+            if (aMaterial != null) {

+            	aName = aMaterial.getLocalizedNameForItem(aName);

+            }

+        }

+    	return aName;

+    }

+

     public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {

         super.onCreated(aStack, aWorld, aPlayer);

         short tDamage = (short) getDamage(aStack);

diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
index 399c5d6bdd..10d71bfcc9 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
@@ -1,6 +1,7 @@
 package gregtech.common.blocks;

 

 import gregtech.api.GregTech_API;

+import gregtech.api.enums.Materials;

 import net.minecraft.block.Block;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemBlock;

@@ -24,6 +25,14 @@ public class GT_Item_Ores
         return this.field_150939_a.getUnlocalizedName() + "." + getDamage(aStack);

     }

 

+    public String getItemStackDisplayName(ItemStack aStack) {

+    	String aName = super.getItemStackDisplayName(aStack);

+    	if (this.field_150939_a instanceof GT_Block_Ores_Abstract) {

+    		aName = Materials.getLocalizedNameForItem(aName, aStack.getItemDamage() % 1000);

+    	}

+    	return aName;

+    }

+

     public boolean placeBlockAt(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int side, float hitX, float hitY, float hitZ, int aMeta) {

         short tDamage = (short) getDamage(aStack);

         if (tDamage > 0) {

diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
index 6dccff429a..84cbcba6f1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
@@ -1,30 +1,41 @@
-package gregtech.common.blocks;
-
-import gregtech.api.GregTech_API;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-import java.util.List;
-
-public class GT_Item_Storage extends ItemBlock {
-    public GT_Item_Storage(Block par1) {
-        super(par1);
-        setMaxDamage(0);
-        setHasSubtypes(true);
-        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
-    }
-
-    public String getUnlocalizedName(ItemStack aStack) {
-        return this.field_150939_a.getUnlocalizedName() + "." + getDamage(aStack);
-    }
-
-    public int getMetadata(int aMeta) {
-        return aMeta;
-    }
-
-    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-        super.addInformation(aStack, aPlayer, aList, aF3_H);
-    }
+package gregtech.common.blocks;

+

+import gregtech.api.GregTech_API;

+import net.minecraft.block.Block;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemBlock;

+import net.minecraft.item.ItemStack;

+

+import java.util.List;

+

+public class GT_Item_Storage extends ItemBlock {

+    public GT_Item_Storage(Block par1) {

+        super(par1);

+        setMaxDamage(0);

+        setHasSubtypes(true);

+        setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);

+    }

+

+    public String getUnlocalizedName(ItemStack aStack) {

+        return this.field_150939_a.getUnlocalizedName() + "." + getDamage(aStack);

+    }

+

+    public String getItemStackDisplayName(ItemStack aStack) {

+    	String aName = super.getItemStackDisplayName(aStack);

+    	if (this.field_150939_a instanceof GT_Block_Metal) {

+    		int aDamage = aStack.getItemDamage();

+    		if (aDamage >= 0 && aDamage < ((GT_Block_Metal) this.field_150939_a).mMats.length) {

+    			aName = ((GT_Block_Metal) this.field_150939_a).mMats[aDamage].getLocalizedNameForItem(aName);

+    		}

+    	}

+    	return aName;

+    }

+

+    public int getMetadata(int aMeta) {

+        return aMeta;

+    }

+

+    public void addInforma