tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.8

Browse source
This commit is contained in:
Aidan C. Brady 2014-07-12 22:53:21 -04:00
parent 6271284436 c223eabb95
commit 6cc7efc64b
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/mekanism/client/nei/CombinerRecipeHandler.java
View file

@ -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()

14
src/main/java/mekanism/common/block/BlockCardboardBox.java
View file

@ -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)
{