From 0fa542202e8e0e08db285ec78c2b6bdb561c4f57 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 30 Jul 2017 23:31:20 +0200 Subject: [PATCH] Fixed fluid transmission --- com/hbm/items/weapon/GunZOMG.java | 6 ++++-- com/hbm/lib/Library.java | 7 +++++++ com/hbm/sound/SoundLoopMiner.java | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/com/hbm/items/weapon/GunZOMG.java b/com/hbm/items/weapon/GunZOMG.java index aa1a3b5c1..918037c58 100644 --- a/com/hbm/items/weapon/GunZOMG.java +++ b/com/hbm/items/weapon/GunZOMG.java @@ -193,7 +193,7 @@ public class GunZOMG extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - if(itemstack.getTagCompound() == null) + /*if(itemstack.getTagCompound() == null) { list.add("Gun not validated."); } else if(itemstack.getTagCompound().getBoolean("valid")) { @@ -211,7 +211,9 @@ public class GunZOMG extends Item { list.add("Ammo: None (Requires Validation)"); list.add("Damage: 35 - 45"); list.add("Energy Damage: 10000 - 100000"); - list.add("Energy projectiles destroy blocks."); + list.add("Energy projectiles destroy blocks.");*/ + for(int i = 0; i < 25; i++) + list.add("How do I use the ZOMG? How do I use the ZOMG? How do I use the ZOMG?"); } @Override diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index a91064fab..3a39f18dd 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -1168,6 +1168,13 @@ public class Library { { tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); } + if(block == ModBlocks.dummy_port_fluidtank) + { + tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); + } + + if(tileentity == that) + tileentity = null; if(tileentity instanceof IFluidDuct) { diff --git a/com/hbm/sound/SoundLoopMiner.java b/com/hbm/sound/SoundLoopMiner.java index 76542a30d..86b5619cc 100644 --- a/com/hbm/sound/SoundLoopMiner.java +++ b/com/hbm/sound/SoundLoopMiner.java @@ -24,6 +24,9 @@ public class SoundLoopMiner extends SoundLoopMachine { if(te instanceof TileEntityMachineMiningDrill) { TileEntityMachineMiningDrill drill = (TileEntityMachineMiningDrill)te; + if(this.volume != 3) + volume = 3; + if(drill.torque <= 0.5F) this.donePlaying = true; }