tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More fixes

Browse source
This commit is contained in:
Aidan Brady 2013-12-19 16:55:41 -05:00
parent abaef2fd6d
commit fbed46c0d9
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/mekanism/client/render/RenderPartTransmitter.java
View file

@ -5,11 +5,11 @@ import java.util.Map;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.EnergyNetwork;
import mekanism.common.multipart.PartLogisticalTransporter;
import mekanism.common.multipart.PartMechanicalPipe;
import mekanism.common.multipart.PartPressurizedTube;
import mekanism.common.multipart.PartSidedPipe;
import mekanism.common.multipart.PartSidedPipe.ConnectionType;
import mekanism.common.multipart.PartTransmitter;
import mekanism.common.multipart.PartUniversalCable;
import mekanism.common.util.MekanismUtils;
@ -118,7 +118,10 @@ public class RenderPartTransmitter implements IIconRegister
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
renderEnergySide(side, cable);
if(cable.getConnectionType(side) != ConnectionType.NONE)
{
renderEnergySide(side, cable);
}
}
MekanismRenderer.glowOn();
@ -156,7 +159,7 @@ public class RenderPartTransmitter implements IIconRegister
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
if(PartTransmitter.connectionMapContainsSide(pipe.getAllCurrentConnections(), side))
if(pipe.getConnectionType(side) != ConnectionType.NONE && PartTransmitter.connectionMapContainsSide(pipe.getAllCurrentConnections(), side))
{
DisplayInteger[] displayLists = getListAndRender(side, fluid);
@ -338,7 +341,10 @@ public class RenderPartTransmitter implements IIconRegister
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
renderGasSide(side, tube);
if(tube.getConnectionType(side) != ConnectionType.NONE)
{
renderGasSide(side, tube);
}
}
CCRenderState.draw();

16
common/mekanism/common/tileentity/TileEntityDynamicTank.java
View file

@ -7,16 +7,16 @@ import java.util.Map;
import mekanism.api.Object3D;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.SynchronizedTankData;
import mekanism.common.TankUpdateProtocol;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.SynchronizedTankData;
import mekanism.common.SynchronizedTankData.ValveData;
import mekanism.common.TankUpdateProtocol;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
@ -173,7 +173,15 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock
sendStructure = true;
}
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType().blockID);
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
Object3D obj = Object3D.get(this).getFromSide(side);
if(!(obj.getTileEntity(worldObj) instanceof TileEntityDynamicTank))
{
worldObj.notifyBlockOfNeighborChange(obj.xCoord, obj.yCoord, obj.zCoord, getBlockType().blockID);
}
}
PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList())));
}