Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
This commit is contained in:
commit
e11a79b3c3
4 changed files with 19 additions and 5 deletions
|
@ -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"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
BIN
resources/assets/mekanism/textures/blocks/LiquidCleanOre.png
Normal file
BIN
resources/assets/mekanism/textures/blocks/LiquidCleanOre.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation": {
|
||||||
|
"frametime": 2
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue