Merge pull request #45 from Antifluxfield/GTNH-l10n

Localization improve

1 files changed, 161 insertions, 157 deletions

diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java
index 428270184d..52731f2f6c 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java
@@ -1,158 +1,162 @@
-package gregtech.api.items;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.SubTag;
-import gregtech.api.interfaces.IProjectileItem;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.block.BlockDispenser;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
-import net.minecraft.dispenser.BehaviorProjectileDispense;
-import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.dispenser.IPosition;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import java.util.List;
-
-import static gregtech.api.enums.GT_Values.MOD_ID;
-import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
-
-/**
- * Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur.
- */
-public class GT_Generic_Item extends Item implements IProjectileItem {
-    private final String mName, mTooltip;
-    protected IIcon mIcon;
-
-    public GT_Generic_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip) {
-        this(aUnlocalized, aEnglish, aEnglishTooltip, true);
-    }
-
-    public GT_Generic_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip, boolean aWriteToolTipIntoLangFile) {
-        super();
-        mName = "gt." + aUnlocalized;
-        GT_LanguageManager.addStringLocalization(mName + ".name", aEnglish);
-        if (GT_Utility.isStringValid(aEnglishTooltip))
-            GT_LanguageManager.addStringLocalization(mTooltip = mName + ".tooltip_main", aEnglishTooltip, aWriteToolTipIntoLangFile);
-        else mTooltip = null;
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GameRegistry.registerItem(this, mName, MOD_ID);
-        BlockDispenser.dispenseBehaviorRegistry.putObject(this, new GT_Item_Dispense());
-    }
-
-    @Override
-    public final Item setUnlocalizedName(String aName) {
-        return this;
-    }
-
-    @Override
-    public final String getUnlocalizedName() {
-        return mName;
-    }
-
-    @Override
-    public String getUnlocalizedName(ItemStack aStack) {
-        return getHasSubtypes() ? mName + "." + getDamage(aStack) : mName;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister aIconRegister) {
-        mIcon = aIconRegister.registerIcon(RES_PATH_ITEM + (GT_Config.troll ? "troll" : mName));
-    }
-
-    @Override
-    public boolean doesSneakBypassUse(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer) {
-        return true;
-    }
-
-    @Override
-    public IIcon getIconFromDamage(int par1) {
-        return mIcon;
-    }
-
-    public int getTier(ItemStack aStack) {
-        return 0;
-    }
-
-    @Override
-    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-        if (getMaxDamage() > 0 && !getHasSubtypes())
-            aList.add((aStack.getMaxDamage() - getDamage(aStack)) + " / " + aStack.getMaxDamage());
-        if (mTooltip != null) aList.add(GT_LanguageManager.getTranslation(mTooltip));
-        if (GT_ModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack));
-        addAdditionalToolTips(aList, aStack, aPlayer);
-    }
-
-    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
-        //
-    }
-
-    @Override
-    public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-        isItemStackUsable(aStack);
-    }
-
-    public boolean isItemStackUsable(ItemStack aStack) {
-        return true;
-    }
-
-    public ItemStack onDispense(IBlockSource aSource, ItemStack aStack) {
-        EnumFacing enumfacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata());
-        IPosition iposition = BlockDispenser.func_149939_a(aSource);
-        ItemStack itemstack1 = aStack.splitStack(1);
-        BehaviorDefaultDispenseItem.doDispense(aSource.getWorld(), itemstack1, 6, enumfacing, iposition);
-        return aStack;
-    }
-
-    @Override
-    public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ) {
-        return null;
-    }
-
-    @Override
-    public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed) {
-        return null;
-    }
-
-    @Override
-    public boolean hasProjectile(SubTag aProjectileType, ItemStack aStack) {
-        return false;
-    }
-
-    @Override
-    public ItemStack getContainerItem(ItemStack aStack) {
-        return null;
-    }
-
-    @Override
-    public boolean hasContainerItem(ItemStack aStack) {
-        return getContainerItem(aStack) != null;
-    }
-
-    public static class GT_Item_Dispense extends BehaviorProjectileDispense {
-        @Override
-        public ItemStack dispenseStack(IBlockSource aSource, ItemStack aStack) {
-            return ((GT_Generic_Item) aStack.getItem()).onDispense(aSource, aStack);
-        }
-
-        @Override
-        protected IProjectile getProjectileEntity(World aWorld, IPosition aPosition) {
-            return null;
-        }
-    }
+package gregtech.api.items;

+

+import cpw.mods.fml.common.registry.GameRegistry;

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

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

+import gregtech.api.GregTech_API;

+import gregtech.api.enums.SubTag;

+import gregtech.api.interfaces.IProjectileItem;

+import gregtech.api.util.GT_Config;

+import gregtech.api.util.GT_LanguageManager;

+import gregtech.api.util.GT_ModHandler;

+import gregtech.api.util.GT_Utility;

+import net.minecraft.block.BlockDispenser;

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

+import net.minecraft.dispenser.BehaviorDefaultDispenseItem;

+import net.minecraft.dispenser.BehaviorProjectileDispense;

+import net.minecraft.dispenser.IBlockSource;

+import net.minecraft.dispenser.IPosition;

+import net.minecraft.entity.EntityLivingBase;

+import net.minecraft.entity.IProjectile;

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

+import net.minecraft.entity.projectile.EntityArrow;

+import net.minecraft.item.Item;

+import net.minecraft.item.ItemStack;

+import net.minecraft.util.EnumFacing;

+import net.minecraft.util.IIcon;

+import net.minecraft.world.World;

+

+import java.util.List;

+

+import static gregtech.api.enums.GT_Values.MOD_ID;

+import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;

+

+/**

+ * Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur.

+ */

+public class GT_Generic_Item extends Item implements IProjectileItem {

+    private final String mName, mTooltip;

+    protected IIcon mIcon;

+

+    public GT_Generic_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip) {

+        this(aUnlocalized, aEnglish, aEnglishTooltip, true);

+    }

+

+    public GT_Generic_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip, boolean aWriteToolTipIntoLangFile) {

+        super();

+        mName = "gt." + aUnlocalized;

+        GT_LanguageManager.addStringLocalization(mName + ".name", aEnglish);

+        if (GT_Utility.isStringValid(aEnglishTooltip))

+            GT_LanguageManager.addStringLocalization(mTooltip = mName + ".tooltip_main", aEnglishTooltip, aWriteToolTipIntoLangFile);

+        else mTooltip = null;

+        setCreativeTab(GregTech_API.TAB_GREGTECH);

+        GameRegistry.registerItem(this, mName, MOD_ID);

+        BlockDispenser.dispenseBehaviorRegistry.putObject(this, new GT_Item_Dispense());

+    }

+

+    @Override

+    public final Item setUnlocalizedName(String aName) {

+        return this;

+    }

+

+    @Override

+    public final String getUnlocalizedName() {

+        return mName;

+    }

+

+    @Override

+    public String getUnlocalizedName(ItemStack aStack) {

+        return getHasSubtypes() ? mName + "." + getDamage(aStack) : mName;

+    }

+

+    @Override

+    @SideOnly(Side.CLIENT)

+    public void registerIcons(IIconRegister aIconRegister) {

+        mIcon = aIconRegister.registerIcon(RES_PATH_ITEM + (GT_Config.troll ? "troll" : mName));

+    }

+

+    @Override

+    public boolean doesSneakBypassUse(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer) {

+        return true;

+    }

+

+    @Override

+    public IIcon getIconFromDamage(int par1) {

+        return mIcon;

+    }

+

+    public int getTier(ItemStack aStack) {

+        return 0;

+    }

+

+    @Override

+    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {

+        if (getMaxDamage() > 0 && !getHasSubtypes())

+            aList.add((aStack.getMaxDamage() - getDamage(aStack)) + " / " + aStack.getMaxDamage());

+        if (mTooltip != null) aList.add(GT_LanguageManager.getTranslation(mTooltip));

+        if (GT_ModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack));

+        addAdditionalToolTips(aList, aStack, aPlayer);

+    }

+

+    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

+        //

+    }

+

+    @Override

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

+        isItemStackUsable(aStack);

+    }

+

+    public boolean isItemStackUsable(ItemStack aStack) {

+        return true;

+    }

+

+    public ItemStack onDispense(IBlockSource aSource, ItemStack aStack) {

+        EnumFacing enumfacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata());

+        IPosition iposition = BlockDispenser.func_149939_a(aSource);

+        ItemStack itemstack1 = aStack.splitStack(1);

+        BehaviorDefaultDispenseItem.doDispense(aSource.getWorld(), itemstack1, 6, enumfacing, iposition);

+        return aStack;

+    }

+

+    @Override

+    public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ) {

+        return null;

+    }

+

+    @Override

+    public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed) {

+        return null;

+    }

+

+    @Override

+    public boolean hasProjectile(SubTag aProjectileType, ItemStack aStack) {

+        return false;

+    }

+

+    @Override

+    public ItemStack getContainerItem(ItemStack aStack) {

+        return null;

+    }

+

+    @Override

+    public boolean hasContainerItem(ItemStack aStack) {

+        return getContainerItem(aStack) != null;

+    }

+    

+    public String trans(String aKey, String aEnglish){

+    	return GT_LanguageManager.addStringLocalization("Item_DESCRIPTION_Index_"+aKey, aEnglish, false);

+    }

+

+    public static class GT_Item_Dispense extends BehaviorProjectileDispense {

+        @Override

+        public ItemStack dispenseStack(IBlockSource aSource, ItemStack aStack) {

+            return ((GT_Generic_Item) aStack.getItem()).onDispense(aSource, aStack);

+        }

+

+        @Override

+        protected IProjectile getProjectileEntity(World aWorld, IPosition aPosition) {

+            return null;

+        }

+    }

 }
\ No newline at end of file