From 4e6a5d1ddafbf15629bb0f688558dfe7d280fa31 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Tue, 15 Apr 2014 21:54:13 +0200 Subject: [PATCH 01/25] Update en_US.lang --- resources/assets/tinker/lang/en_US.lang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 4a2d1063..ed041a51 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -736,6 +736,10 @@ gui.toolstation16=Usage Speed: gui.toolstation17=Modifiers gui.toolstation18=Modifiers remaining: +modifier. + + + creativeModLock.tooltip=Target Lock: -attribute.generic.ammo.attackDamage=Average Shot Damage \ No newline at end of file +attribute.generic.ammo.attackDamage=Average Shot Damage From a1bdf9f172376d6c90e36d0b6d1aa869d2d6d8fa Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Tue, 15 Apr 2014 22:16:47 +0200 Subject: [PATCH 02/25] Update AModDoubleJump.java --- .../tconstruct/modifiers/armor/AModDoubleJump.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/tconstruct/modifiers/armor/AModDoubleJump.java b/src/main/java/tconstruct/modifiers/armor/AModDoubleJump.java index 22c25cf4..18b4ed9c 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModDoubleJump.java +++ b/src/main/java/tconstruct/modifiers/armor/AModDoubleJump.java @@ -7,12 +7,13 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.armor.AModInteger; import tconstruct.library.armor.ArmorCore; import tconstruct.library.armor.EnumArmorPart; +import net.minecraft.util.StatCollector; public class AModDoubleJump extends AModInteger { public AModDoubleJump(ItemStack[] items) { - super(6, "Double-Jump", EnumSet.of(EnumArmorPart.SHOES), items, 5, 1, "\u00a7a", "Double-Jump"); + super(6, "Double-Jump", EnumSet.of(EnumArmorPart.SHOES), items, 5, 1, "\u00a7a", StatCollector.translateToLocal("modifier.armour.jump.double"); } @Override @@ -62,11 +63,11 @@ public class AModDoubleJump extends AModInteger protected String getProperName (String tooltip, String tag) { if (tag.contains("Double-Jump")) - return color + "Triple-Jump"; + return color + StatCollector.translateToLocal("modifier.armour.jump.triple"); if (tag.contains("Triple-Jump")) - return color + "Quadruple-Jump"; + return color + StatCollector.translateToLocal("modifier.armour.jump.quad"); - return color + "Double-Jump"; + return color + StatCollector.translateToLocal("modifier.armour.jump.double"); } -} \ No newline at end of file +} From a1bf308a6e81f9c84701aaf82eec077843459f04 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:11:24 +0200 Subject: [PATCH 03/25] Update ModAntiSpider.java --- src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java index a4038e33..2bdfb6e9 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java @@ -2,6 +2,7 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; public class ModAntiSpider extends ToolModTypeFilter { @@ -12,7 +13,7 @@ public class ModAntiSpider extends ToolModTypeFilter public ModAntiSpider(String type, int effect, ItemStack[] items, int[] values) { super(effect, "ModAntiSpider", items, values); - tooltipName = "\u00a72Bane of Arthropods"; + tooltipName = "\u00a72" + StatCollector.translateToLocal("modifier.tool.spider"); guiType = type; } From 01fe4b708cafb14f543c9c2508fd4ff1e7318090 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:13:59 +0200 Subject: [PATCH 04/25] Update ModAttack.java --- src/main/java/tconstruct/modifiers/tools/ModAttack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java index 82283a10..673d797f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAttack.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAttack.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; +import net.minecraft.util.StatCollector; public class ModAttack extends ToolModTypeFilter { @@ -16,7 +17,7 @@ public class ModAttack extends ToolModTypeFilter public ModAttack(String type, int effect, ItemStack[] items, int[] value) { super(effect, "ModAttack", items, value); - tooltipName = "\u00a7fSharpness"; + tooltipName = "\u00a7f" + StatCollector.translateToLocal("modifier.tool.quartz"); guiType = type; } From 04a854ac34831ed777c7d6805a02fd437fdc8538 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:15:51 +0200 Subject: [PATCH 05/25] Update ModBlaze.java --- src/main/java/tconstruct/modifiers/tools/ModBlaze.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index 0bd69134..4b7b6b19 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; +import net.minecraft.util.StatCollector; public class ModBlaze extends ToolModTypeFilter { @@ -15,7 +16,7 @@ public class ModBlaze extends ToolModTypeFilter public ModBlaze(int effect, ItemStack[] items, int[] values) { super(effect, "Blaze", items, values); - tooltipName = "\u00a76Fiery"; + tooltipName = "\u00a76" + StatCollector.translateToLocal("modifier.tool.blaze"); max = 25; } From e3bc06e5fa1c3eda1723252acf5e9dbf1e90bd0e Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:44:24 +0200 Subject: [PATCH 06/25] Update ModBlaze.java --- src/main/java/tconstruct/modifiers/tools/ModBlaze.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index 4b7b6b19..c1448cb7 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -88,7 +88,7 @@ public class ModBlaze extends ToolModTypeFilter { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; - String modName = "\u00a76Blaze (" + keys[0] + "/" + keys[1] + ")"; + String modName = "\u00a76" + StatCollector.translateToLocal("gui.modifier.blaze") (" + keys[0] + "/" + keys[1] + "); tags.setString(tip, modName); } From a14f47ebe018b3fedc80d3ea576eb7f18ab72100 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:47:22 +0200 Subject: [PATCH 07/25] Update ModButtertouch.java --- src/main/java/tconstruct/modifiers/tools/ModButtertouch.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index bb603fab..df64b070 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -11,13 +11,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import tconstruct.library.tools.ToolCore; +import net.minecraft.util.StatCollector; public class ModButtertouch extends ModBoolean { public ModButtertouch(ItemStack[] items, int effect) { - super(items, effect, "Silk Touch", "\u00a7e", "Silky"); + super(items, effect, StatCollector.translateToLocal("gui.modifier.silk"), "\u00a7e", StatCollector.translateToLocal("modifier.tool.silk")); } @Override From d2011475fbfe3911c5b402d602d44988a50dfdf3 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:49:41 +0200 Subject: [PATCH 08/25] Update ModFlux.java --- src/main/java/tconstruct/modifiers/tools/ModFlux.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index c51e0056..6cb00829 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; import cofh.api.energy.IEnergyContainerItem; +import net.minecraft.util.StatCollector; /* TE3 support */ @@ -16,7 +17,7 @@ public class ModFlux extends ModBoolean public ModFlux() { - super(new ItemStack[0], 9, "Flux", "\u00a7e", ""); + super(new ItemStack[0], 9, StatCollector.translateToLocal("mofifier.tool.flux"), "\u00a7e", ""); } @Override From 770af463ef98c2fdb383a7a462b815d571c51c3b Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:55:24 +0200 Subject: [PATCH 09/25] Update ModLapis.java --- src/main/java/tconstruct/modifiers/tools/ModLapis.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index cb5505f0..f854a738 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -12,6 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.Weapon; +import net.minecraft.util.StatCollector; public class ModLapis extends ToolModTypeFilter { @@ -21,7 +22,7 @@ public class ModLapis extends ToolModTypeFilter public ModLapis(int effect, ItemStack[] items, int[] values) { super(effect, "Lapis", items, values); - tooltipName = "\u00a79Luck"; + tooltipName = "\u00a79" + StatCollector.translateToLocal("modifier.tool.lapis"); } @Override @@ -55,7 +56,7 @@ public class ModLapis extends ToolModTypeFilter tags.setBoolean(key, true); String modName = "\u00a79Lapis (0/450)"; - int tooltipIndex = addToolTip(tool, "\u00a79Luck", modName); + int tooltipIndex = addToolTip(tool, "\u00a79" + StatCollector.translateToLocal("modifier.tool.lapis"), modName); int[] keyPair = new int[] { 0, tooltipIndex }; tags.setIntArray(key, keyPair); @@ -202,7 +203,7 @@ public class ModLapis extends ToolModTypeFilter { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[1]; - String modName = "\u00a79Lapis (" + keys[0] + "/" + max + ")"; + String modName = "\u00a79" + StatCollector.translateToLocal("gui.modifier.lapis") + (" + keys[0] + "/" + max + "); tags.setString(tip, modName); } From 7aa23ac405ea24c6c65d5914469d6c95267093e0 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:55:41 +0200 Subject: [PATCH 10/25] Update ModBlaze.java --- src/main/java/tconstruct/modifiers/tools/ModBlaze.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index c1448cb7..3b851bc2 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -88,7 +88,7 @@ public class ModBlaze extends ToolModTypeFilter { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; - String modName = "\u00a76" + StatCollector.translateToLocal("gui.modifier.blaze") (" + keys[0] + "/" + keys[1] + "); + String modName = "\u00a76" + StatCollector.translateToLocal("gui.modifier.blaze") + (" + keys[0] + "/" + keys[1] + "); tags.setString(tip, modName); } From cd2599d816e26a38e09e33308c5a50004f6b6594 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 15:59:53 +0200 Subject: [PATCH 11/25] Update ModPiston.java --- src/main/java/tconstruct/modifiers/tools/ModPiston.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java index e7a50311..daeeb22d 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; +import net.minecraft.util.StatCollector; public class ModPiston extends ToolModTypeFilter { @@ -15,7 +16,7 @@ public class ModPiston extends ToolModTypeFilter public ModPiston(int effect, ItemStack[] items, int[] values) { super(effect, "Piston", items, values); - tooltipName = "\u00a77Knockback"; + tooltipName = "\u00a77" + StatCollector.translateToLocal("modifier.tool.piston"); } @Override @@ -70,7 +71,7 @@ public class ModPiston extends ToolModTypeFilter int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - String modName = "\u00a74Knockback (" + increase + "/" + max + ")"; + String modName = "\u00a74" + StatCollector.translateToLocal("modifier.tool.piston") + (" + increase + "/" + max + "); int tooltipIndex = addToolTip(tool, tooltipName, modName); int[] keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); @@ -86,7 +87,7 @@ public class ModPiston extends ToolModTypeFilter { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; - String modName = "\u00a77Knockback (" + keys[0] + "/" + keys[1] + ")"; + String modName = "\u00a77" + StatCollector.translateToLocal("modifier.tool.piston") + (" + keys[0] + "/" + keys[1] + "); tags.setString(tip, modName); } From e9d602aa4deafeda85c986195c3c6d6a7e49d664 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 16:09:06 +0200 Subject: [PATCH 12/25] Update ModRedstone.java --- src/main/java/tconstruct/modifiers/tools/ModRedstone.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index 57b5bb75..ccc6f70f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; +import net.minecraft.util.StatCollector; public class ModRedstone extends ToolModTypeFilter { @@ -15,7 +16,7 @@ public class ModRedstone extends ToolModTypeFilter public ModRedstone(int effect, ItemStack[] items, int[] values) { super(effect, "Redstone", items, values); - tooltipName = "\u00a74Haste"; + tooltipName = "\u00a74" + StatCollector.translateToLocal("modifier.tool.redstone"); } @Override @@ -71,7 +72,7 @@ public class ModRedstone extends ToolModTypeFilter int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - String modName = "\u00a74Redstone (" + increase + "/" + max + ")"; + String modName = "\u00a74" + StatCollector.translateToLocal("modifier.tool.redstone") + (" + increase + "/" + max + "); int tooltipIndex = addToolTip(tool, tooltipName, modName); keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); @@ -106,7 +107,7 @@ public class ModRedstone extends ToolModTypeFilter { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; - String modName = "\u00a74Redstone (" + keys[0] + "/" + keys[1] + ")"; + String modName = "\u00a74" + StatCollector.translateToLocal("modifier.tool.redstone") + (" + keys[0] + "/" + keys[1] + "); tags.setString(tip, modName); } From cc414faf1d75a3816a15d9563a333311d26465c4 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 16:12:10 +0200 Subject: [PATCH 13/25] Update ModRedstone.java --- src/main/java/tconstruct/modifiers/tools/ModRedstone.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index ccc6f70f..867b166b 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -72,7 +72,7 @@ public class ModRedstone extends ToolModTypeFilter int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - String modName = "\u00a74" + StatCollector.translateToLocal("modifier.tool.redstone") + (" + increase + "/" + max + "); + String modName = "\u00a74" + StatCollector.translateToLocal("gui.modifier.redstone") + (" + increase + "/" + max + "); int tooltipIndex = addToolTip(tool, tooltipName, modName); keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); @@ -107,7 +107,7 @@ public class ModRedstone extends ToolModTypeFilter { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; - String modName = "\u00a74" + StatCollector.translateToLocal("modifier.tool.redstone") + (" + keys[0] + "/" + keys[1] + "); + String modName = "\u00a74" + StatCollector.translateToLocal("gui.modifier.redstone") + (" + keys[0] + "/" + keys[1] + "); tags.setString(tip, modName); } From 5e4d1d0ebe192208135df8121ac7d226d192b4bb Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 16:47:33 +0200 Subject: [PATCH 14/25] Update en_US.lang --- resources/assets/tinker/lang/en_US.lang | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index ed041a51..0e88b584 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -736,9 +736,23 @@ gui.toolstation16=Usage Speed: gui.toolstation17=Modifiers gui.toolstation18=Modifiers remaining: -modifier. - +gui.modifier.blaze=Blaze +gui.modifier.silk=Silk Touch +gui.modifier.lapis=Luck +gui.modifier.redstone=Redstone +modifier.armour.jump.double=Double-Jump +modifier.armour.jump.triple=Triple-Jump +modifier.armour.jump.quad=Quadruple-Jump +modifier.armour.protection= +modifier.tool.spider=Bane of Arthropods +modifier.tool.quartz=Sharpness +modifier.tool.blaze=Fiery +modifier.tool.silk=Silky +mofifier.tool.flux=Flux +modifier.tool.lapis=Luck +modifier.tool.piston=Knockback +modifier.tool.redstone=Haste creativeModLock.tooltip=Target Lock: From 8b296e06baef521fcbe8f4671edaa6faf9c0d54c Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 16:54:47 +0200 Subject: [PATCH 15/25] Update ModReinforced.java --- src/main/java/tconstruct/modifiers/tools/ModReinforced.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModReinforced.java b/src/main/java/tconstruct/modifiers/tools/ModReinforced.java index 331e5fdc..d463850d 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModReinforced.java +++ b/src/main/java/tconstruct/modifiers/tools/ModReinforced.java @@ -2,13 +2,14 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; public class ModReinforced extends ModInteger { public ModReinforced(ItemStack[] items, int effect, int increase) { - super(items, effect, "Reinforced", 1, "\u00a75", "Reinforced"); + super(items, effect, StatCollector.translateToLocal("modifier.tool.reinforced"), 1, "\u00a75", StatCollector.translateToLocal("modifier.tool.reinforced")); } @Override From 4b40a08d2ee56a11018567914a21757f9b9fc9c0 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 17:10:35 +0200 Subject: [PATCH 16/25] Update ModSmite.java --- src/main/java/tconstruct/modifiers/tools/ModSmite.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModSmite.java b/src/main/java/tconstruct/modifiers/tools/ModSmite.java index 2ad76919..63d9a220 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModSmite.java +++ b/src/main/java/tconstruct/modifiers/tools/ModSmite.java @@ -2,6 +2,7 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; public class ModSmite extends ToolModTypeFilter { @@ -12,7 +13,7 @@ public class ModSmite extends ToolModTypeFilter public ModSmite(String type, int effect, ItemStack[] items, int[] values) { super(effect, "ModSmite", items, values); - tooltipName = "\u00a7eSmite"; + tooltipName = "\u00a7e" + StatCollector.translateToLocal("modifier.tool.smite"); tagName = type; } From 0263c6de0e12b6cdb30c4f55b4b2e9ada7f55e6d Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 17:36:23 +0200 Subject: [PATCH 17/25] Update TRecipes.java --- src/main/java/tconstruct/common/TRecipes.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index 74418771..23571462 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -16,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -348,8 +349,8 @@ public class TRecipes ItemStack diamond = new ItemStack(Items.diamond); tb.registerToolMod(new ModRepair()); - tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); - tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); + tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, StatCollector.translateToLocal("gui.modifier.diamond"), "\u00a7b" + StatCollector.translateToLocal("modifier.tool.diamond"), "\u00a7b")); + tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, StatCollector.translateToLocal("gui.modifier.emerald"), "\u00a72" + StatCollector.translateToLocal("modifier.tool.emerald"), "\u00a72")); TRepo.modFlux = new ModFlux(); tb.registerToolMod(TRepo.modFlux); @@ -363,13 +364,13 @@ public class TRecipes TRepo.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 }); tb.registerToolMod(TRepo.modLapis); - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair")); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 6) }, 4, StatCollector.translateToLocal("gui.modifier.moss"), 3, "\u00a72", StatCollector.translateToLocal("modifier.tool.moss"))); ItemStack blazePowder = new ItemStack(Items.blaze_powder); tb.registerToolMod(new ModBlaze(7, new ItemStack[] { blazePowder }, new int[] { 1 })); - tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(TRepo.materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt")); - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal")); + tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(TRepo.materials, 1, 7) }, 6, StatCollector.translateToLocal("gui.modifier.lava"), "\u00a74", StatCollector.translateToLocal("modifier.tool.lava"))); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 8) }, 8, StatCollector.translateToLocal("gui.modifier.necro"), 1, "\u00a78", StatCollector.translateToLocal("modifier.tool.necro"))); - TRepo.modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }); + TRepo.modAttack = new ModAttack(StatCollector.translateToLocal("gui.modifier.quartz"), 11, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }); tb.registerToolMod(TRepo.modAttack); tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free")); @@ -383,13 +384,13 @@ public class TRecipes ItemStack piston = new ItemStack(Blocks.piston); tb.registerToolMod(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 })); - tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading")); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, StatCollector.translateToLocal("modifier.tool.beheading"), 1, "\u00a7d", StatCollector.translateToLocal("modifier.tool.beheading"))); ItemStack holySoil = new ItemStack(TRepo.craftedSoil, 1, 4); - tb.registerToolMod(new ModSmite("Smite", 14, new ItemStack[] { holySoil }, new int[] { 1 })); + tb.registerToolMod(new ModSmite(StatCollector.translateToLocal("modifier.tool.smite"), 14, new ItemStack[] { holySoil }, new int[] { 1 })); ItemStack spidereyeball = new ItemStack(Items.fermented_spider_eye); - tb.registerToolMod(new ModAntiSpider("Anti-Spider", 15, new ItemStack[] { spidereyeball }, new int[] { 1 })); + tb.registerToolMod(new ModAntiSpider(StatCollector.translateToLocal("gui.modifier.spider"), 15, new ItemStack[] { spidereyeball }, new int[] { 1 })); ItemStack obsidianPlate = new ItemStack(TRepo.largePlate, 1, 6); tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); From 0e4cbfc3b865471f32300a311a01d6c4e3da4eca Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 17:49:18 +0200 Subject: [PATCH 18/25] Update TContent.java --- src/main/java/tconstruct/common/TContent.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 7c885252..322e3411 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.stats.Achievement; +import net.minecraft.util.StatCollector; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.util.EnumHelper; @@ -745,24 +746,24 @@ public class TContent implements IFuelHandler void registerMaterials () { TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", ""); - TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", "Stonebound"); + TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", StatCollector.translateToLocal("materialtraits.stonebound")); TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", ""); TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", ""); - TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", "Jagged"); + TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", StatCollector.translateToLocal("materialtraits.jagged")); TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", ""); TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", ""); - TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", "Stonebound"); + TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound")); TConstructRegistry.addToolMaterial(8, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7a", ""); - TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", "Writable"); + TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", StatCollector.translateToLocal("materialtraits.writable")); TConstructRegistry.addToolMaterial(10, "Cobalt", 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", ""); - TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", "Stonebound"); + TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound")); TConstructRegistry.addToolMaterial(12, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", ""); TConstructRegistry.addToolMaterial(13, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", ""); TConstructRegistry.addToolMaterial(14, "Bronze", 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", ""); TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); - TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", "Tasty"); + TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", StatCollector.translateToLocal("materialtraits.tasty"); TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); // Wood TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); // Stone From 857b6c8997e576953bc1107dea3a90ca6b93b008 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 17:49:56 +0200 Subject: [PATCH 19/25] Update TContent.java --- src/main/java/tconstruct/common/TContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 322e3411..b42bd6bb 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -763,7 +763,7 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); - TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", StatCollector.translateToLocal("materialtraits.tasty"); + TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", StatCollector.translateToLocal("materialtraits.tasty")); TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); // Wood TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); // Stone From 53e2c5aadfa93d4d2830071a1aecc0a4c2e9c2c7 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 17:51:59 +0200 Subject: [PATCH 20/25] Thaumic tool trait --- src/main/java/tconstruct/common/TRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index 23571462..fbfec65a 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -1451,7 +1451,7 @@ public class TRecipes TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); TRepo.thaumcraftAvailable = true; TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); - TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", "Thaumic"); + TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", StatCollector.translateToLocal("materialtraits.thaumic")); PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(TRepo.toolShard, 1, 31), new ItemStack(TRepo.toolRod, 1, 31), 31); for (int meta = 0; meta < TRepo.patternOutputs.length; meta++) { From a8b13ecb400e0cd9da2842cb962bcbd655a0cf8c Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 17:56:42 +0200 Subject: [PATCH 21/25] Random streamer localization --- src/main/java/tconstruct/items/tools/Arrow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 619cda3b..b3bc653b 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -124,7 +124,7 @@ public class Arrow extends ToolCore extra = getExtraItem(); extraStack = extra != null ? new ItemStack(extra, 1, 0) : null; tool = ToolBuilder.instance - .buildTool(new ItemStack(getHeadItem(), 1, random.nextInt(18)), new ItemStack(getHandleItem(), 1, random.nextInt(18)), accessoryStack, extraStack, "Random Streamer"); + .buildTool(new ItemStack(getHeadItem(), 1, random.nextInt(18)), new ItemStack(getHandleItem(), 1, random.nextInt(18)), accessoryStack, extraStack, StatCollector.translateToLocal("item.tool.randomarrow")); if (tool == null) { From 41679e4515b6dcd10f5a20bdb951391e9c5d26fe Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 18:02:27 +0200 Subject: [PATCH 22/25] Update SmelteryGui.java --- .../java/tconstruct/client/gui/SmelteryGui.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java index b9142898..1064ff1a 100644 --- a/src/main/java/tconstruct/client/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/SmelteryGui.java @@ -278,7 +278,7 @@ public class SmelteryGui extends NewContainerGui ArrayList list = new ArrayList(); if (liquid.fluidID == -37) { - list.add("\u00A7f" + StatCollector.translateToLocal("gui.smeltery1")); + list.add("\u00A7f" + StatCollector.translateToLocal("gui.smeltery.fuel")); list.add("mB: " + liquid.amount); } else @@ -287,16 +287,16 @@ public class SmelteryGui extends NewContainerGui list.add("\u00A7f" + name); if (name.equals("Liquified Emerald")) { - list.add("Emeralds: " + liquid.amount / 640f); + list.add(StatCollector.translateToLocal("gui.smeltery.emerald") + liquid.amount / 640f); } else if (name.equals("Molten Glass")) { int blocks = liquid.amount / 1000; if (blocks > 0) - list.add("Blocks: " + blocks); + list.add(StatCollector.translateToLocal("gui.smeltery.glass.block") + blocks); int panels = (liquid.amount % 1000) / 250; if (panels > 0) - list.add("Panels: " + panels); + list.add(StatCollector.translateToLocal("gui.smeltery.glass.pannel") + panels); int mB = (liquid.amount % 1000) % 250; if (mB > 0) list.add("mB: " + mB); @@ -305,14 +305,14 @@ public class SmelteryGui extends NewContainerGui { int ingots = liquid.amount / TConstruct.ingotLiquidValue; if (ingots > 0) - list.add("Ingots: " + ingots); + list.add(StatCollector.translateToLocal("gui.smeltery.metal.ingot") + ingots); int mB = liquid.amount % TConstruct.ingotLiquidValue; if (mB > 0) { int nuggets = mB / TConstruct.nuggetLiquidValue; int junk = (mB % TConstruct.nuggetLiquidValue); if (nuggets > 0) - list.add("Nuggets: " + nuggets); + list.add(StatCollector.translateToLocal("gui.smeltery.metal.nugget") + nuggets); if (junk > 0) list.add("mB: " + junk); } @@ -321,7 +321,7 @@ public class SmelteryGui extends NewContainerGui { int ingots = liquid.amount / TConstruct.ingotLiquidValue; if (ingots > 0) - list.add("Blocks: " + ingots); + list.add(StatCollector.translateToLocal("gui.smeltery.glass.block") + ingots); int mB = liquid.amount % TConstruct.ingotLiquidValue; if (mB > 0) list.add("mB: " + mB); From 60ceb034d3a3540a93d80ba90df5ade907dcab1c Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 18:25:32 +0200 Subject: [PATCH 23/25] Update TRecipes.java --- src/main/java/tconstruct/common/TRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index fbfec65a..4b0e9101 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -1452,7 +1452,7 @@ public class TRecipes TRepo.thaumcraftAvailable = true; TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", StatCollector.translateToLocal("materialtraits.thaumic")); - PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(TRepo.toolShard, 1, 31), new ItemStack(TRepo.toolRod, 1, 31), 31); + PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, StatCollector.translateToLocal("gui.partbuilder.material.thaumium"), new ItemStack(TRepo.toolShard, 1, 31), new ItemStack(TRepo.toolRod, 1, 31), 31); for (int meta = 0; meta < TRepo.patternOutputs.length; meta++) { if (TRepo.patternOutputs[meta] != null) From 19cbd3bffb7bbe65661a7c8a553dd68425ecc057 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 18:38:42 +0200 Subject: [PATCH 24/25] Update TContent.java --- src/main/java/tconstruct/common/TContent.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index b42bd6bb..31bd847a 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -816,55 +816,55 @@ public class TContent implements IFuelHandler PatternBuilder pb = PatternBuilder.instance; if (PHConstruct.enableTWood) - pb.registerFullMaterial(Blocks.planks, 2, "Wood", new ItemStack(Items.stick), new ItemStack(Items.stick), 0); + pb.registerFullMaterial(Blocks.planks, 2, StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick), new ItemStack(Items.stick), 0); else - pb.registerMaterialSet("Wood", new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0); if (PHConstruct.enableTStone) { - pb.registerFullMaterial(Blocks.stone, 2, "Stone", new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 1); - pb.registerMaterial(Blocks.cobblestone, 2, "Stone"); + pb.registerFullMaterial(Blocks.stone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 1); + pb.registerMaterial(Blocks.cobblestone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone")); } else - pb.registerMaterialSet("Stone", new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 0); - pb.registerFullMaterial(Items.iron_ingot, 2, "Iron", new ItemStack(TRepo.toolShard, 1, 2), new ItemStack(TRepo.toolRod, 1, 2), 2); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 0); + pb.registerFullMaterial(Items.iron_ingot, 2, StatCollector.translateToLocal("gui.partbuilder.material.iron"), new ItemStack(TRepo.toolShard, 1, 2), new ItemStack(TRepo.toolRod, 1, 2), 2); if (PHConstruct.enableTFlint) - pb.registerFullMaterial(Items.flint, 2, "Flint", new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); + pb.registerFullMaterial(Items.flint, 2, StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); else - pb.registerMaterialSet("Flint", new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3); if (PHConstruct.enableTCactus) - pb.registerFullMaterial(Blocks.cactus, 2, "Cactus", new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); + pb.registerFullMaterial(Blocks.cactus, 2, StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); else - pb.registerMaterialSet("Cactus", new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4); if (PHConstruct.enableTBone) - pb.registerFullMaterial(Items.bone, 2, "Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); + pb.registerFullMaterial(Items.bone, 2, StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); else - pb.registerMaterialSet("Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); - pb.registerFullMaterial(Blocks.obsidian, 2, "Obsidian", new ItemStack(TRepo.toolShard, 1, 6), new ItemStack(TRepo.toolRod, 1, 6), 6); - pb.registerMaterial(new ItemStack(TRepo.materials, 1, 18), 2, "Obsidian"); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); + pb.registerFullMaterial(Blocks.obsidian, 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian"), new ItemStack(TRepo.toolShard, 1, 6), new ItemStack(TRepo.toolRod, 1, 6), 6); + pb.registerMaterial(new ItemStack(TRepo.materials, 1, 18), 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian")); if (PHConstruct.enableTNetherrack) - pb.registerFullMaterial(Blocks.netherrack, 2, "Netherrack", new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); + pb.registerFullMaterial(Blocks.netherrack, 2, StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); else - pb.registerMaterialSet("Netherrack", new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7); if (PHConstruct.enableTSlime) - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 1), 2, "Slime", new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 8), 8); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 1), 2, StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 8), 8); else - pb.registerMaterialSet("Slime", new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 17), 8); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 17), 8); if (PHConstruct.enableTPaper) - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 0), 2, "Paper", new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 0), 2, StatCollector.translateToLocal("gui.partbuilder.material.paper"), new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); else - pb.registerMaterialSet("BlueSlime", new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); - pb.registerMaterialSet("Cobalt", new ItemStack(TRepo.toolShard, 1, 10), new ItemStack(TRepo.toolRod, 1, 10), 10); - pb.registerMaterialSet("Ardite", new ItemStack(TRepo.toolShard, 1, 11), new ItemStack(TRepo.toolRod, 1, 11), 11); - pb.registerMaterialSet("Manyullyn", new ItemStack(TRepo.toolShard, 1, 12), new ItemStack(TRepo.toolRod, 1, 12), 12); - pb.registerMaterialSet("Copper", new ItemStack(TRepo.toolShard, 1, 13), new ItemStack(TRepo.toolRod, 1, 13), 13); - pb.registerMaterialSet("Bronze", new ItemStack(TRepo.toolShard, 1, 14), new ItemStack(TRepo.toolRod, 1, 14), 14); - pb.registerMaterialSet("Alumite", new ItemStack(TRepo.toolShard, 1, 15), new ItemStack(TRepo.toolRod, 1, 15), 15); - pb.registerMaterialSet("Steel", new ItemStack(TRepo.toolShard, 1, 16), new ItemStack(TRepo.toolRod, 1, 16), 16); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cobalt"), new ItemStack(TRepo.toolShard, 1, 10), new ItemStack(TRepo.toolRod, 1, 10), 10); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.ardite"), new ItemStack(TRepo.toolShard, 1, 11), new ItemStack(TRepo.toolRod, 1, 11), 11); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.manyullyn"), new ItemStack(TRepo.toolShard, 1, 12), new ItemStack(TRepo.toolRod, 1, 12), 12); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.copper"), new ItemStack(TRepo.toolShard, 1, 13), new ItemStack(TRepo.toolRod, 1, 13), 13); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bronze"), new ItemStack(TRepo.toolShard, 1, 14), new ItemStack(TRepo.toolRod, 1, 14), 14); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.alumite"), new ItemStack(TRepo.toolShard, 1, 15), new ItemStack(TRepo.toolRod, 1, 15), 15); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.steel"), new ItemStack(TRepo.toolShard, 1, 16), new ItemStack(TRepo.toolRod, 1, 16), 16); if (PHConstruct.enableTBlueSlime) - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 17), 2, "BlueSlime", new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 17), 2, StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); else - pb.registerMaterialSet("BlueSlime", new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); - pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 34), 2, "PigIron", new ItemStack(TRepo.toolShard, 1, 18), new ItemStack(TRepo.toolRod, 1, 18), 18); + pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17); + pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 34), 2, StatCollector.translateToLocal("gui.partbuilder.material.pigiron"), new ItemStack(TRepo.toolShard, 1, 18), new ItemStack(TRepo.toolRod, 1, 18), 18); pb.addToolPattern((IPattern) TRepo.woodPattern); } From 263dd2cb7a04636a17d7942b89c661b2d614e7c0 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 16 Apr 2014 18:54:58 +0200 Subject: [PATCH 25/25] Update en_US.lang --- resources/assets/tinker/lang/en_US.lang | 52 ++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 0e88b584..0383ebf3 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -160,6 +160,8 @@ item.InfiTool.Arrow.name=Arrow item.InfiTool.PotionLauncher.name=Potion Launcher item.InfiTool.Mattock.name=Mattock +item.tool.randomarrow=Random Streamer + item.tconstruct.Pattern.blank_pattern.name=Blank Pattern item.tconstruct.Pattern.rod.name=Tool Rod Pattern item.tconstruct.Pattern.pickaxe.name=Pickaxe Head Pattern @@ -695,7 +697,12 @@ smeltery.drain.tooltip2=fluids in the Smeltery smeltery.brick.tooltip1=Smeltery structure block smeltery.brick.tooltip2=(Safe for decoration) -gui.smeltery1=Fuel +gui.smeltery.fuel=Fuel +gui.smeltery.emerald=Emeralds: +gui.smeltery.glass.block=Blocks: +gui.smeltery.glass.pannel=Pannels: +gui.smeltery.metal.ingot=Ingots: +gui.smeltery.metal.nugget=Nuggets: gui.landmine=Landmine gui.partcrafter1=Tool Part Crafting gui.partcrafter2=Tool Part Building @@ -736,10 +743,38 @@ gui.toolstation16=Usage Speed: gui.toolstation17=Modifiers gui.toolstation18=Modifiers remaining: +gui.partbuilder.material.wood=Wood +gui.partbuilder.material.stone=Stone +gui.partbuilder.material.iron=Iron +gui.partbuilder.material.flint=Flint +gui.partbuilder.material.cactus=Cactus +gui.partbuilder.material.bone=Bone +gui.partbuilder.material.obsidian=Obsidian +gui.partbuilder.material.netherrack=Netherrack +gui.partbuilder.material.slime=Slime +gui.partbuilder.material.paper=Paper +gui.partbuilder.material.blueslime=BlueSlime +gui.partbuilder.material.cobalt=Cobalt +gui.partbuilder.material.ardite=Ardite +gui.partbuilder.material.manyullyn=Manyullyn +gui.partbuilder.material.copper=Copper +gui.partbuilder.material.bronze=Bronze +gui.partbuilder.material.alumite=Alumite +gui.partbuilder.material.steel=Steel +gui.partbuilder.material.pigiron=Pigiron +gui.partbuilder.material.thaumium=Thaumium + gui.modifier.blaze=Blaze gui.modifier.silk=Silk Touch gui.modifier.lapis=Luck gui.modifier.redstone=Redstone +gui.modifier.diamond=Diamond +gui.modifier.emerald=Emerald +gui.modifier.moss=Moss +gui.modifier.lava=Lava +gui.modifier.necro=Necrotic +gui.modifier.spider=Anti-Spider +gui.modifier.quartz=Quartz modifier.armour.jump.double=Double-Jump modifier.armour.jump.triple=Triple-Jump @@ -753,6 +788,21 @@ mofifier.tool.flux=Flux modifier.tool.lapis=Luck modifier.tool.piston=Knockback modifier.tool.redstone=Haste +modifier.tool.reinforced=Reinforced +modifier.tool.unbreaking= +modifier.tool.smite=Smite +modifier.tool.diamond=Durability +500 +modifier.tool.emerald=Durability +50% +modifier.tool.moss=Auto-Repair +modifier.tool.lava=Auto-Smelt +modifier.tool.necro=Life Steal +modifier.tool.beheading=Beheading + +materialtraits.stonebound=Stonebound +materialtraits.jagged=Jagged +materialtraits.writable=Writable +materialtraits.tasty=Tasty +materialtraits.thaumic=Thaumic creativeModLock.tooltip=Target Lock: