From b1cd97eef56d15864a5be9ff217a08aa31ae922f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 9 May 2015 18:20:30 -0400 Subject: [PATCH] #2355 Disallow non-opaque blocks from being used for painted glowstone --- .../enderio/machine/painter/BlockPaintedGlowstone.java | 9 ++++++++- src/main/java/crazypants/util/BlockCoord.java | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index a4d5dc25..2f30b179 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -33,8 +33,10 @@ import crazypants.enderio.TileEntityEio; import crazypants.enderio.item.IRotatableFacade; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.util.BlockCoord; import crazypants.util.IFacade; import crazypants.util.Lang; +import crazypants.util.Util; public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvider, IPaintedBlock, IFacade, IRotatableFacade { @@ -185,7 +187,7 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid } return Blocks.anvil.getIcon(world, x, y, z, blockSide); } - + @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister IIconRegister) { @@ -239,6 +241,11 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid super(Blocks.glowstone, BlockPaintedGlowstone.this); MinecraftForge.EVENT_BUS.register(this); } + + @Override + public boolean isValidPaintSource(ItemStack paintSource) { + return super.isValidPaintSource(paintSource) && Util.getBlockFromItemId(paintSource).isOpaqueCube(); + } @Override public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { diff --git a/src/main/java/crazypants/util/BlockCoord.java b/src/main/java/crazypants/util/BlockCoord.java index 9c871ea1..668b9dbc 100644 --- a/src/main/java/crazypants/util/BlockCoord.java +++ b/src/main/java/crazypants/util/BlockCoord.java @@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -72,11 +73,11 @@ public final class BlockCoord { return (int)Math.ceil(Math.sqrt(dsq)); } - public Block getBlock(World world) { + public Block getBlock(IBlockAccess world) { return world.getBlock(x, y, z); } - public TileEntity getTileEntity(World world) { + public TileEntity getTileEntity(IBlockAccess world) { return world.getTileEntity(x, y, z); }