Buff redstone mod, refactor broad tools to match

Cherry-picked from 34a4c8c80f969cafd696b41d963c2a041347d4cd

Conflicts:
	src/main/java/tconstruct/common/TProxyCommon.java
	src/main/java/tconstruct/items/tools/Excavator.java
	src/main/java/tconstruct/items/tools/Hammer.java
	src/main/java/tconstruct/items/tools/LumberAxe.java
	src/main/java/tconstruct/library/tools/HarvestTool.java
	src/main/java/tconstruct/modifiers/tools/ModLapis.java
	src/main/java/tconstruct/modifiers/tools/ModRedstone.java
	src/main/java/tconstruct/tools/gui/ToolStationGui.java
This commit is contained in:
mDiyo authored and squeek committed 2014-08-28 01:27:39 -07:00
1 parent ae31c05f45
commit 5b56d5e392
8 files changed
+47 -168

No files matched your search

@@ -21,6 +21,7 @@ import org.lwjgl.opengl.GL11;
import tconstruct.TConstruct;
import tconstruct.library.client.TConstructClientRegistry;
import tconstruct.library.client.ToolGuiElement;
import tconstruct.library.tools.HarvestTool;
import tconstruct.library.tools.ToolCore;
import tconstruct.library.util.HarvestLevels;
import tconstruct.smeltery.inventory.ActiveContainer;
@@ -296,9 +297,9 @@ public class ToolStationGui extends GuiContainer
// Mining
if (categories.contains("dualharvest"))
{
float mineSpeed = tags.getInteger("MiningSpeed") / 100f;
float mineSpeed2 = tags.getInteger("MiningSpeed2") / 100f;
float stoneboundSpeed = (float) Math.log(durability / 72f + 1) * 2 * stonebound;
float mineSpeed = tags.getInteger("MiningSpeed") / 100f * ((HarvestTool) tool).breakSpeedModifier();
float mineSpeed2 = tags.getInteger("MiningSpeed2") / 100f * ((HarvestTool) tool).breakSpeedModifier();
float stoneboundSpeed = (float) Math.log(durability / ((HarvestTool) tool).stoneboundModifier() + 1) * 2 * stonebound;
DecimalFormat df = new DecimalFormat("##.##");
df.setRoundingMode(RoundingMode.DOWN);
float trueSpeed = mineSpeed + stoneboundSpeed;
@@ -344,9 +345,9 @@ public class ToolStationGui extends GuiContainer
heads++;
}
float trueSpeed = mineSpeed / (heads * 100f);
float trueSpeed = mineSpeed / (heads * 100f) * ((HarvestTool) tool).breakSpeedModifier();
float stoneboundSpeed = (float) Math.log(durability / 72f + 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;