diff --git a/resources/assets/enderio/textures/blocks/blockBufferCreative.png b/resources/assets/enderio/textures/blocks/blockBufferCreative.png new file mode 100644 index 00000000..687230ab Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockBufferCreative.png differ diff --git a/resources/assets/enderio/textures/blocks/blockBufferItem.png b/resources/assets/enderio/textures/blocks/blockBufferItem.png new file mode 100644 index 00000000..a02ca3b5 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockBufferItem.png differ diff --git a/resources/assets/enderio/textures/blocks/blockBufferOmni.png b/resources/assets/enderio/textures/blocks/blockBufferOmni.png new file mode 100644 index 00000000..abb1cbbc Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockBufferOmni.png differ diff --git a/resources/assets/enderio/textures/blocks/blockBufferPower.png b/resources/assets/enderio/textures/blocks/blockBufferPower.png new file mode 100644 index 00000000..dbb0ce3a Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockBufferPower.png differ diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java index d1f54867..43804c29 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.buffer; import java.util.ArrayList; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,6 +17,7 @@ import com.google.common.collect.Lists; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; @@ -35,10 +37,13 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa res.init(); return res; } - + + private static final String[] textureNames = new String[] { "blockBufferItem", "blockBufferPower", "blockBufferOmni", "blockBufferCreative" }; + @SideOnly(Side.CLIENT) + private IIcon[] textures; + private BlockBuffer() { super(ModObject.blockBuffer, TileBuffer.class); - setBlockTextureName("enderio:blockBuffer"); } @Override @@ -71,22 +76,27 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa protected int getGuiId() { return GuiHandler.GUI_ID_BUFFER; } - + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + textures = new IIcon[textureNames.length]; + for (int i = 0; i < textureNames.length; i++) { + textures[i] = iIconRegister.registerIcon("enderio:" + textureNames[i]); + } + } + @Override protected String getMachineFrontIconKey(boolean active) { - return this.textureName; + return getSideIconKey(active); } @Override - protected String getBackIconKey(boolean active) { - return getMachineFrontIconKey(active); + public IIcon getIcon(int blockSide, int blockMeta) { + return blockSide > 1 ? textures[blockMeta] : super.getIcon(blockSide, blockMeta); } - - @Override - protected String getSideIconKey(boolean active) { - return getMachineFrontIconKey(active); - } - + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { TileEntity te = world.getTileEntity(x, y, z); @@ -94,6 +104,8 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa TileBuffer tef = (TileBuffer) te; if(tef.getSourceBlock() != null) { return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } else if (blockSide > 1){ + return textures[world.getBlockMetadata(x, y, z)]; } } return super.getIcon(world, x, y, z, blockSide);