From 00a8cb894956315768609bed75e764533abf37b2 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 16 Nov 2014 09:28:49 -0500 Subject: [PATCH] #1232 Painted Glowstone now has connected textures with Chisel Update release notes --- ReleaseNotes.txt | 2 ++ .../painter/BlockPaintedGlowstone.java | 24 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 09d016bb..7ee17a8d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -3,8 +3,10 @@ Version 2.2.1 ------------------------------------------------------ Changes - #1223 Various small GUI- and NEI-related improvements and tweaks (Tonius) +- #1232 Painted Glowstone now implements IFacade and will have connected textures with chisel Bugs +- #1226 Redstone color not showing on MFR machines / BR ports ------------------------------------------------------ Version 2.2.0 diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index f6d08a89..9610e0be 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.painter; +import info.jbcs.minecraft.chisel.api.IFacade; + import java.util.Random; import net.minecraft.block.Block; @@ -32,7 +34,7 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.util.Lang; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, IPaintedBlock { +public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, IPaintedBlock, IFacade { public static int renderId = -1; @@ -269,4 +271,24 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, } } } + + @Override + public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + return tef.getBlockMetadata(); + } + return 0; + } + + @Override + public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + return tef.getSourceBlock(); + } + return this; + } }