Merge branch 'master' into 1.8
This commit is contained in:
commit
6cc7efc64b
2 changed files with 14 additions and 6 deletions
|
@ -38,12 +38,6 @@ public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler
|
||||||
return Recipe.COMBINER.get().entrySet();
|
return Recipe.COMBINER.get().entrySet();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getGuiTexture()
|
|
||||||
{
|
|
||||||
return "mekanism:gui/GuiCombiner.png";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ProgressBar getProgressType()
|
public ProgressBar getProgressType()
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,12 +17,15 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
import net.minecraft.util.MovingObjectPosition;
|
import net.minecraft.util.MovingObjectPosition;
|
||||||
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class BlockCardboardBox extends BlockContainer
|
public class BlockCardboardBox extends BlockContainer
|
||||||
{
|
{
|
||||||
|
private static boolean testingPlace = false;
|
||||||
|
|
||||||
public IIcon[] icons = new IIcon[6];
|
public IIcon[] icons = new IIcon[6];
|
||||||
|
|
||||||
public BlockCardboardBox()
|
public BlockCardboardBox()
|
||||||
|
@ -55,6 +58,12 @@ public class BlockCardboardBox extends BlockContainer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isReplaceable(IBlockAccess world, int x, int y, int z)
|
||||||
|
{
|
||||||
|
return testingPlace;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int facing, float hitX, float hitY, float hitZ)
|
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int facing, float hitX, float hitY, float hitZ)
|
||||||
{
|
{
|
||||||
|
@ -67,11 +76,16 @@ public class BlockCardboardBox extends BlockContainer
|
||||||
{
|
{
|
||||||
BlockData data = tileEntity.storedData;
|
BlockData data = tileEntity.storedData;
|
||||||
|
|
||||||
|
testingPlace = true;
|
||||||
|
|
||||||
if(!data.block.canPlaceBlockAt(world, x, y, z))
|
if(!data.block.canPlaceBlockAt(world, x, y, z))
|
||||||
{
|
{
|
||||||
|
testingPlace = false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
testingPlace = false;
|
||||||
|
|
||||||
if(data.block != null)
|
if(data.block != null)
|
||||||
{
|
{
|
||||||
data.meta = data.block.onBlockPlaced(world, x, y, z, facing, hitX, hitY, hitZ, data.meta);
|
data.meta = data.block.onBlockPlaced(world, x, y, z, facing, hitX, hitY, hitZ, data.meta);
|
||||||
|
|
Loading…
Reference in a new issue