diff --git a/src/main/java/gregtechmod/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtechmod/api/items/GT_CoolantCell_Item.java index 66f63e5..eff3e3f 100644 --- a/src/main/java/gregtechmod/api/items/GT_CoolantCell_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_CoolantCell_Item.java @@ -5,6 +5,7 @@ import gregtechmod.api.interfaces.ICapsuleCellContainer; import java.util.List; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -41,10 +42,11 @@ public class GT_CoolantCell_Item extends GT_Generic_Item implements ICapsuleCell } } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList, aStack); - aList.add("Stored Heat: " + getHeatOfStack(aStack)); // FIXME: lang + aList.add(I18n.format("item.coolant.stored.tooltip", getHeatOfStack(aStack))); } protected int getHeatOfStack(ItemStack aStack) { diff --git a/src/main/java/gregtechmod/api/items/GT_CrowbarRC_Item.java b/src/main/java/gregtechmod/api/items/GT_CrowbarRC_Item.java index a2341dd..681bcb6 100644 --- a/src/main/java/gregtechmod/api/items/GT_CrowbarRC_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_CrowbarRC_Item.java @@ -1,7 +1,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Utility; @@ -23,8 +22,8 @@ import net.minecraft.item.ItemStack; * Achievement get: Defused the legal Stuff of an Interface instead of asking CJ :P */ public class GT_CrowbarRC_Item extends GT_Crowbar_Item implements mods.railcraft.api.core.items.IToolCrowbar { - public GT_CrowbarRC_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) { - super(aID, aName, aMaxDamage, aEntityDamage); + public GT_CrowbarRC_Item(String aName, int aMaxDamage, int aEntityDamage) { + super(aName, aMaxDamage, aEntityDamage); } @Override diff --git a/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java b/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java index 1b5e567..ac35a43 100644 --- a/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java @@ -2,7 +2,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.GT_ToolDictNames; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; @@ -10,6 +9,7 @@ import gregtechmod.api.util.GT_Utility; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -17,7 +17,7 @@ import net.minecraft.world.World; public class GT_Crowbar_Item extends GT_Tool_Item { public GT_Crowbar_Item(String aName, int aMaxDamage, int aEntityDamage) { - super(aName, "To remove Covers from Machines", aMaxDamage, aEntityDamage, -1, -1, 5, 20.0F); // FIXME lang + super(aName, "item.GT_Crowbar.tooltip_main", aMaxDamage, aEntityDamage, -1, -1, 5, 20.0F); GregTech_API.registerCrowbar(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolCrowbar, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); addToBlockList(Blocks.rail); @@ -37,7 +37,7 @@ public class GT_Crowbar_Item extends GT_Tool_Item { @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList, aStack); - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Can turn Rails")); // FIXME: lang + aList.add(I18n.format("item.GT_Crowbar.tooltip_1")); } @Override @@ -46,7 +46,7 @@ public class GT_Crowbar_Item extends GT_Tool_Item { if (aWorld.isRemote) { return false; } - if (isRCCrowbar()) return false; +// if (isRCCrowbar()) return false; // TODO Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); diff --git a/src/main/java/gregtechmod/api/items/GT_Drill_Item.java b/src/main/java/gregtechmod/api/items/GT_Drill_Item.java index 7c9ed10..3a28f2c 100644 --- a/src/main/java/gregtechmod/api/items/GT_Drill_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Drill_Item.java @@ -5,7 +5,7 @@ import net.minecraft.init.Blocks; public class GT_Drill_Item extends GT_Tool_Item { public GT_Drill_Item(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { - super(aName, "For quickly making Holes", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength); // FIXME lang + super(aName, "item.GT_Drill_Advanced.tooltip", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength); setElectricConsumptionPerBrokenBlock(aEnergyConsumptionPerBlockBreak); addToBlockList(Blocks.tnt); } diff --git a/src/main/java/gregtechmod/api/items/GT_EmptyTool_Item.java b/src/main/java/gregtechmod/api/items/GT_EmptyTool_Item.java index 642bfdf..800944b 100644 --- a/src/main/java/gregtechmod/api/items/GT_EmptyTool_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_EmptyTool_Item.java @@ -8,9 +8,10 @@ import net.minecraftforge.oredict.OreDictionary; public class GT_EmptyTool_Item extends GT_Tool_Item { public GT_EmptyTool_Item(String aName, int aMaxDamage, int aChargedGTID) { - super(aName, "Empty. You need to recharge it.", aMaxDamage, 0, aChargedGTID, -1); // FIXME lang + super(aName, "item.tool.discharged.tooltip", aMaxDamage, 0, aChargedGTID, -1); try { Class.forName("codechicken.nei.api.API"); + codechicken.nei.api.API.hideItem(new ItemStack(this)); codechicken.nei.api.API.hideItem(new ItemStack(this, 1, OreDictionary.WILDCARD_VALUE)); } catch(Throwable e) {} } diff --git a/src/main/java/gregtechmod/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtechmod/api/items/GT_EnergyArmor_Item.java index d6d0b98..3bbf5e9 100644 --- a/src/main/java/gregtechmod/api/items/GT_EnergyArmor_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_EnergyArmor_Item.java @@ -80,18 +80,18 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - aList.add(I18n.format("item.electric.tier.tooltip", mTier)); // FIXME: lang - if ((mSpecials & 1) != 0) aList.add("Rebreather"); - if ((mSpecials & 2) != 0) aList.add("Inertia Damper"); - if ((mSpecials & 4) != 0) aList.add("Food Replicator"); - if ((mSpecials & 8) != 0) aList.add("Medicine Module"); - if ((mSpecials & 16) != 0) aList.add("Lamp"); - if ((mSpecials & 32) != 0) aList.add("Solarpanel"); - if ((mSpecials & 64) != 0) aList.add("Extinguisher Module"); - if ((mSpecials & 128) != 0) aList.add("Jump Booster"); - if ((mSpecials & 256) != 0) aList.add("Speed Booster"); - if ((mSpecials & 512) != 0) aList.add("Invisibility Field"); - if ((mSpecials & 1024) != 0) aList.add("Infinite Charge"); + aList.add(I18n.format("item.electric.tier.tooltip", mTier)); + if ((mSpecials & 1) != 0) aList.add(I18n.format("item.armor.capability.tooltip_1")); + if ((mSpecials & 2) != 0) aList.add(I18n.format("item.armor.capability.tooltip_2")); + if ((mSpecials & 4) != 0) aList.add(I18n.format("item.armor.capability.tooltip_3")); + if ((mSpecials & 8) != 0) aList.add(I18n.format("item.armor.capability.tooltip_4")); + if ((mSpecials & 16) != 0) aList.add(I18n.format("item.armor.capability.tooltip_5")); + if ((mSpecials & 32) != 0) aList.add(I18n.format("item.armor.capability.tooltip_6")); + if ((mSpecials & 64) != 0) aList.add(I18n.format("item.armor.capability.tooltip_7")); + if ((mSpecials & 128) != 0) aList.add(I18n.format("item.armor.capability.tooltip_8")); + if ((mSpecials & 256) != 0) aList.add(I18n.format("item.armor.capability.tooltip_9")); + if ((mSpecials & 512) != 0) aList.add(I18n.format("item.armor.capability.tooltip_10")); + if ((mSpecials & 1024) != 0) aList.add(I18n.format("item.armor.capability.tooltip_11")); } private void setCharge(ItemStack aStack) { diff --git a/src/main/java/gregtechmod/api/items/GT_HardHammerMFR_Item.java b/src/main/java/gregtechmod/api/items/GT_HardHammerMFR_Item.java index a5af4fc..8e165ac 100644 --- a/src/main/java/gregtechmod/api/items/GT_HardHammerMFR_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_HardHammerMFR_Item.java @@ -1,9 +1,8 @@ package gregtechmod.api.items; -import gregtechmod.api.util.GT_LanguageManager; - import java.util.List; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; public class GT_HardHammerMFR_Item extends GT_HardHammer_Item implements powercrystals.minefactoryreloaded.api.IMFRHammer { @@ -15,6 +14,6 @@ public class GT_HardHammerMFR_Item extends GT_HardHammer_Item implements powercr @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList, aStack); - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_mfr", "Works as Minefactory Hammer too")); // FIXME: LANG + aList.add(I18n.format("item.GT_Hammer.tooltip_mfr")); } } \ No newline at end of file diff --git a/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java b/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java index eeef927..41323ec 100644 --- a/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java @@ -2,7 +2,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.GT_ToolDictNames; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; @@ -11,6 +10,7 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -21,7 +21,7 @@ import net.minecraftforge.fluids.IFluidBlock; public class GT_HardHammer_Item extends GT_Tool_Item { public GT_HardHammer_Item(String aName, int aMaxDamage, int aEntityDamage) { - super(aName, "To give a Machine a hard whack", aMaxDamage, aEntityDamage); // FIXME: lang + super(aName, "item.GT_Hammer.tooltip", aMaxDamage, aEntityDamage); GregTech_API.registerHardHammer(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolHardHammer, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); addToEffectiveList(EntityIronGolem.class.getName()); @@ -50,10 +50,10 @@ public class GT_HardHammer_Item extends GT_Tool_Item { @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList, aStack); - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Used to craft Plates from Ingots")); // FIXME LANG!!! - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Can rotate some Blocks as well")); - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_3", "Also used to toggle general Machine states")); - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_4", "Usable as Prospectors Hammer")); + aList.add(I18n.format("item.GT_Hammer.tooltip_1")); + aList.add(I18n.format("item.GT_Hammer.tooltip_2")); + aList.add(I18n.format("item.GT_Hammer.tooltip_3")); + aList.add(I18n.format("item.GT_Hammer.tooltip_4")); } @Override @@ -114,19 +114,19 @@ public class GT_HardHammer_Item extends GT_Tool_Item { tBlock = aWorld.getBlock(tX, tY, tZ); if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) { - GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Rock."); // FIXME LANG!!! + GT_Utility.sendTrChatToPlayer(aPlayer, "item.GT_Hammer.tip_1"); break; } if (tBlock == Blocks.water || tBlock == Blocks.flowing_water || (tBlock != Blocks.air && tBlock != null && tBlock instanceof IFluidBlock)) { - GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Rock."); // FIXME LANG!!! + GT_Utility.sendTrChatToPlayer(aPlayer, "item.GT_Hammer.tip_2"); break; } if (tBlock == Blocks.monster_egg || !GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ)) { - GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Rock."); // FIXME LANG!!! + GT_Utility.sendTrChatToPlayer(aPlayer, "item.GT_Hammer.tip_3"); break; } if (tBlock != aBlock) { - if (i < 4) GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Rock."); // FIXME LANG!!! + if (i < 4) GT_Utility.sendTrChatToPlayer(aPlayer, "item.GT_Hammer.tip_4"); break; } } @@ -140,12 +140,12 @@ public class GT_HardHammer_Item extends GT_Tool_Item { tMetaID = aWorld.getBlockMetadata(tX, tY, tZ); tString = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if (tString != null && tString.startsWith("ore")) { - GT_Utility.sendChatToPlayer(aPlayer, "Found traces of " + GT_Utility.capitalizeString(tString.replaceFirst("ore", "")) + " Ore."); + GT_Utility.sendTrChatToPlayer(aPlayer, "item.GT_Hammer.tip_5", GT_Utility.capitalizeString(tString.replaceFirst("ore", ""))); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ); return true; } } - GT_Utility.sendChatToPlayer(aPlayer, "No Ores found."); + GT_Utility.sendTrChatToPlayer(aPlayer, "item.GT_Hammer.tip_6"); } return true; } diff --git a/src/main/java/gregtechmod/api/items/GT_Saw_Item.java b/src/main/java/gregtechmod/api/items/GT_Saw_Item.java index a49b7ac..363f455 100644 --- a/src/main/java/gregtechmod/api/items/GT_Saw_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Saw_Item.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; public class GT_Saw_Item extends GT_Tool_Item { public GT_Saw_Item(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { - super(aName, "For sawing Logs into Planks", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength); // FIXME lang + super(aName, "item.GT_Saw_Electric.tooltip", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength); //GregTech_API.registerSaw(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolSaw, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); addToBlockList(GT_ModHandler.getIC2Item("rubberLeaves", 1)); diff --git a/src/main/java/gregtechmod/api/items/GT_Screwdriver_Item.java b/src/main/java/gregtechmod/api/items/GT_Screwdriver_Item.java index 17646bd..d2b8bff 100644 --- a/src/main/java/gregtechmod/api/items/GT_Screwdriver_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Screwdriver_Item.java @@ -2,7 +2,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.GT_ToolDictNames; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; @@ -16,7 +15,6 @@ import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class GT_Screwdriver_Item extends GT_Tool_Item { @@ -50,7 +48,6 @@ public class GT_Screwdriver_Item extends GT_Tool_Item { Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (aBlock == Blocks.unpowered_repeater || aBlock == Blocks.powered_repeater) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { diff --git a/src/main/java/gregtechmod/api/items/GT_SoftHammer_Item.java b/src/main/java/gregtechmod/api/items/GT_SoftHammer_Item.java index 5fb9cdb..1974cc7 100644 --- a/src/main/java/gregtechmod/api/items/GT_SoftHammer_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_SoftHammer_Item.java @@ -2,7 +2,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.GT_ToolDictNames; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; @@ -15,7 +14,6 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class GT_SoftHammer_Item extends GT_Tool_Item { @@ -52,7 +50,6 @@ public class GT_SoftHammer_Item extends GT_Tool_Item { Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (aBlock == Blocks.lit_redstone_lamp) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { diff --git a/src/main/java/gregtechmod/api/items/GT_SolderingTool_Item.java b/src/main/java/gregtechmod/api/items/GT_SolderingTool_Item.java index ade555d..44dc2a9 100644 --- a/src/main/java/gregtechmod/api/items/GT_SolderingTool_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_SolderingTool_Item.java @@ -2,18 +2,18 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.GT_ToolDictNames; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_OreDictUnificator; import java.util.List; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class GT_SolderingTool_Item extends GT_Tool_Item { public GT_SolderingTool_Item(String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { - super(aName, "To repair and construct Circuitry", aMaxDamage, aEntityDamage, -1, aDischargedGTID); // FIXME: LANG + super(aName, "item.Soldering_Iron.tooltip", aMaxDamage, aEntityDamage, -1, aDischargedGTID); GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolSolderingIron, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); GregTech_API.registerSolderingTool(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); setCraftingSound(GregTech_API.sSoundList.get(103)); @@ -24,8 +24,8 @@ public class GT_SolderingTool_Item extends GT_Tool_Item { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Sets the Strength of outputted Redstone")); // FIXME: LANG - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Needs Soldering Metal in Inventory!")); // FIXME: LANG + aList.add(I18n.format("item.Soldering_Iron.tooltip_1")); + aList.add(I18n.format("item.Soldering_Iron.tooltip_2")); } @Override diff --git a/src/main/java/gregtechmod/api/items/GT_Spray_Color_Item.java b/src/main/java/gregtechmod/api/items/GT_Spray_Color_Item.java index 3acef6f..cacc8e4 100644 --- a/src/main/java/gregtechmod/api/items/GT_Spray_Color_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Spray_Color_Item.java @@ -2,7 +2,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.Dyes; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; @@ -12,6 +11,7 @@ import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -37,8 +37,8 @@ public class GT_Spray_Color_Item extends GT_Tool_Item { } @Override - public ItemStack getEmptyItem(ItemStack aStack) { - return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1); + public Item getEmptyItem(ItemStack aStack) { + return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1).getItem(); } @Override diff --git a/src/main/java/gregtechmod/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtechmod/api/items/GT_Spray_Foam_Item.java index aa2d062..2cd52a3 100644 --- a/src/main/java/gregtechmod/api/items/GT_Spray_Foam_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Spray_Foam_Item.java @@ -11,6 +11,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -28,8 +29,8 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { } @Override - public ItemStack getEmptyItem(ItemStack aStack) { - return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1); + public Item getEmptyItem(ItemStack aStack) { + return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1).getItem(); } public void switchMode(ItemStack aStack, EntityPlayer aPlayer) { @@ -67,7 +68,6 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { } Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; - byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); try { diff --git a/src/main/java/gregtechmod/api/items/GT_Spray_Hardener_Item.java b/src/main/java/gregtechmod/api/items/GT_Spray_Hardener_Item.java index 756fa47..bde6409 100644 --- a/src/main/java/gregtechmod/api/items/GT_Spray_Hardener_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Spray_Hardener_Item.java @@ -8,6 +8,7 @@ import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -23,8 +24,8 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item { } @Override - public ItemStack getEmptyItem(ItemStack aStack) { - return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1); + public Item getEmptyItem(ItemStack aStack) { + return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1).getItem(); } @Override @@ -35,7 +36,6 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item { } Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; - byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); try { diff --git a/src/main/java/gregtechmod/api/items/GT_Spray_Hydration_Item.java b/src/main/java/gregtechmod/api/items/GT_Spray_Hydration_Item.java index 0925dfd..e7aac90 100644 --- a/src/main/java/gregtechmod/api/items/GT_Spray_Hydration_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Spray_Hydration_Item.java @@ -6,6 +6,7 @@ import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -20,8 +21,8 @@ public class GT_Spray_Hydration_Item extends GT_Tool_Item { } @Override - public ItemStack getEmptyItem(ItemStack aStack) { - return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1); + public Item getEmptyItem(ItemStack aStack) { + return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1).getItem(); } @Override @@ -32,7 +33,6 @@ public class GT_Spray_Hydration_Item extends GT_Tool_Item { } Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; - byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); try { diff --git a/src/main/java/gregtechmod/api/items/GT_Spray_Ice_Item.java b/src/main/java/gregtechmod/api/items/GT_Spray_Ice_Item.java index a0f64c8..ef129bd 100644 --- a/src/main/java/gregtechmod/api/items/GT_Spray_Ice_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Spray_Ice_Item.java @@ -11,10 +11,10 @@ import net.minecraft.entity.monster.EntitySlime; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -45,8 +45,8 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item { } @Override - public ItemStack getEmptyItem(ItemStack aStack) { - return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1); + public Item getEmptyItem(ItemStack aStack) { + return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1).getItem(); } @Override @@ -61,7 +61,6 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item { Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (aBlock == Blocks.water || aBlock == Blocks.flowing_water) { if (aMeta == 0 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { diff --git a/src/main/java/gregtechmod/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtechmod/api/items/GT_Spray_Pepper_Item.java index b7390a9..1e35e1d 100644 --- a/src/main/java/gregtechmod/api/items/GT_Spray_Pepper_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Spray_Pepper_Item.java @@ -1,7 +1,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_OreDictUnificator; import java.util.List; @@ -11,10 +10,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class GT_Spray_Pepper_Item extends GT_Tool_Item { @@ -44,8 +43,8 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item { } @Override - public ItemStack getEmptyItem(ItemStack aStack) { - return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1); + public Item getEmptyItem(ItemStack aStack) { + return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1).getItem(); } @Override @@ -56,9 +55,6 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item { } Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; - byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - return false; } } \ No newline at end of file diff --git a/src/main/java/gregtechmod/api/items/GT_Tool_Item.java b/src/main/java/gregtechmod/api/items/GT_Tool_Item.java index 6f9d359..e944486 100644 --- a/src/main/java/gregtechmod/api/items/GT_Tool_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Tool_Item.java @@ -214,11 +214,11 @@ public class GT_Tool_Item extends GT_Generic_Item { } public Item getEmptyItem(ItemStack aStack) { - return null; + return this; } public Item getChargedItem(ItemStack itemStack) { - return null; + return this; } @Override diff --git a/src/main/java/gregtechmod/api/items/GT_WrenchBC_Item.java b/src/main/java/gregtechmod/api/items/GT_WrenchBC_Item.java index 0f564b2..4efd5b2 100644 --- a/src/main/java/gregtechmod/api/items/GT_WrenchBC_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_WrenchBC_Item.java @@ -1,19 +1,19 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Utility; import java.util.List; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import buildcraft.api.tools.IToolWrench; public class GT_WrenchBC_Item extends GT_Wrench_Item implements IToolWrench { - public GT_WrenchBC_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { - super(aID, aName, aMaxDamage, aEntityDamage, aDischargedGTID); + public GT_WrenchBC_Item(String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { + super(aName, aMaxDamage, aEntityDamage, aDischargedGTID); } @Override @@ -27,9 +27,10 @@ public class GT_WrenchBC_Item extends GT_Wrench_Item implements IToolWrench { GT_Utility.sendSoundToPlayers(aPlayer.worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList, aStack); - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_bc", "Works as Buildcraft Wrench too")); + aList.add(I18n.format("item.GT_Wrech.tooltip_bc")); } } \ No newline at end of file diff --git a/src/main/java/gregtechmod/api/items/GT_WrenchICBC_Item.java b/src/main/java/gregtechmod/api/items/GT_WrenchICBC_Item.java index 04fc616..c835ff9 100644 --- a/src/main/java/gregtechmod/api/items/GT_WrenchICBC_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_WrenchICBC_Item.java @@ -1,17 +1,17 @@ package gregtechmod.api.items; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import java.util.List; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import buildcraft.api.tools.IToolWrench; public class GT_WrenchICBC_Item extends GT_WrenchIC_Item implements IToolWrench { - public GT_WrenchICBC_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { - super(aID, aName, aMaxDamage, aEntityDamage, aDischargedGTID); + public GT_WrenchICBC_Item(String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { + super(aName, aMaxDamage, aEntityDamage, aDischargedGTID); } @Override @@ -24,9 +24,10 @@ public class GT_WrenchICBC_Item extends GT_WrenchIC_Item implements IToolWrench GT_ModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 1000, aPlayer); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { super.addAdditionalToolTips(aList, aStack); - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_bc", "Works as Buildcraft Wrench too")); + aList.add(I18n.format("item.GT_Wrech.tooltip_bc")); } } \ No newline at end of file diff --git a/src/main/java/gregtechmod/api/items/GT_WrenchIC_Item.java b/src/main/java/gregtechmod/api/items/GT_WrenchIC_Item.java index 2902771..cdf1b3e 100644 --- a/src/main/java/gregtechmod/api/items/GT_WrenchIC_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_WrenchIC_Item.java @@ -3,7 +3,7 @@ package gregtechmod.api.items; import ic2.api.item.IElectricItem; public class GT_WrenchIC_Item extends GT_Wrench_Item implements IElectricItem { - public GT_WrenchIC_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { - super(aID, aName, aMaxDamage, aEntityDamage, aDischargedGTID); + public GT_WrenchIC_Item(String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { + super(aName, aMaxDamage, aEntityDamage, aDischargedGTID); } } \ No newline at end of file diff --git a/src/main/java/gregtechmod/api/items/GT_Wrench_Item.java b/src/main/java/gregtechmod/api/items/GT_Wrench_Item.java index 1c2d414..9b092bf 100644 --- a/src/main/java/gregtechmod/api/items/GT_Wrench_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Wrench_Item.java @@ -2,7 +2,6 @@ package gregtechmod.api.items; import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.GT_ToolDictNames; -import gregtechmod.api.util.GT_LanguageManager; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; @@ -10,18 +9,19 @@ import gregtechmod.api.util.GT_Utility; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; public class GT_Wrench_Item extends GT_Tool_Item { - public GT_Wrench_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { - super(aID, aName, "To dismantle and rotate Blocks of most Mods", aMaxDamage, aEntityDamage, -1, aDischargedGTID); + public GT_Wrench_Item(String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) { + super(aName, "item.GT_Wrech.tooltip", aMaxDamage, aEntityDamage, -1, aDischargedGTID); GregTech_API.registerWrench(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolWrench, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE)); addToEffectiveList(EntityIronGolem.class.getName()); @@ -45,9 +45,10 @@ public class GT_Wrench_Item extends GT_Tool_Item { setUsageAmounts(8, 3, 1); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addAdditionalToolTips(List aList, ItemStack aStack) { - aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Rotation of target depends on where exactly you click")); + aList.add(I18n.format("item.GT_Wrech.tooltip_1")); } @Override @@ -56,10 +57,10 @@ public class GT_Wrench_Item extends GT_Tool_Item { if (aWorld.isRemote) { return false; } - Block aBlock = Block.blocksList[aWorld.getBlockId(aX, aY, aZ)]; + Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) return false; byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ), aTargetSide = GT_Utility.determineWrenchingSide((byte)aSide, hitX, hitY, hitZ); - TileEntity aTileEntity = aWorld.getBlockTileEntity(aX, aY, aZ); + TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); try { if (aTileEntity != null && aTileEntity instanceof ic2.api.tile.IWrenchable) { @@ -74,7 +75,7 @@ public class GT_Wrench_Item extends GT_Tool_Item { int tDamage = (((ic2.api.tile.IWrenchable)aTileEntity).getWrenchDropRate() < 1.0F ? 10 : 3); if (GT_ModHandler.damageOrDechargeItem(aStack, tDamage, tDamage*1000, aPlayer)) { ItemStack tOutput = ((ic2.api.tile.IWrenchable)aTileEntity).getWrenchDrop(aPlayer); - for (ItemStack tStack : aBlock.getBlockDropped(aWorld, aX, aY, aZ, aMeta, 0)) { + for (ItemStack tStack : aBlock.getDrops(aWorld, aX, aY, aZ, aMeta, 0)) { if (tOutput == null) { aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX+0.5, aY+0.5, aZ+0.5, tStack)); } else { @@ -91,20 +92,20 @@ public class GT_Wrench_Item extends GT_Tool_Item { } } catch(Throwable e) {} - try { - if (aTileEntity instanceof universalelectricity.prefab.tile.IRotatable) { - if (((universalelectricity.prefab.tile.IRotatable)aTileEntity).getDirection().ordinal() != aTargetSide) { - if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - ((universalelectricity.prefab.tile.IRotatable)aTileEntity).setDirection(ForgeDirection.getOrientation(aTargetSide)); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); - } - return true; - } - return true; - } - } catch(Throwable e) {} +// try { +// if (aTileEntity instanceof universalelectricity.prefab.tile.IRotatable) { +// if (((universalelectricity.prefab.tile.IRotatable)aTileEntity).getDirection().ordinal() != aTargetSide) { +// if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { +// ((universalelectricity.prefab.tile.IRotatable)aTileEntity).setDirection(ForgeDirection.getOrientation(aTargetSide)); +// GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); +// } +// return true; +// } +// return true; +// } +// } catch(Throwable e) {} - if (aBlock == Block.wood || aBlock == Block.hay) { + if (aBlock == Blocks.log || aBlock == Blocks.hay_block) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); @@ -112,7 +113,7 @@ public class GT_Wrench_Item extends GT_Tool_Item { return true; } - if (aBlock == Block.redstoneRepeaterIdle || aBlock == Block.redstoneRepeaterActive) { + if (aBlock == Blocks.unpowered_repeater || aBlock == Blocks.powered_repeater) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta / 4) * 4 + (((aMeta%4) + 1) % 4), 3); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); @@ -120,7 +121,7 @@ public class GT_Wrench_Item extends GT_Tool_Item { return true; } - if (aBlock == Block.redstoneComparatorIdle || aBlock == Block.redstoneComparatorActive) { + if (aBlock == Blocks.unpowered_comparator || aBlock == Blocks.powered_comparator) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta / 4) * 4 + (((aMeta%4) + 1) % 4), 3); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); @@ -128,7 +129,7 @@ public class GT_Wrench_Item extends GT_Tool_Item { return true; } - if (aBlock == Block.workbench || aBlock == Block.bookShelf) { + if (aBlock == Blocks.crafting_table || aBlock == Blocks.bookshelf) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX+0.5, aY+0.5, aZ+0.5, new ItemStack(aBlock, 1, aMeta))); aWorld.setBlockToAir(aX, aY, aZ); @@ -138,7 +139,7 @@ public class GT_Wrench_Item extends GT_Tool_Item { } if (aMeta == aTargetSide) { - if (aBlock == Block.pistonBase || aBlock == Block.pistonStickyBase || aBlock == Block.dispenser || aBlock == Block.dropper || aBlock == Block.furnaceIdle || aBlock == Block.furnaceBurning || aBlock == Block.chest || aBlock == Block.chestTrapped || aBlock == Block.hopperBlock) { + if (aBlock == Blocks.piston || aBlock == Blocks.sticky_piston || aBlock == Blocks.dispenser || aBlock == Blocks.dropper || aBlock == Blocks.furnace || aBlock == Blocks.lit_furnace || aBlock == Blocks.chest || aBlock == Blocks.trapped_chest || aBlock == Blocks.hopper) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX+0.5, aY+0.5, aZ+0.5, new ItemStack(aBlock, 1, 0))); aWorld.setBlockToAir(aX, aY, aZ); @@ -147,21 +148,21 @@ public class GT_Wrench_Item extends GT_Tool_Item { return true; } } else { - if (aBlock == Block.pistonBase || aBlock == Block.pistonStickyBase || aBlock == Block.dispenser || aBlock == Block.dropper) { + if (aBlock == Blocks.piston || aBlock == Blocks.sticky_piston || aBlock == Blocks.dispenser || aBlock == Blocks.dropper) { if (aMeta < 6 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); } return true; } - if (aBlock == Block.pumpkin || aBlock == Block.pumpkinLantern || aBlock == Block.furnaceIdle || aBlock == Block.furnaceBurning || aBlock == Block.chest || aBlock == Block.chestTrapped) { + if (aBlock == Blocks.pumpkin || aBlock == Blocks.lit_pumpkin || aBlock == Blocks.furnace || aBlock == Blocks.lit_furnace || aBlock == Blocks.chest || aBlock == Blocks.trapped_chest) { if (aTargetSide > 1 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); } return true; } - if (aBlock == Block.hopperBlock) { + if (aBlock == Blocks.hopper) { if (aTargetSide != 1 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(100), 1.0F, -1, aX, aY, aZ); diff --git a/src/main/java/gregtechmod/api/util/GT_Utility.java b/src/main/java/gregtechmod/api/util/GT_Utility.java index 0441a52..444b65d 100644 --- a/src/main/java/gregtechmod/api/util/GT_Utility.java +++ b/src/main/java/gregtechmod/api/util/GT_Utility.java @@ -51,6 +51,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; @@ -302,6 +303,12 @@ public class GT_Utility { } } + public static void sendTrChatToPlayer(EntityPlayer aPlayer, String pattern, Object...format) { + if (aPlayer != null && aPlayer instanceof EntityPlayerMP && pattern != null) { + aPlayer.addChatMessage(new ChatComponentTranslation(pattern, format)); + } + } + /** * Moves Stack from Inv-Slot to Inv-Slot, without checking if its even allowed. * @return the Amount of moved Items diff --git a/src/main/java/gregtechmod/common/items/GT_Debug_Item.java b/src/main/java/gregtechmod/common/items/GT_Debug_Item.java index 83f3c78..0eef9bb 100644 --- a/src/main/java/gregtechmod/common/items/GT_Debug_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_Debug_Item.java @@ -35,7 +35,7 @@ public class GT_Debug_Item extends GT_Generic_Item implements IElectricItem { @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) public void getSubItems(int var1, CreativeTabs var2, @SuppressWarnings("rawtypes") List var3) { - ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage()); + ItemStack tCharged = new ItemStack(this, 1); GT_ModHandler.chargeElectricItem(tCharged, 1000000000, Integer.MAX_VALUE, true, false); var3.add(tCharged); for (ItemStack tStack : GregTech_API.sBookList.values()) { diff --git a/src/main/java/gregtechmod/common/items/GT_MetaBlock_Item.java b/src/main/java/gregtechmod/common/items/GT_MetaBlock_Item.java index 611ee2c..1e6660a 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaBlock_Item.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaBlock_Item.java @@ -16,7 +16,7 @@ public class GT_MetaBlock_Item extends ItemBlock { super(par1); setMaxDamage(0); setHasSubtypes(true); - setUnlocalizedName("GT_Block"); // FIXME not correct name + setUnlocalizedName("GT_Block"); setCreativeTab(GregTech_API.TAB_GREGTECH); } diff --git a/src/main/resources/assets/gregtech_addon/lang/en_US.lang b/src/main/resources/assets/gregtech_addon/lang/en_US.lang index 8089a62..c3a61c4 100644 --- a/src/main/resources/assets/gregtech_addon/lang/en_US.lang +++ b/src/main/resources/assets/gregtech_addon/lang/en_US.lang @@ -84,6 +84,7 @@ item.360k_Helium_Coolantcell.name=360k Helium Coolant Cell item.360k_NaK_Coolantcell.name=360k NaK Coolantcell item.60k_Helium_Coolantcell.name=60k Helium Coolant Cell item.60k_NaK_Coolantcell.name=60k NaK Coolantcell +item.coolant.stored.tooltip=Stored Heat: %s item.Bronze_Jack_Hammer.name=Bronze Jack Hammer item.Cloaking_Device.name=Cloaking Device item.Dataorb.name=Data Orb @@ -98,6 +99,9 @@ item.Empty_Advanced_Wrench.name=Empty Advanced Wrench item.Empty_Electric_Saw.name=Empty Electric Saw item.Empty_Electric_Wrench.name=Empty Electric Wrench item.Empty_Soldering_Tool.name=Empty Soldering Iron +item.Soldering_Iron.tooltip=To repair and construct Circuitry +item.Soldering_Iron.tooltip_1=Sets the Strength of outputted Redstone +item.Soldering_Iron.tooltip_2=Needs Soldering Metal in Inventory! item.Flint_Mortar.name=Flint Mortar item.Flint_Mortar.tooltip_main=Used to turn Ingots into Dust item.GT_Cells.0.name=Hydrogen Cell @@ -273,6 +277,8 @@ item.GT_Components.98.tooltip=A Steel Gear item.GT_Components.99.name=Titanium Gear item.GT_Components.99.tooltip=A Titanium Gear item.GT_Crowbar.name=Crowbar +item.GT_Crowbar.tooltip_main=To remove Covers from Machines +item.GT_Crowbar.tooltip_1=Can turn Rails item.GT_Crowbar.tooltip_rc=Works as Railcraft Crowbar too item.GT_DirtyDusts.0.name=Dirty Pile of Ender Pearl Dust item.GT_DirtyDusts.1.name=Dirty Pile of Ender Eye Dust @@ -347,6 +353,7 @@ item.GT_DirtyDusts.80.name=Dirty Pile of Thorium Dust item.GT_DirtyDusts.81.name=Dirty Pile of Plutonium Dust item.GT_DirtyDusts.9.name=Dirty Pile of Saltpeter Dust item.GT_Drill_Advanced.name=Advanced Drill +item.GT_Drill_Advanced.tooltip=For quickly making Holes item.GT_Dusts.0.name=Ender Pearl Dust item.GT_Dusts.1.name=Ender Eye Dust item.GT_Dusts.10.name=Endstone Dust @@ -441,6 +448,18 @@ item.GT_Hammer_Rubber.tooltip_2=Can rotate some Blocks as well item.GT_Hammer_Rubber.tooltip_4=Can switch Redstone Lamps and Booster Tracks item.GT_Hammer_Steel.name=Steel Hammer item.GT_Hammer_Tungstensteel.name=Tungstensteel Hammer +item.GT_Hammer.tooltip=To give a Machine a hard whack +item.GT_Hammer.tooltip_1=Used to craft Plates from Ingots +item.GT_Hammer.tooltip_2=Can rotate some Blocks as well +item.GT_Hammer.tooltip_3=Also used to toggle general Machine states +item.GT_Hammer.tooltip_4=Usable as Prospectors Hammer +item.GT_Hammer.tooltip_mfr=Works as Minefactory Hammer too +item.GT_Hammer.tip_1=There is Lava behind this Rock. +item.GT_Hammer.tip_2=There is a Liquid behind this Rock. +item.GT_Hammer.tip_3=There is an Air Pocket behind this Rock. +item.GT_Hammer.tip_4=Material is changing behind this Rock. +item.GT_Hammer.tip_5=Found traces of %s Ore. +item.GT_Hammer.tip_6=No Ores found. item.GT_Lava_Filter.name=Lava Filter item.GT_Lava_Filter.tooltip_main=Filters Lava in Thermal Boilers item.GT_Materials.0.name=Copper Credit @@ -652,6 +671,7 @@ item.GT_Saw_Advanced.name=Advanced Saw item.GT_Saw_Bronze.name=Bronze Saw item.GT_Saw_Bronze.tooltip_main=For sawing Logs into Planks item.GT_Saw_Electric.name=Electric Saw +item.GT_Saw_Electric.tooltip=For sawing Logs into Planks item.GT_Saw_Iron.name=Iron Saw item.GT_Saw_Iron.tooltip_main=For sawing Logs into Planks item.GT_Saw_Steel.name=Steel Saw @@ -880,6 +900,9 @@ item.GT_Wrench_Electric.name=Electric Wrench item.GT_Wrench_Iron.name=Iron Wrench item.GT_Wrench_Steel.name=Steel Wrench item.GT_Wrench_TungstenSteel.name=Tungstensteel Wrench +item.GT_Wrech.tooltip=To dismantle and rotate Blocks of most Mods +item.GT_Wrech.tooltip_1=Rotation of target depends on where exactly you click +item.GT_Wrech.tooltip_bc=Works as Buildcraft Wrench too item.GregTech_Sensorcard.name=GregTech Sensor Card item.GregTech_Sensorkit.name=GregTech Sensor Kit item.Iridium_Neutronreflector.name=Iridium Neutron Reflector @@ -901,9 +924,21 @@ item.Steel_Jack_Hammer.name=Steel Jack Hammer item.Teslastaff.name=Tesla Staff item.Thoriumcell.name=Thorium Cell item.Ultimate_Cheat_Armor.name=Ultimate Cheat Armor +item.armor.capability.tooltip_1=Rebreather +item.armor.capability.tooltip_2=Inertia Damper +item.armor.capability.tooltip_3=Food Replicator +item.armor.capability.tooltip_4=Medicine Module +item.armor.capability.tooltip_5=Lamp +item.armor.capability.tooltip_6=Solarpanel +item.armor.capability.tooltip_7=Extinguisher Module +item.armor.capability.tooltip_8=Jump Booster +item.armor.capability.tooltip_9=Speed Booster +item.armor.capability.tooltip_10=Invisibility Field +item.armor.capability.tooltip_11=Infinite Charge item.electric.tier.tooltip=Tier: %s item.bug.tooltip=Doesn't work as intended, this is a Bug +item.tool.discharged.tooltip=Empty. You need to recharge it. itemGroup.gregtech=GregTech Intergalactical block.deny_mobs_spawn.tooltip=Mobs can't spawn on this block