diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index 1fdd32cd..c9e2f5e6 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -18,6 +18,7 @@ import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; +import tconstruct.library.accessory.AccessoryCore; import tconstruct.library.armor.ArmorCore; import tconstruct.library.tools.*; import tconstruct.library.util.HarvestLevels; @@ -118,90 +119,62 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler void drawToolStats () { int offsetX = 239; + int descX = 186; if (logic.chest != null) { offsetX += 122; + descX += 122; } ItemStack stack = logic.getStackInSlot(0); if (stack.getItem() instanceof ToolCore) { ToolCore tool = (ToolCore) stack.getItem(); - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + NBTTagCompound tags = stack.getTagCompound().getCompoundTag(tool.getBaseTagName()); this.drawCenteredString(fontRendererObj, "\u00A7n" + tool.getLocalizedToolName(), offsetX, 8, 0xffffff); - drawModularToolStats(stack, tool, tags); + drawModularToolStats(stack, tool, tags, descX, 24); } - else if (stack.getItem() instanceof ArmorCore) + if(stack.getItem() instanceof ArmorCore) { ArmorCore armor = (ArmorCore) stack.getItem(); - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("TinkerArmor"); - this.drawCenteredString(fontRendererObj, "\u00A7n" + armor.getClass().getSimpleName(), offsetX, 8, 0xffffff); // todo: localize this + NBTTagCompound tags = stack.getTagCompound().getCompoundTag(armor.getBaseTagName()); + this.drawCenteredString(fontRendererObj, "\u00A7n" + stack.getDisplayName(), offsetX, 8, 0xffffff); // todo: localize - drawModularArmorStats(stack, armor, tags); + drawModularArmorStats(stack, armor, tags, descX, 24); + } + if(stack.getItem() instanceof AccessoryCore) + { + AccessoryCore accessory = (AccessoryCore) stack.getItem(); + NBTTagCompound tags = stack.getTagCompound().getCompoundTag(accessory.getBaseTagName()); + this.drawCenteredString(fontRendererObj, "\u00A7n" + stack.getDisplayName(), offsetX, 8, 0xffffff); // todo: localize + + drawModularAccessoryStats(stack, accessory, tags, descX, 24); } } - void drawModularArmorStats (ItemStack stack, ArmorCore tool, NBTTagCompound tags) - { - int offsetX = 178; - if (logic.chest != null) - { - offsetX += 122; - } - - int modifiers = tags.getInteger("Modifiers"); - int base = 24; - int offset = 0; - if (modifiers > 0) - { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), offsetX + 8, base + offset * 10, 0xffffff); - offset++; - } - boolean displayToolTips = true; - int tipNum = 0; - while (displayToolTips) - { - tipNum++; - String tooltip = "ModifierTip" + tipNum; - if (tags.hasKey(tooltip)) - { - String tipName = tags.getString(tooltip); - fontRendererObj.drawString("- " + tipName, offsetX + 8, base + (offset + tipNum) * 10, 0xffffff); - } - else - displayToolTips = false; - } - } - - void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) + protected void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags, int x, int y) { List categories = Arrays.asList(tool.getTraits()); final int durability = tags.getInteger("Damage"); final int maxDur = tags.getInteger("TotalDurability"); int availableDurability = maxDur - durability; - int offsetX = 178; - if (logic.chest != null) - { - offsetX += 122; - } - // Durability - int base = 24; + int base = y; int offset = 0; if (maxDur > 0) { if (maxDur >= 10000) { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation1"), offsetX + 8, base + offset * 11, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation1"), x, base + offset * 11, 0xffffff); offset++; - fontRendererObj.drawString("- " + availableDurability + "/" + maxDur, offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString("- " + availableDurability + "/" + maxDur, x, base + offset * 10, 0xffffff); offset++; } else { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, x, base + offset * 10, 0xffffff); offset++; } } @@ -219,9 +192,9 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, x, base + offset * 10, 0xffffff); else - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, x, base + offset * 10, 0xffffff); offset++; if (stoneboundDamage != 0) @@ -229,7 +202,7 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler DecimalFormat df = new DecimalFormat("##.##"); heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - this.fontRendererObj.drawString(bloss + df.format(stoneboundDamage / 2f) + heart, offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(bloss + df.format(stoneboundDamage / 2f) + heart, x, base + offset * 10, 0xffffff); offset++; } offset++; @@ -242,9 +215,9 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler int drawSpeed = tags.getInteger("DrawSpeed"); float flightSpeed = tags.getFloat("FlightSpeed"); float trueDraw = drawSpeed / 20f * flightSpeed; - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", x, base + offset * 10, 0xffffff); offset++; - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", x, base + offset * 10, 0xffffff); offset++; offset++; } @@ -258,26 +231,26 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler float shatter = tags.getFloat("BreakChance"); float accuracy = tags.getFloat("Accuracy"); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation10"), offsetX + 8, base + offset * 10, 0xffffff); + this.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) - this.fontRendererObj.drawString("- " + attack / 2 + heart, offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString("- " + attack / 2 + heart, x, base + offset * 10, 0xffffff); else - this.fontRendererObj.drawString("- " + attack / 2f + heart, offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString("- " + attack / 2f + heart, x, base + offset * 10, 0xffffff); offset++; int minAttack = attack; int maxAttack = attack * 2; heart = StatCollector.translateToLocal("gui.partcrafter9"); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation11"), offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation11"), x, base + offset * 10, 0xffffff); offset++; - this.fontRendererObj.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, x, base + offset * 10, 0xffffff); offset++; offset++; - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), x, base + offset * 10, 0xffffff); offset++; - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", offsetX + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", x, base + offset * 10, 0xffffff); offset++; /* * this.fontRendererObj.drawString("Chance to break: " + @@ -298,20 +271,20 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler float trueSpeed = mineSpeed + stoneboundSpeed; float trueSpeed2 = mineSpeed2 + stoneboundSpeed; - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation12"), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation12"), x, base + offset * 10, 0xffffff); offset++; - fontRendererObj.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), x, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), x, base + offset * 10, 0xffffff); offset++; } offset++; - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), x, base + offset * 10, 0xffffff); offset++; - fontRendererObj.drawString("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2")), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2")), x, base + offset * 10, 0xffffff); offset++; offset++; } @@ -325,15 +298,15 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler trueSpeed += stoneboundSpeed; if (trueSpeed < 0) trueSpeed = 0; - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), x, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0 && !Float.isNaN(stoneboundSpeed)) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), x, base + offset * 10, 0xffffff); offset++; } - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation15") + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation15") + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")), x, base + offset * 10, 0xffffff); offset++; offset++; } @@ -341,7 +314,7 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { float mineSpeed = tags.getInteger("MiningSpeed"); float trueSpeed = mineSpeed / (100f); - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, x, base + offset * 10, 0xffffff); offset++; offset++; } @@ -349,12 +322,12 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler int modifiers = tags.getInteger("Modifiers"); if (modifiers > 0) { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), x, base + offset * 10, 0xffffff); offset++; } if (tags.hasKey("Tooltip1")) { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation17"), offsetX + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation17"), x, base + offset * 10, 0xffffff); } boolean displayToolTips = true; @@ -366,7 +339,125 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); - fontRendererObj.drawString("- " + tipName, offsetX + 8, base + (offset + tipNum) * 10, 0xffffff); + fontRendererObj.drawString("- " + tipName, x, base + (offset + tipNum) * 10, 0xffffff); + } + else + displayToolTips = false; + } + } + + private static DecimalFormat df = new DecimalFormat("##.#"); + + // todo: do this properly, quick and dirty fix + protected void drawModularArmorStats (ItemStack stack, ArmorCore armor, NBTTagCompound tags, int x, int y) + { + List categories = Arrays.asList(armor.getTraits()); + int base = y; + int offset = 0; + + // durability + final int durability = tags.getInteger("Damage"); + final int maxDur = tags.getInteger("TotalDurability"); + int availableDurability = maxDur - durability; + + // Durability + if (maxDur > 0) + { + if (maxDur >= 10000) + { + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation1"), x, base + offset * 11, 0xffffff); + offset++; + fontRendererObj.drawString("- " + availableDurability + "/" + maxDur, x, base + offset * 10, 0xffffff); + offset++; + } + else + { + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, x, base + offset * 10, 0xffffff); + offset++; + } + } + // Damage reduction + double damageReduction = tags.getDouble("DamageReduction"); + if(damageReduction > 0.000001d) + { + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation19") + df.format(damageReduction), x, base + offset * 10, 0xffffff); + offset++; + } + + // Protection + double protection = armor.getProtection(stack); + double maxProtection = tags.getDouble("MaxDefense"); + //if(maxProtection > protection) + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation20") + df.format(protection) + "/" + df.format(maxProtection), 294, base + offset * 10, 0xffffff); + //else + // fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation20") + df.format(protection), x, base + offset * 10, 0xffffff); + offset++; + + offset++; + int modifiers = tags.getInteger("Modifiers"); + if (modifiers > 0) + { + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), x, base + offset * 10, 0xffffff); + offset++; + } + if (tags.hasKey("Tooltip1")) + { + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation17"), x, base + offset * 10, 0xffffff); + } + + boolean displayToolTips = true; + int tipNum = 0; + while (displayToolTips) + { + tipNum++; + String tooltip = "ModifierTip" + tipNum; + if (tags.hasKey(tooltip)) + { + String tipName = tags.getString(tooltip); + fontRendererObj.drawString("- " + tipName, x, base + (offset + tipNum) * 10, 0xffffff); + } + else + displayToolTips = false; + } + } + + // todo: also quick and dirty fix + protected void drawModularAccessoryStats (ItemStack stack, AccessoryCore accessory, NBTTagCompound tags, int x, int y) + { + List categories = Arrays.asList(accessory.getTraits()); + int base = y; + int offset = 0; + + if (categories.contains("utility")) + { + float mineSpeed = tags.getInteger("MiningSpeed"); + float trueSpeed = mineSpeed / (100f); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, x, base + offset * 10, 0xffffff); + offset++; + } + + offset++; + int modifiers = tags.getInteger("Modifiers"); + if (modifiers > 0) + { + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), x, base + offset * 10, 0xffffff); + offset++; + } + if (tags.hasKey("Tooltip1")) + { + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation17"), x, base + offset * 10, 0xffffff); + } + + boolean displayToolTips = true; + int tipNum = 0; + while (displayToolTips) + { + tipNum++; + String tooltip = "ModifierTip" + tipNum; + if (tags.hasKey(tooltip)) + { + String tipName = tags.getString(tooltip); + fontRendererObj.drawString("- " + tipName, x, base + (offset + tipNum) * 10, 0xffffff); } else displayToolTips = false; diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index f698d0f7..974c88e5 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -181,7 +181,7 @@ public class ToolStationGui extends GuiContainer { ArmorCore armor = (ArmorCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag(armor.getBaseTagName()); - this.drawCenteredString(fontRendererObj, "\u00A7n" + armor.getArmorName(), 349, 8, 0xffffff); // todo: localize + this.drawCenteredString(fontRendererObj, "\u00A7n" + stack.getDisplayName(), 349, 8, 0xffffff); // todo: localize drawModularArmorStats(stack, armor, tags, 294, 24); }