diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 3e55d2e1..cb17f583 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -747,7 +747,7 @@ gui.toolstation6=Draw Speed: gui.toolstation7=Arrow Speed: gui.toolstation8=Weight: gui.toolstation9=Accuracy: -gui.toolstation10=Base Attack: +gui.toolstation10=Base Damage: gui.toolstation11=Shortbow Attack: gui.toolstation12=Mining Speeds: gui.toolstation13=Harvest Levels: @@ -756,8 +756,10 @@ gui.toolstation15=Mining Level: gui.toolstation16=Usage Speed: gui.toolstation17=Modifiers gui.toolstation18=Modifiers remaining: -gui.toolstation19=Damage Reduction: -gui.toolstation20=Protection: +gui.toolstation19=Damage Reduction: +gui.toolstation20=Protection: +gui.toolstation21=Ammo: +gui.toolstation22=Break Chance: gui.mining1=Stone gui.mining2=Iron diff --git a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java index ed69241f..4c4b8a20 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java @@ -88,7 +88,7 @@ public abstract class AmmoWeapon extends AmmoItem implements IAccuracy, IWindup @Override public String[] getTraits() { - return new String[] {"weapon", "throwing", "ammo", "windup"}; + return new String[] {"weapon", "projectile", "ammo", "windup"}; } @Override diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java index 864f62a1..9de56090 100644 --- a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java +++ b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java @@ -160,6 +160,6 @@ public abstract class BowBaseAmmo extends ProjectileWeapon { @Override public String[] getTraits() { - return new String[] {"weapon", "ranged", "bow", "windup"}; + return new String[] {"weapon", "bow", "windup"}; } } diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java index f8fd2a79..42b2ba1f 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java @@ -30,7 +30,7 @@ public final class ToolStationGuiHelper { private static final FontRenderer fontRendererObj = Minecraft.getMinecraft().fontRenderer; private static int xPos, yPos; - private static final DecimalFormat df = new DecimalFormat("##.#"); + private static final DecimalFormat df = new DecimalFormat("#.##"); private static void newline() { @@ -86,7 +86,7 @@ public final class ToolStationGuiHelper { if (categories.contains("weapon")) drawWeaponStats(tool, tags); // projectile weapon? - if (categories.contains("projectileweapon")) + if (categories.contains("bow")) drawProjectileWeaponStats(tags); // projectile? if (categories.contains("projectile")) @@ -133,7 +133,7 @@ public final class ToolStationGuiHelper { final int max = ammoItem.getAmmoCount(stack); final int current = ammoItem.getAmmoCount(stack); - write(String.format("%s: %d/%d", StatCollector.translateToLocal("gui.toolstation21"), current, max)); + write(StatCollector.translateToLocal("gui.toolstation21") + current + "/" + max); } private static void drawModifiers(NBTTagCompound tags) @@ -217,55 +217,29 @@ public final class ToolStationGuiHelper { private static void drawProjectileWeaponStats(NBTTagCompound tags) { - /* - DecimalFormat df = new DecimalFormat("##.##"); - df.setRoundingMode(RoundingMode.DOWN); - int drawSpeed = tags.getInteger("DrawSpeed"); - float flightSpeed = tags.getFloat("FlightSpeed"); - float trueDraw = drawSpeed / 20f; - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", x, base + offset * 10, 0xffffff); - offset++; - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", x, base + offset * 10, 0xffffff); - offset++; - offset++;*/ + // drawspeed + final int drawSpeed = tags.getInteger("DrawSpeed"); + final float trueDraw = drawSpeed / 20f; + write(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s"); + + // flightspeed + final int flightSpeed = tags.getInteger("FlightSpeed"); + write(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x"); } private static void drawProjectileStats(NBTTagCompound tags) - {/* - DecimalFormat df = new DecimalFormat("##.##"); - df.setRoundingMode(RoundingMode.DOWN); - int attack = (int) (tags.getInteger("Attack")); - float mass = tags.getFloat("Mass"); - float shatter = tags.getFloat("BreakChance"); - float accuracy = tags.getFloat("Accuracy"); + { + // weight + final float weight = tags.getFloat("Mass"); + write(StatCollector.translateToLocal("gui.toolstation8") + df.format(weight)); - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation10"), x, base + offset * 10, 0xffffff); - offset++; - String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - if (attack % 2 == 0) - fontRendererObj.drawString("- " + attack / 2 + heart, x, base + offset * 10, 0xffffff); - else - fontRendererObj.drawString("- " + attack / 2f + heart, x, base + offset * 10, 0xffffff); - offset++; - int minAttack = attack; - int maxAttack = attack * 2; - heart = StatCollector.translateToLocal("gui.partcrafter9"); - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation11"), x, base + offset * 10, 0xffffff); - offset++; - fontRendererObj.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, x, base + offset * 10, 0xffffff); - offset++; - offset++; + // accuracy + final float accuracy = tags.getFloat("Accuracy"); + write(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy) + "%"); - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), x, base + offset * 10, 0xffffff); - offset++; - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", x, base + offset * 10, 0xffffff); - offset++; - /* - * this.fontRendererObj.drawString("Chance to break: " + - * df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); - * offset++; - - offset++;*/ + // breakchance + final float breakChance = tags.getFloat("BreakChance"); + write(StatCollector.translateToLocal("gui.toolstation22") + df.format(breakChance) + "%"); } private static void drawArmorStats(ArmorCore armor, NBTTagCompound tags, ItemStack stack) diff --git a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java index 724fafc8..2c8293bc 100644 --- a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java @@ -91,7 +91,7 @@ public class ArrowAmmo extends AmmoItem { @Override public String[] getTraits () { - return new String[] { "ammo" }; + return new String[] { "ammo", "projectile" }; } @Override diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java index a13d927a..484f68cb 100644 --- a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java @@ -74,8 +74,9 @@ public class BoltAmmo extends AmmoItem { } @Override - public String[] getTraits() { - return new String[] {"ammo"}; + public String[] getTraits () + { + return new String[] { "ammo", "projectile" }; } @Override diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index b726d3fa..f40fd55d 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -414,7 +414,7 @@ public class Crossbow extends ProjectileWeapon { @Override public String[] getTraits() { - return new String[] {"weapon", "ranged", "crossbow", "windup"}; + return new String[] {"weapon", "bow", "windup"}; }