diff options
Diffstat (limited to 'ihl/handpump')
| -rw-r--r-- | ihl/handpump/AdvancedHandPump.java | 5 | ||||
| -rw-r--r-- | ihl/handpump/BlockWithCoordinates.java | 29 | ||||
| -rw-r--r-- | ihl/handpump/XYZ.java | 26 |
3 files changed, 33 insertions, 27 deletions
diff --git a/ihl/handpump/AdvancedHandPump.java b/ihl/handpump/AdvancedHandPump.java index c655391..e9b8bf8 100644 --- a/ihl/handpump/AdvancedHandPump.java +++ b/ihl/handpump/AdvancedHandPump.java @@ -28,7 +28,6 @@ import ic2.core.Ic2Items; import ic2.core.util.LiquidUtil;
import ihl.IHLModInfo;
import ihl.IHLMod;
-import ihl.i_hate_liquids.XYZ;
import ihl.utils.IHLUtils;
import ihl.worldgen.ores.IHLFluid;
@@ -79,11 +78,11 @@ public class AdvancedHandPump extends IHLHandPump { {
fluid1 = ((BlockFluidBase)block).drain(world, blockXYZ.x, blockXYZ.y, blockXYZ.z, false);
}
- else if(block==Blocks.water||block==Blocks.flowing_water||block==IHLMod.flowing_water)
+ else if(block==Blocks.water||block==Blocks.flowing_water)
{
fluid1 = new FluidStack(FluidRegistry.WATER, 1000);
}
- else if(block==Blocks.lava||block==Blocks.flowing_lava||block==IHLMod.flowing_lava)
+ else if(block==Blocks.lava||block==Blocks.flowing_lava)
{
fluid1 = new FluidStack(FluidRegistry.LAVA, 1000);
}
diff --git a/ihl/handpump/BlockWithCoordinates.java b/ihl/handpump/BlockWithCoordinates.java index 0cdc965..d934b35 100644 --- a/ihl/handpump/BlockWithCoordinates.java +++ b/ihl/handpump/BlockWithCoordinates.java @@ -1,6 +1,5 @@ package ihl.handpump;
-import ihl.IHLMod;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
@@ -27,7 +26,7 @@ public boolean setMetadataOrDestroyBlock(World world, int meta, int maxMeta) {
return world.setBlockToAir(x, y, z);
}
- else if(isWaterBlock() && IHLMod.cccFiniteWater)
+ else if(isWaterBlock())
{
if(world.setBlock(x,y,z,Blocks.flowing_water,meta,3))
{
@@ -36,24 +35,6 @@ public boolean setMetadataOrDestroyBlock(World world, int meta, int maxMeta) }
return false;
}
- else if(isWaterBlock())
- {
- if(world.setBlock(x,y,z,IHLMod.flowing_water,meta,3))
- {
- world.scheduleBlockUpdate(x,y,z,IHLMod.flowing_water,2);
- return true;
- }
- return false;
- }
- else if(isLavaBlock() && world.provider.isHellWorld && !IHLMod.cccFiniteWater)
- {
- if(world.setBlock(x,y,z,IHLMod.flowing_lava,meta,3))
- {
- world.scheduleBlockUpdate(x,y,z,IHLMod.flowing_lava,2);
- return true;
- }
- return false;
- }
else if(isLavaBlock())
{
if(world.setBlock(x,y,z,Blocks.flowing_lava,meta,3))
@@ -71,11 +52,11 @@ public boolean isSameTypeBlock(World world, int x2, int y2, int z2) Block block2 = world.getBlock(x2, y2, z2);
if(isWaterBlock())
{
- return block2==Blocks.water||block2==Blocks.flowing_water||block2==IHLMod.flowing_water;
+ return block2==Blocks.water||block2==Blocks.flowing_water;
}
else if(isLavaBlock())
{
- return block2==Blocks.lava||block2==Blocks.flowing_lava||block2==IHLMod.flowing_lava;
+ return block2==Blocks.lava||block2==Blocks.flowing_lava;
}
else
{
@@ -85,7 +66,7 @@ public boolean isSameTypeBlock(World world, int x2, int y2, int z2) public boolean isWaterBlock()
{
- if(block==Blocks.water||block==Blocks.flowing_water||block==IHLMod.flowing_water)
+ if(block==Blocks.water||block==Blocks.flowing_water)
{
return true;
}
@@ -94,7 +75,7 @@ public boolean isWaterBlock() public boolean isLavaBlock()
{
- if(block==Blocks.lava||block==Blocks.flowing_lava||block==IHLMod.flowing_lava)
+ if(block==Blocks.lava||block==Blocks.flowing_lava)
{
return true;
}
diff --git a/ihl/handpump/XYZ.java b/ihl/handpump/XYZ.java new file mode 100644 index 0000000..9a2627e --- /dev/null +++ b/ihl/handpump/XYZ.java @@ -0,0 +1,26 @@ +package ihl.handpump;
+
+public class XYZ {
+ public int x;
+ public int y;
+ public int z;
+
+ public XYZ(int x1,int y1,int z1)
+ {
+ this.x=x1;
+ this.y=y1;
+ this.z=z1;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if(obj instanceof XYZ)
+ {
+ XYZ xyz2 = (XYZ) obj;
+ return (this.x==xyz2.x && this.y==xyz2.y && this.z==xyz2.z);
+ }
+ return false;
+ }
+
+}
|