From 5b56d5e3921c33dd83ca3cf60a0e01dbe1b26b6e Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 14 Apr 2014 20:08:09 -0800 Subject: [PATCH] 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 --- .../tconstruct/items/tools/Excavator.java | 52 ++------------ .../java/tconstruct/items/tools/Hammer.java | 68 ++----------------- .../tconstruct/items/tools/LumberAxe.java | 52 ++------------ .../tconstruct/library/tools/HarvestTool.java | 14 +++- .../modifiers/tools/ModRedstone.java | 1 + .../tconstruct/modifiers/tools/ModRepair.java | 6 +- .../tools/gui/CraftingStationGui.java | 11 +-- .../tconstruct/tools/gui/ToolStationGui.java | 11 +-- 8 files changed, 47 insertions(+), 168 deletions(-) diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 6f531e92..b588afbb 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -239,53 +239,15 @@ public class Excavator extends HarvestTool } @Override - public float getDigSpeed (ItemStack stack, Block block, int meta) + public float breakSpeedModifier () { - if (!stack.hasTagCompound()) - return 1.0f; + return 0.4f; + } - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return 0.1f; - - Material[] materials = getEffectiveMaterials(); - for (int i = 0; i < materials.length; i++) - { - if (materials[i] == block.getMaterial()) - { - float mineSpeed = tags.getInteger("MiningSpeed"); - int heads = 1; - if (tags.hasKey("MiningSpeed2")) - { - mineSpeed += tags.getInteger("MiningSpeed2"); - heads++; - } - - if (tags.hasKey("MiningSpeedHandle")) - { - mineSpeed += tags.getInteger("MiningSpeedHandle"); - heads++; - } - - if (tags.hasKey("MiningSpeedExtra")) - { - mineSpeed += tags.getInteger("MiningSpeedExtra"); - heads++; - } - float trueSpeed = mineSpeed / (heads * 300f); - int hlvl = block.getHarvestLevel(meta); - int durability = tags.getInteger("Damage"); - - float stonebound = tags.getFloat("Shoddy"); - float bonusLog = (float) Math.log(durability / 216f + 1) * 2 * stonebound; - trueSpeed += bonusLog; - - if (hlvl <= tags.getInteger("HarvestLevel")) - return trueSpeed; - return 0.1f; - } - } - return super.getDigSpeed(stack, block, meta); + @Override + public float stoneboundModifier () + { + return 216f; } } diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 2bb0f523..609ff555 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -344,75 +344,17 @@ public class Hammer extends HarvestTool } @Override - public float getDigSpeed (ItemStack stack, Block block, int meta) + public float breakSpeedModifier () { - if (!stack.hasTagCompound()) - return 1.0f; - - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return 0.1f; - - Material[] materials = getEffectiveMaterials(); - for (int i = 0; i < materials.length; i++) - { - if (materials[i] == block.getMaterial()) - { - return getblockSpeed(tags, block, meta); - } - } - - /* - * if (block == Block.silverfish) return getblockSpeed(tags, block, - * meta); - */ - - return super.getDigSpeed(stack, block, meta); + return 0.4f; } - float getblockSpeed (NBTTagCompound tags, Block block, int meta) + @Override + public float stoneboundModifier () { - float mineSpeed = tags.getInteger("MiningSpeed"); - int heads = 1; - if (tags.hasKey("MiningSpeed2")) - { - mineSpeed += tags.getInteger("MiningSpeed2"); - heads++; - } - if (tags.hasKey("MiningSpeedHandle")) - { - mineSpeed += tags.getInteger("MiningSpeedHandle"); - heads++; - } - - if (tags.hasKey("MiningSpeedExtra")) - { - mineSpeed += tags.getInteger("MiningSpeedExtra"); - heads++; - } - float trueSpeed = mineSpeed / (heads * 300f); - int hlvl = block.getHarvestLevel(meta); - int durability = tags.getInteger("Damage"); - - float stonebound = tags.getFloat("Shoddy"); - float bonusLog = (float) Math.log(durability / 216f + 1) * 2 * stonebound; - trueSpeed += bonusLog; - - if (hlvl <= tags.getInteger("HarvestLevel")) - return trueSpeed; - return 0.1f; + return 216f; } - /* - * @Override public void onUpdate (ItemStack stack, World world, Entity - * entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, - * par4, par5); if (entity instanceof EntityPlayer) { EntityPlayer player = - * (EntityPlayer) entity; ItemStack equipped = - * player.getCurrentEquippedItem(); if (equipped == stack) { - * player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 1, 1)); } - * } } - */ - @Override public String[] getTraits () { diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 69ebb503..6bc306ce 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -79,53 +79,15 @@ public class LumberAxe extends HarvestTool */ @Override - public float getDigSpeed (ItemStack stack, Block block, int meta) + public float breakSpeedModifier () { - if (!stack.hasTagCompound()) - return 1.0f; + return 0.4f; + } - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return 0.1f; - - Material[] materials = getEffectiveMaterials(); - for (int i = 0; i < materials.length; i++) - { - if (materials[i] == block.getMaterial()) - { - float mineSpeed = tags.getInteger("MiningSpeed"); - int heads = 1; - if (tags.hasKey("MiningSpeed2")) - { - mineSpeed += tags.getInteger("MiningSpeed2"); - heads++; - } - - if (tags.hasKey("MiningSpeedHandle")) - { - mineSpeed += tags.getInteger("MiningSpeedHandle"); - heads++; - } - - if (tags.hasKey("MiningSpeedExtra")) - { - mineSpeed += tags.getInteger("MiningSpeedExtra"); - heads++; - } - float trueSpeed = mineSpeed / (heads * 300f); - int hlvl = block.getHarvestLevel(meta); - int durability = tags.getInteger("Damage"); - - float stonebound = tags.getFloat("Shoddy"); - float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound; - trueSpeed += bonusLog; - - if (hlvl <= tags.getInteger("HarvestLevel")) - return trueSpeed; - return 0.1f; - } - } - return super.getDigSpeed(stack, block, meta); + @Override + public float stoneboundModifier () + { + return 216f; } @Override diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 0016b6c5..7fbd82e0 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -160,18 +160,28 @@ public abstract class HarvestTool extends ToolCore mineSpeed += tags.getInteger("MiningSpeedExtra"); heads++; } - float trueSpeed = mineSpeed / (heads * 100f); + float trueSpeed = mineSpeed / (heads * 100f) * breakSpeedModifier(); int hlvl = block.getHarvestLevel(meta); int durability = tags.getInteger("Damage"); float stonebound = tags.getFloat("Shoddy"); - float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound; + float bonusLog = (float) Math.log(durability / stoneboundModifier() + 1) * 2 * stonebound; trueSpeed += bonusLog; if (hlvl <= tags.getInteger("HarvestLevel")) return trueSpeed; return 0.1f; } + + public float breakSpeedModifier() + { + return 1.0f; + } + + public float stoneboundModifier() + { + return 72f; + } @Override public boolean func_150897_b (Block block) diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index 481bb570..1fccad5d 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -99,6 +99,7 @@ public class ModRedstone extends ItemModTypeFilter if (toolcore.durabilityTypeExtra() == 2) boost += 2; } + System.out.println("Boost: "+boost); miningSpeed += (increase * boost); tags.setInteger("MiningSpeed", miningSpeed); diff --git a/src/main/java/tconstruct/modifiers/tools/ModRepair.java b/src/main/java/tconstruct/modifiers/tools/ModRepair.java index 96e033d0..8bfa9ec3 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRepair.java @@ -80,11 +80,11 @@ public class ModRepair extends ItemModifier int modifiers = tags.getInteger("Modifiers"); float mods = 1.0f; if (modifiers == 2) - mods = 0.8f; + mods = 0.9f; else if (modifiers == 1) - mods = 0.6f; + mods = 0.8f; else if (modifiers == 0) - mods = 0.4f; + mods = 0.7f; increase *= mods; diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index 4f1a0fc0..27760f2d 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -17,6 +17,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import tconstruct.library.armor.ArmorCore; +import tconstruct.library.tools.HarvestTool; import tconstruct.library.tools.ToolCore; import tconstruct.tools.logic.CraftingStationLogic; @@ -286,9 +287,9 @@ public class CraftingStationGui 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; @@ -335,9 +336,9 @@ public class CraftingStationGui 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; diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index 3511548c..681c1998 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -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;