mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 12:42:36 +00:00
#1159 Painter allows you to paint glowstone with a painted block causing crash
This commit is contained in:
1 parent
2a5ef725fb
commit
3cdc9cb350
12 files changed
+19
-10
No files matched your search
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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 {
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user