diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index aaa6b65d4..2d5eac8a1 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -81,6 +81,11 @@ public class BlockCable extends BlockCoverable { this("cable"); } + @Override + public boolean canProvidePower(IBlockState state) { + return false; + } + @Override public boolean hasTileEntity(IBlockState state) { return true; @@ -210,12 +215,6 @@ public class BlockCable extends BlockCoverable { } } - // @TODO: MCMP issue #40 - @Override - public AxisAlignedBB getSelectedBoundingBoxDefault(IBlockState state, World world, BlockPos pos) { - return state.getBoundingBox(world, pos).offset(pos); - } - @Override public RayTraceResult collisionRayTraceDefault(IBlockState state, World world, BlockPos pos, Vec3d start, Vec3d end) { RayTraceUtils.AdvancedRayTraceResult result = RayTraceUtils.collisionRayTrace(world, pos, start, end, getCollisionBoxes(this.getActualState(state, world, pos))); diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 6d70cedfd..9d3428c90 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -150,8 +150,7 @@ public class ClientProxy extends CommonProxy { new ResourceLocation("refinedstorage:4k_storage_disk"), new ResourceLocation("refinedstorage:16k_storage_disk"), new ResourceLocation("refinedstorage:64k_storage_disk"), - new ResourceLocation("refinedstorage:creative_storage_disk"), - new ResourceLocation("refinedstorage:debug_storage_disk") + new ResourceLocation("refinedstorage:creative_storage_disk") ); ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, diff --git a/src/main/java/refinedstorage/tile/config/IPrioritizable.java b/src/main/java/refinedstorage/tile/config/IPrioritizable.java index 70f1dda84..0194638ac 100755 --- a/src/main/java/refinedstorage/tile/config/IPrioritizable.java +++ b/src/main/java/refinedstorage/tile/config/IPrioritizable.java @@ -3,8 +3,6 @@ package refinedstorage.tile.config; import net.minecraft.client.Minecraft; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; import refinedstorage.gui.GuiStorage; import refinedstorage.tile.data.ITileDataConsumer; import refinedstorage.tile.data.ITileDataProducer; @@ -24,7 +22,7 @@ public interface IPrioritizable { ((IPrioritizable) tile).setPriority(value); } }, parameter -> { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT && Minecraft.getMinecraft().currentScreen instanceof GuiStorage) { + if (Minecraft.getMinecraft().currentScreen instanceof GuiStorage) { ((GuiStorage) Minecraft.getMinecraft().currentScreen).updatePriority(parameter.getValue()); } });