diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index e083210a5..c91868546 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -1,5 +1,7 @@ package mekanism.common.multipart; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -20,7 +22,6 @@ import mekanism.common.Tier; import mekanism.common.base.ITileNetwork; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.particle.EffectRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,11 +31,6 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import io.netty.buffer.ByteBuf; - import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.raytracer.ExtendedMOP; @@ -52,6 +48,8 @@ import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.PartMap; import codechicken.multipart.TMultiPart; import codechicken.multipart.TSlottedPart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, ISidedHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, INeighborTileChange { diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index ad101ac54..c01e6b46d 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -195,7 +195,7 @@ public abstract class PartTransmitter> extends Pa @Override public void fixTransmitterNetwork() { - getTransmitterNetwork().fixMessedUpNetwork((IGridTransmitter) tile()); + getTransmitterNetwork().fixMessedUpNetwork((IGridTransmitter)tile()); } public abstract N createNetworkFromSingleTransmitter(IGridTransmitter transmitter); @@ -207,7 +207,7 @@ public abstract class PartTransmitter> extends Pa { super.onChunkUnload(); - getTransmitterNetwork().split(this); + getTransmitterNetwork().split((IGridTransmitter)tile()); if(!world().isRemote) { @@ -276,6 +276,7 @@ public abstract class PartTransmitter> extends Pa public void readDesc(MCDataInput packet) { super.readDesc(packet); + if(packet.readBoolean()) { mergeNewSideNets(packet.readByte()); @@ -286,14 +287,14 @@ public abstract class PartTransmitter> extends Pa public void writeDesc(MCDataOutput packet) { super.writeDesc(packet); + if(newSidesMerged != 0x00) { packet.writeBoolean(true); packet.writeByte(newSidesMerged); newSidesMerged = 0x00; } - else - { + else { packet.writeBoolean(false); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 0ede5f215..714b08684 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -248,7 +248,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { int fuelReceived = fuelTank.receive(stack, true); - if (isTankEmpty && fuelReceived > 0) + if(isTankEmpty && fuelReceived > 0) { output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick * 2; }