diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index 27760f2d..7ee43030 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -336,9 +336,16 @@ public class CraftingStationGui extends GuiContainer heads++; } - float trueSpeed = mineSpeed / (heads * 100f) * ((HarvestTool) tool).breakSpeedModifier(); + float trueSpeed = mineSpeed / (heads * 100f); + if(tool instanceof HarvestTool) + trueSpeed *= ((HarvestTool) tool).breakSpeedModifier(); + + + float localStonebound = 72f; + if (tool instanceof HarvestTool) + localStonebound = ((HarvestTool) tool).stoneboundModifier(); + float stoneboundSpeed = (float) Math.log(durability / localStonebound + 1) * 2 * stonebound; - float stoneboundSpeed = (float) Math.log(durability / ((HarvestTool) tool).stoneboundModifier() + 1) * 2 * stonebound; DecimalFormat df = new DecimalFormat("##.##"); df.setRoundingMode(RoundingMode.DOWN); trueSpeed += stoneboundSpeed; @@ -346,7 +353,7 @@ public class CraftingStationGui extends GuiContainer trueSpeed = 0; fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), offsetX + 8, base + offset * 10, 0xffffff); offset++; - if (stoneboundSpeed != 0) + 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); diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index 681c1998..b4367e0f 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -345,9 +345,16 @@ public class ToolStationGui extends GuiContainer heads++; } - float trueSpeed = mineSpeed / (heads * 100f) * ((HarvestTool) tool).breakSpeedModifier(); + float trueSpeed = mineSpeed / (heads * 100f); + if(tool instanceof HarvestTool) + trueSpeed *= ((HarvestTool) tool).breakSpeedModifier(); + + + float localStonebound = 72f; + if (tool instanceof HarvestTool) + localStonebound = ((HarvestTool) tool).stoneboundModifier(); + float stoneboundSpeed = (float) Math.log(durability / localStonebound + 1) * 2 * stonebound; - float stoneboundSpeed = (float) Math.log(durability / ((HarvestTool) tool).stoneboundModifier() + 1) * 2 * stonebound; DecimalFormat df = new DecimalFormat("##.##"); df.setRoundingMode(RoundingMode.DOWN); trueSpeed += stoneboundSpeed;