diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 269bec836..dfbdcc721 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -137,14 +137,6 @@ public class BlockCableBus extends AEBaseTileBlock /* FIXME implem return this.cb(world, pos).isLadder(entity); } -// FIXME: This is now derived from the collision shape, and cannot be decided programatically anymore. -// FIXME: see Block.hasSolidSide. We need to remove isSolidOnSide -// FIXME @Override -// FIXME public boolean isSideSolid( final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side ) -// FIXME { -// FIXME return this.cb( w, pos ).isSolidOnSide( side ); -// FIXME } - @Override public boolean isReplaceable(BlockState state, BlockItemUseContext useContext) { // FIXME: Potentially check the fluid one too diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 0c2c645ed..f3f5c8f85 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -699,23 +699,6 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } } - @Override - public boolean isSolidOnSide(final Direction side) { - if (side == null) { - return false; - } - - // facades are solid.. - final IFacadePart fp = this.getFacadeContainer().getFacade(AEPartLocation.fromFacing(side)); - if (fp != null) { - return true; - } - - // buses can be too. - final IPart part = this.getPart(side); - return part != null && part.isSolid(); - } - @Override public boolean isLadder(final LivingEntity entity) { for (final AEPartLocation side : AEPartLocation.values()) { diff --git a/src/main/java/appeng/parts/ICableBusContainer.java b/src/main/java/appeng/parts/ICableBusContainer.java index a4ca20f28..341d7df19 100644 --- a/src/main/java/appeng/parts/ICableBusContainer.java +++ b/src/main/java/appeng/parts/ICableBusContainer.java @@ -18,9 +18,9 @@ package appeng.parts; -import java.util.EnumSet; -import java.util.Random; - +import appeng.api.parts.SelectedPart; +import appeng.api.util.AEColor; +import appeng.client.render.cablebus.CableBusRenderState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -33,9 +33,8 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.api.parts.SelectedPart; -import appeng.api.util.AEColor; -import appeng.client.render.cablebus.CableBusRenderState; +import java.util.EnumSet; +import java.util.Random; public interface ICableBusContainer { @@ -53,8 +52,6 @@ public interface ICableBusContainer { void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor); - boolean isSolidOnSide(Direction side); - boolean isEmpty(); SelectedPart selectPart(Vec3d v3); diff --git a/src/main/java/appeng/parts/NullCableBusContainer.java b/src/main/java/appeng/parts/NullCableBusContainer.java index 8f11bbdf1..902546ce1 100644 --- a/src/main/java/appeng/parts/NullCableBusContainer.java +++ b/src/main/java/appeng/parts/NullCableBusContainer.java @@ -18,9 +18,9 @@ package appeng.parts; -import java.util.EnumSet; -import java.util.Random; - +import appeng.api.parts.SelectedPart; +import appeng.api.util.AEColor; +import appeng.client.render.cablebus.CableBusRenderState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -31,9 +31,8 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import appeng.api.parts.SelectedPart; -import appeng.api.util.AEColor; -import appeng.client.render.cablebus.CableBusRenderState; +import java.util.EnumSet; +import java.util.Random; public class NullCableBusContainer implements ICableBusContainer { @@ -67,11 +66,6 @@ public class NullCableBusContainer implements ICableBusContainer { } - @Override - public boolean isSolidOnSide(final Direction side) { - return false; - } - @Override public boolean isEmpty() { return true;