diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index b6cf53bb3..9c66ec57b 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -17,11 +17,11 @@ public class MekanismAPI /** Mekanism debug mode */ public static boolean debug = false; - public static boolean isBlockCompatible(Item item, int meta) + public static boolean isBlockCompatible(Block block, int meta) { for(BlockInfo i : cardboardBoxIgnore) { - if(i.block == Block.getBlockFromItem(item) && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) + if(i.block == block && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) { return false; } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a04ec19cc..6bea737e5 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -41,9 +41,9 @@ import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.ChunkManager; -import mekanism.common.config.TypeConfigManager; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; +import mekanism.common.config.TypeConfigManager; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.content.matrix.SynchronizedMatrixData; diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 93b7f1a1b..0c175ea0a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -82,7 +82,7 @@ public class ItemBlockCardboardBox extends ItemBlock Block block = state.getBlock(); int meta = block.getMetaFromState(state); - if(!world.isRemote && MekanismAPI.isBlockCompatible(Item.getItemFromBlock(block), meta) && state.getBlockHardness(world, pos) != -1) + if(!world.isRemote && MekanismAPI.isBlockCompatible(block, meta) && state.getBlockHardness(world, pos) != -1) { BlockData data = new BlockData(); data.block = block;