diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index c7e8b9fa..2ab0ae01 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -13,6 +13,7 @@ Bugs - #1150 Crash when Farming Station Error trying to plant Pam's Mob Seeds (nb, they don't work, but it wont crash) - #1152 Fluids blocks missing names - #1153 Item conduits crash with invalid item stacks (one without an item assigned) +- #1159 Painter allows you to paint glowstone with a painted block causing crash ------------------------------------------------------ Version 2.1.6 diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java index f0ae0fe3..2ab121be 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java @@ -27,11 +27,12 @@ import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.painter.BasicPainterTemplate; +import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; import crazypants.util.Util; -public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements IResourceTooltipProvider, ITileEntityProvider { +public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements IResourceTooltipProvider, ITileEntityProvider, IPaintedBlock { public static BlockDarkSteelPressurePlate create() { BlockDarkSteelPressurePlate res = new BlockDarkSteelPressurePlate(); diff --git a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java index 80d95314..1c79fbfe 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java @@ -13,8 +13,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.machine.painter.IPaintedBlock; -public class BlockConduitFacade extends Block { +public class BlockConduitFacade extends Block implements IPaintedBlock{ public static BlockConduitFacade create() { BlockConduitFacade result = new BlockConduitFacade(); diff --git a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java index feee9df4..5b26662e 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java @@ -25,7 +25,7 @@ public abstract class BasicPainterTemplate implements IMachineRecipe { return false; } Block block = Util.getBlockFromItemId(paintSource); - if(block == null) { + if(block == null || block instanceof IPaintedBlock) { return false; } if(!Config.allowTileEntitiesAsPaintSource && block instanceof ITileEntityProvider) { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java index 9ee45802..15771b40 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java @@ -26,7 +26,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; -public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvider { +public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvider, IPaintedBlock { public static BlockPaintedCarpet create() { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java index 4f340902..43db8f30 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java @@ -27,7 +27,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; -public class BlockPaintedFence extends BlockFence implements ITileEntityProvider { +public class BlockPaintedFence extends BlockFence implements ITileEntityProvider, IPaintedBlock { public static BlockPaintedFence create() { BlockPaintedFence result = new BlockPaintedFence(); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java index 0fd8727f..efb68133 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java @@ -26,7 +26,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; -public class BlockPaintedFenceGate extends BlockFenceGate implements ITileEntityProvider { +public class BlockPaintedFenceGate extends BlockFenceGate implements ITileEntityProvider, IPaintedBlock { public static int renderId; diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index b0ccfe5a..f6d08a89 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -32,7 +32,7 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.util.Lang; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -public class BlockPaintedGlowstone extends Block implements ITileEntityProvider { +public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, IPaintedBlock { public static int renderId = -1; diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java index 6c763ad4..b0d1e6b5 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java @@ -28,7 +28,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; -public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider { +public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, IPaintedBlock { private IIcon lastRemovedComponetIcon = null; diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java index ae58c081..24068076 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java @@ -26,7 +26,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; -public class BlockPaintedStair extends BlockStairs implements ITileEntityProvider { +public class BlockPaintedStair extends BlockStairs implements ITileEntityProvider, IPaintedBlock { public static BlockPaintedStair create() { BlockPaintedStair result = new BlockPaintedStair(); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java index e8667726..beac76b6 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java @@ -25,7 +25,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; -public class BlockPaintedWall extends BlockWall implements ITileEntityProvider { +public class BlockPaintedWall extends BlockWall implements ITileEntityProvider, IPaintedBlock { public static BlockPaintedWall create() { BlockPaintedWall result = new BlockPaintedWall(); diff --git a/src/main/java/crazypants/enderio/machine/painter/IPaintedBlock.java b/src/main/java/crazypants/enderio/machine/painter/IPaintedBlock.java new file mode 100644 index 00000000..f34f374f --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/painter/IPaintedBlock.java @@ -0,0 +1,6 @@ +package crazypants.enderio.machine.painter; + +//Marker interface to prevent a painted block being used as a paint source +public interface IPaintedBlock { + +}