Merge branch 'development' into greylocke
This commit is contained in:
commit
e3496ea51f
4 changed files with 17 additions and 5 deletions
|
@ -22,7 +22,7 @@ dependencies {
|
|||
compile ':codechickenlib:1.0.0.49'
|
||||
compile ':codechickencore:0.9.0.7'
|
||||
compile ':nei:1.6.1.8'
|
||||
compile ':forgemultipart:1.0.0.228'
|
||||
compile ':forgemultipart:1.0.0.250'
|
||||
}
|
||||
|
||||
version = "6.0.4." + "$System.env.BUILD_NUMBER"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package mekanism.common.multipart;
|
||||
|
||||
import codechicken.microblock.ISidedHollowConnect;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
@ -41,7 +42,6 @@ import codechicken.lib.raytracer.RayTracer;
|
|||
import codechicken.lib.render.CCModel;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import codechicken.microblock.IHollowConnect;
|
||||
import codechicken.multipart.IconHitEffects;
|
||||
import codechicken.multipart.JIconHitEffects;
|
||||
import codechicken.multipart.JNormalOcclusion;
|
||||
|
@ -55,7 +55,7 @@ import com.google.common.io.ByteArrayDataInput;
|
|||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, IWrenchable
|
||||
public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, ISidedHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, IWrenchable
|
||||
{
|
||||
public static IndexedCuboid6[] smallSides = new IndexedCuboid6[7];
|
||||
public static IndexedCuboid6[] largeSides = new IndexedCuboid6[7];
|
||||
|
@ -299,9 +299,15 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
|
|||
}
|
||||
|
||||
@Override
|
||||
public int getHollowSize()
|
||||
public int getHollowSize(int side)
|
||||
{
|
||||
return getTransmitter().getSize().centerSize+1;
|
||||
ForgeDirection direction = ForgeDirection.getOrientation(side);
|
||||
|
||||
if(connectionMapContainsSide(getAllCurrentConnections(), direction) || direction == testingSide)
|
||||
{
|
||||
return getTransmitter().getSize().centerSize+1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -361,6 +367,12 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
|
|||
{
|
||||
connectionTypes[i] = ConnectionType.values()[packet.readInt()];
|
||||
}
|
||||
|
||||
if(tile() != null)
|
||||
{
|
||||
tile().internalPartChange(this);
|
||||
tile().markRender();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Binary file not shown.
BIN
libs/forgemultipart-1.0.0.250.jar
Normal file
BIN
libs/forgemultipart-1.0.0.250.jar
Normal file
Binary file not shown.
Loading…
Reference in a new issue