Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Apply suggestion RI-13, mechanical piston is now based on block hardness

Browse source
This commit is contained in:
tgame14 2014-06-18 14:51:11 +03:00
parent 2e25711320
commit 00b79b1d69
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mechanical/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java
View file

@ -1,7 +1,7 @@
package resonantinduction.mechanical.process.crusher; package resonantinduction.mechanical.process.crusher;
import java.lang.reflect.Method; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.ReflectionHelper;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -19,15 +19,17 @@ import resonantinduction.core.ResonantInduction;
import resonantinduction.mechanical.energy.grid.MechanicalNode; import resonantinduction.mechanical.energy.grid.MechanicalNode;
import resonantinduction.mechanical.energy.grid.TileMechanical; import resonantinduction.mechanical.energy.grid.TileMechanical;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.ReflectionHelper; import java.lang.reflect.Method;
public class TileMechanicalPiston extends TileMechanical implements IRotatable public class TileMechanicalPiston extends TileMechanical implements IRotatable
{ {
@Config @Config(comment = "Outdated, not used anymore. use mechanicalPistonMultiplier as its based on block hardness now")
@Deprecated
private static int mechanicalPistonBreakCount = 5; private static int mechanicalPistonBreakCount = 5;
private int breakCount = mechanicalPistonBreakCount; @Config
private static int mechanicalPistonMultiplier = 2;
private boolean markRevolve = false; private boolean markRevolve = false;
@ -88,6 +90,9 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable
if (block != null) if (block != null)
{ {
int breakCount = (int) (mechanicalPistonMultiplier * block.blockHardness);
final int startBreakCount = breakCount;
ItemStack blockStack = new ItemStack(block); ItemStack blockStack = new ItemStack(block);
RecipeResource[] resources = MachineRecipes.INSTANCE.getOutput(ResonantInduction.RecipeType.CRUSHER.name(), blockStack); RecipeResource[] resources = MachineRecipes.INSTANCE.getOutput(ResonantInduction.RecipeType.CRUSHER.name(), blockStack);
@ -95,7 +100,7 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable
{ {
if (!worldObj.isRemote) if (!worldObj.isRemote)
{ {
int breakStatus = (int) (((float) (mechanicalPistonBreakCount - breakCount) / (float) mechanicalPistonBreakCount) * 10f); int breakStatus = (int) (((float) (startBreakCount - breakCount) / (float) startBreakCount) * 10f);
world().destroyBlockInWorldPartially(0, blockPos.intX(), blockPos.intY(), blockPos.intZ(), breakStatus); world().destroyBlockInWorldPartially(0, blockPos.intX(), blockPos.intY(), blockPos.intZ(), breakStatus);
if (breakCount <= 0) if (breakCount <= 0)
@ -112,8 +117,6 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable
getWorldObj().destroyBlock(blockPos.intX(), blockPos.intY(), blockPos.intZ(), false); getWorldObj().destroyBlock(blockPos.intX(), blockPos.intY(), blockPos.intZ(), false);
} }
breakCount = mechanicalPistonBreakCount;
} }
} }
@ -123,8 +126,6 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable
} }
} }
breakCount = mechanicalPistonBreakCount;
if (!worldObj.isRemote) if (!worldObj.isRemote)
world().destroyBlockInWorldPartially(0, blockPos.intX(), blockPos.intY(), blockPos.intZ(), -1); world().destroyBlockInWorldPartially(0, blockPos.intX(), blockPos.intY(), blockPos.intZ(), -1);
return false; return false;