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

Fix transmitter issue

Browse source
This commit is contained in:
Aidan Brady 2014-01-21 21:05:27 -05:00
parent f80341ca9d
commit 56943c8e2b
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/mekanism/client/render/MekanismRenderer.java
View file

@ -82,7 +82,13 @@ public class MekanismRenderer
{ {
if(gas instanceof OreGas) if(gas instanceof OreGas)
{ {
gas.setIcon(event.map.registerIcon("mekanism:LiquidOre")); if(gas.getUnlocalizedName().contains("clean"))
{
gas.setIcon(event.map.registerIcon("mekanism:LiquidCleanOre"));
}
else {
gas.setIcon(event.map.registerIcon("mekanism:LiquidOre"));
}
} }
} }

11
common/mekanism/common/multipart/PartSidedPipe.java
View file

@ -461,13 +461,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
} }
} }
onRefresh();
if(!world().isRemote) if(!world().isRemote)
{ {
currentTransmitterConnections = possibleTransmitters; currentTransmitterConnections = possibleTransmitters;
currentAcceptorConnections = possibleAcceptors; currentAcceptorConnections = possibleAcceptors;
}
onRefresh();
if(!world().isRemote)
{
sendDesc = true; sendDesc = true;
} }
} }
@ -611,7 +614,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
public boolean canConnectToAcceptor(ForgeDirection side, boolean ignoreActive) public boolean canConnectToAcceptor(ForgeDirection side, boolean ignoreActive)
{ {
if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side)) if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side) || !connectionMapContainsSide(currentAcceptorConnections, side))
{ {
return false; return false;
} }