mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fixed some multipart crashes
This commit is contained in:
1 parent
0baf510473
commit
3fccbada96
3 files changed
+15
-16
No files matched your search
@@ -135,11 +135,11 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
|
||||
@Override
|
||||
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
|
||||
{
|
||||
TileEntityGlowPanel tile = (TileEntityGlowPanel)world.getTileEntity(pos);
|
||||
TileEntity tile = world.getTileEntity(pos);
|
||||
|
||||
if(tile != null)
|
||||
if(tile != null && tile instanceof TileEntityGlowPanel)
|
||||
{
|
||||
return bounds[tile.side.ordinal()];
|
||||
return bounds[((TileEntityGlowPanel)tile).side.ordinal()];
|
||||
}
|
||||
|
||||
return super.getBoundingBox(state, world, pos);
|
||||
|
||||
@@ -22,9 +22,9 @@ import mekanism.common.tile.transmitter.TileEntityMechanicalPipe;
|
||||
import mekanism.common.tile.transmitter.TileEntityPressurizedTube;
|
||||
import mekanism.common.tile.transmitter.TileEntityRestrictiveTransporter;
|
||||
import mekanism.common.tile.transmitter.TileEntitySidedPipe;
|
||||
import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
|
||||
import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor;
|
||||
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
|
||||
import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.ITileEntityProvider;
|
||||
@@ -151,9 +151,9 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
|
||||
@Override
|
||||
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
|
||||
{
|
||||
TileEntitySidedPipe pipe = (TileEntitySidedPipe)world.getTileEntity(pos);
|
||||
TileEntity tile = world.getTileEntity(pos);
|
||||
|
||||
if(pipe != null && pipe.getTransmitterType().getSize() == Size.SMALL)
|
||||
if(tile instanceof TileEntitySidedPipe && ((TileEntitySidedPipe)tile).getTransmitterType().getSize() == Size.SMALL)
|
||||
{
|
||||
return smallSides[6];
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ import mcmultipart.api.capability.MCMPCapabilities;
|
||||
import mcmultipart.api.multipart.IMultipartRegistry;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.block.states.BlockStateMachine.MachineType;
|
||||
import mekanism.common.tile.TileEntityGlowPanel;
|
||||
import mekanism.common.tile.transmitter.TileEntityTransmitter;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -38,33 +40,30 @@ import org.apache.commons.lang3.tuple.Pair;
|
||||
@MCMPAddon
|
||||
public class MultipartMekanism implements IMCMPAddon
|
||||
{
|
||||
public MultipartMekanism()
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onAttachTile(AttachCapabilitiesEvent<TileEntity> event)
|
||||
{
|
||||
TileEntity tile = event.getObject();
|
||||
|
||||
/*if(tile instanceof TileEntitySidedPipe)
|
||||
if(tile instanceof TileEntityTransmitter)
|
||||
{
|
||||
register(event, "sided_pipe");
|
||||
register(event, "transmitter");
|
||||
}
|
||||
else if(tile instanceof TileEntityGlowPanel)
|
||||
{
|
||||
register(event, "glow_panel");
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerParts(IMultipartRegistry registry)
|
||||
{
|
||||
/*registry.registerPartWrapper(MekanismBlocks.Transmitter, new MultipartTransmitter());
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
|
||||
registry.registerPartWrapper(MekanismBlocks.Transmitter, new MultipartTransmitter());
|
||||
registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.Transmitter), s -> true, MekanismBlocks.Transmitter);
|
||||
registry.registerPartWrapper(MekanismBlocks.GlowPanel, new MultipartGlowPanel());
|
||||
registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.GlowPanel), s -> true, MekanismBlocks.GlowPanel);*/
|
||||
registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.GlowPanel), s -> true, MekanismBlocks.GlowPanel);
|
||||
}
|
||||
|
||||
private void register(AttachCapabilitiesEvent<TileEntity> e, String id)
|
||||
|
||||
Reference in new issue
Block a user