diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index 6fd7933aa..da589b0e0 100644 --- a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -37,12 +37,6 @@ public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler { return Recipe.COMBINER.get().entrySet(); } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiCombiner.png"; - } @Override public ProgressBar getProgressType() diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 9086f9535..d42695edb 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -17,12 +17,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockCardboardBox extends BlockContainer { + private static boolean testingPlace = false; + public IIcon[] icons = new IIcon[6]; public BlockCardboardBox() @@ -54,6 +57,12 @@ public class BlockCardboardBox extends BlockContainer return meta == 0 ? icons[1] : icons[2]; } } + + @Override + public boolean isReplaceable(IBlockAccess world, int x, int y, int z) + { + return testingPlace; + } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int facing, float hitX, float hitY, float hitZ) @@ -67,10 +76,15 @@ public class BlockCardboardBox extends BlockContainer { BlockData data = tileEntity.storedData; + testingPlace = true; + if(!data.block.canPlaceBlockAt(world, x, y, z)) { + testingPlace = false; return true; } + + testingPlace = false; if(data.block != null) {