dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The MCMP bug is fixed

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-09 12:55:00 +02:00
parent 8c9e5a3dff
commit fb3cd0e38f
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/refinedstorage/block/BlockCable.java
View File

@@ -81,6 +81,11 @@ public class BlockCable extends BlockCoverable {
this("cable"); this("cable");
} }
@Override
public boolean canProvidePower(IBlockState state) {
return false;
}
@Override @Override
public boolean hasTileEntity(IBlockState state) { public boolean hasTileEntity(IBlockState state) {
return true; 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 @Override
public RayTraceResult collisionRayTraceDefault(IBlockState state, World world, BlockPos pos, Vec3d start, Vec3d end) { 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))); RayTraceUtils.AdvancedRayTraceResult result = RayTraceUtils.collisionRayTrace(world, pos, start, end, getCollisionBoxes(this.getActualState(state, world, pos)));

3
src/main/java/refinedstorage/proxy/ClientProxy.java
View File

@@ -150,8 +150,7 @@ public class ClientProxy extends CommonProxy {
new ResourceLocation("refinedstorage:4k_storage_disk"), new ResourceLocation("refinedstorage:4k_storage_disk"),
new ResourceLocation("refinedstorage:16k_storage_disk"), new ResourceLocation("refinedstorage:16k_storage_disk"),
new ResourceLocation("refinedstorage:64k_storage_disk"), new ResourceLocation("refinedstorage:64k_storage_disk"),
new ResourceLocation("refinedstorage:creative_storage_disk"), new ResourceLocation("refinedstorage:creative_storage_disk")
new ResourceLocation("refinedstorage:debug_storage_disk")
); );
ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART,

4
src/main/java/refinedstorage/tile/config/IPrioritizable.java
View File

@@ -3,8 +3,6 @@ package refinedstorage.tile.config;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import refinedstorage.gui.GuiStorage; import refinedstorage.gui.GuiStorage;
import refinedstorage.tile.data.ITileDataConsumer; import refinedstorage.tile.data.ITileDataConsumer;
import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.ITileDataProducer;
@@ -24,7 +22,7 @@ public interface IPrioritizable {
((IPrioritizable) tile).setPriority(value); ((IPrioritizable) tile).setPriority(value);
} }
}, parameter -> { }, 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()); ((GuiStorage) Minecraft.getMinecraft().currentScreen).updatePriority(parameter.getValue());
} }
}); });