From b96eb3ce33c26bb18aee4ba1033ae5c7b05ab200 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sat, 22 Mar 2014 16:51:37 -0500 Subject: [PATCH] Added Immibis Microblock Support. --- block/AEBaseBlock.java | 3 ++- block/networking/BlockCableBus.java | 5 +++++ tile/AEBaseTile.java | 6 ++++-- tile/networking/TileCableBus.java | 18 +++++++++++++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/block/AEBaseBlock.java b/block/AEBaseBlock.java index f9e54f3e..e40de2ee 100644 --- a/block/AEBaseBlock.java +++ b/block/AEBaseBlock.java @@ -577,7 +577,8 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @Override - final public void addCollisionBoxesToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) + // NOTE: WAS FINAL, changed for Immibis + public void addCollisionBoxesToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) { ICustomCollision collisionHandler = null; diff --git a/block/networking/BlockCableBus.java b/block/networking/BlockCableBus.java index d5ec3ddc..d659f94f 100644 --- a/block/networking/BlockCableBus.java +++ b/block/networking/BlockCableBus.java @@ -241,4 +241,9 @@ public class BlockCableBus extends AEBaseBlock return nullCB; } + /** + * Immibis MB Support. + */ + boolean ImmibisMicroblocks_TransformableBlockMarker = true; + } diff --git a/tile/AEBaseTile.java b/tile/AEBaseTile.java index af7a7123..9b527300 100644 --- a/tile/AEBaseTile.java +++ b/tile/AEBaseTile.java @@ -112,7 +112,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } @Override - final public void writeToNBT(NBTTagCompound data) + // NOTE: WAS FINAL, changed for Immibis + public void writeToNBT(NBTTagCompound data) { super.writeToNBT( data ); @@ -130,7 +131,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } @Override - final public void readFromNBT(NBTTagCompound data) + // NOTE: WAS FINAL, changed for Immibis + public void readFromNBT(NBTTagCompound data) { super.readFromNBT( data ); diff --git a/tile/networking/TileCableBus.java b/tile/networking/TileCableBus.java index 8e514586..56116fab 100644 --- a/tile/networking/TileCableBus.java +++ b/tile/networking/TileCableBus.java @@ -220,7 +220,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public boolean isBlocked(ForgeDirection side) { - return false; + return !ImmibisMicroblocks_isSideOpen( side.ordinal() ); } @Override @@ -320,4 +320,20 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl return cb.getLayerFlags(); } + /** + * Immibis MB Support + */ + + boolean ImmibisMicroblocks_TransformableTileEntityMarker = true; + + public boolean ImmibisMicroblocks_isSideOpen(int side) + { + return true; + } + + public void ImmibisMicroblocks_onMicroblocksChanged() + { + cb.updateConnections(); + } + }