diff --git a/changelog b/changelog index 865b32201..d476d1d1f 100644 --- a/changelog +++ b/changelog @@ -1,11 +1,3 @@ -## Changed -* Aluminium-bearing ore is now crucible smeltable, yielding some aluminium and trace amounts of sodium -* Duds now use their updated model in the item renderer -* The large drill's bore fluid is now set to none by default to avoid confusion - ## Fixed -* Fixed crash caused by double lightstone slabs -* Fixed crash caused by pneumatic tubes when placed in front of a spotlight -* Fixed pneumatic tube filters not working with GTNH-NEI installed -* Fixed GTNH-NEI causing filters to initialize with a stacksize >1 -* Fau and DNT armor should now be resistant to fire again \ No newline at end of file +* Fixed fatal gamebreaking hard drive corrupting issue where taurun leggings were misspelled +* Fixed minor display issue where compressed air ducts would visually connect to non-ejector pneumatic tubes \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/network/PneumoTube.java b/src/main/java/com/hbm/blocks/network/PneumoTube.java index 161d1b839..4566af7dc 100644 --- a/src/main/java/com/hbm/blocks/network/PneumoTube.java +++ b/src/main/java/com/hbm/blocks/network/PneumoTube.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ITooltipProvider; -import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; import com.hbm.lib.RefStrings; @@ -13,7 +12,6 @@ import com.hbm.tileentity.network.TileEntityPneumoTube; import com.hbm.util.Compat; import api.hbm.block.IToolable; -import api.hbm.fluidmk2.IFluidConnectorBlockMK2; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; @@ -33,7 +31,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; -public class PneumoTube extends BlockContainer implements IToolable, IFluidConnectorBlockMK2, ITooltipProvider { +public class PneumoTube extends BlockContainer implements IToolable, ITooltipProvider { @SideOnly(Side.CLIENT) public IIcon baseIcon; @SideOnly(Side.CLIENT) public IIcon iconIn; @@ -220,12 +218,6 @@ public class PneumoTube extends BlockContainer implements IToolable, IFluidConne if(tile instanceof TileEntityPneumoTube) return false; return Library.canConnectFluid(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir, Fluids.AIR); } - - @Override - public boolean canConnect(FluidType type, IBlockAccess world, int x, int y, int z, ForgeDirection dir) { - TileEntityPneumoTube tube = (TileEntityPneumoTube) world.getTileEntity(x, y, z); - return tube != null && tube.isCompressor(); - } @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityPneumoTube.java b/src/main/java/com/hbm/tileentity/network/TileEntityPneumoTube.java index e1c7a02bd..cc7fd46ea 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityPneumoTube.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityPneumoTube.java @@ -156,7 +156,7 @@ public class TileEntityPneumoTube extends TileEntityMachineBase implements IGUIP @Override public boolean canConnect(FluidType type, ForgeDirection dir) { - return dir != this.insertionDir && dir != this.ejectionDir && type == Fluids.AIR; + return dir != this.insertionDir && dir != this.ejectionDir && type == Fluids.AIR && this.isCompressor(); } @Override diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 29de3b5c5..c0560a40d 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -4403,7 +4403,7 @@ item.t45_plate.name=T45 Power Armor Chestplate item.tank_steel.name=Steel Tank item.taurun_boots.name=Taurun Boots item.taurun_helmet.name=Taurun Helmet -item.taurun_legs.name=Taurun Leggigns +item.taurun_legs.name=Taurun Leggings item.taurun_plate.name=Taurun Chestplate item.telepad.name=Telepad item.tem_flakes.name=Tem Flakes