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

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan C. Brady 2014-01-22 07:43:34 -05:00
commit e11a79b3c3
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,9 +82,15 @@ public class MekanismRenderer
{
if(gas instanceof OreGas)
{
if(gas.getUnlocalizedName().contains("clean"))
{
gas.setIcon(event.map.registerIcon("mekanism:LiquidCleanOre"));
}
else {
gas.setIcon(event.map.registerIcon("mekanism:LiquidOre"));
}
}
}
FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:LiquidBrine"));
}

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

@ -461,13 +461,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
}
}
onRefresh();
if(!world().isRemote)
{
currentTransmitterConnections = possibleTransmitters;
currentAcceptorConnections = possibleAcceptors;
}
onRefresh();
if(!world().isRemote)
{
sendDesc = true;
}
}
@ -611,7 +614,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
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;
}

BIN
resources/assets/mekanism/textures/blocks/LiquidCleanOre.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

5
resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta Normal file
View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}