diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 39acd2eb..4fba3ef5 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -200,6 +200,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedStair), pir); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedSlab), pir); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedGlowstone), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedCarpet), pir); MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer()); MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer()); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 57a1cd9d..3a0d0124 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -66,6 +66,7 @@ import crazypants.enderio.machine.light.BlockElectricLight; import crazypants.enderio.machine.light.BlockLightNode; import crazypants.enderio.machine.monitor.BlockPowerMonitor; import crazypants.enderio.machine.monitor.ItemConduitProbe; +import crazypants.enderio.machine.painter.BlockPaintedCarpet; import crazypants.enderio.machine.painter.BlockPaintedFence; import crazypants.enderio.machine.painter.BlockPaintedFenceGate; import crazypants.enderio.machine.painter.BlockPaintedGlowstone; @@ -135,6 +136,7 @@ public class EnderIO { public static BlockPaintedSlab blockPaintedSlab; public static BlockPaintedSlab blockPaintedDoubleSlab; public static BlockPaintedGlowstone blockPaintedGlowstone; + public static BlockPaintedCarpet blockPaintedCarpet; // Conduits public static BlockConduitBundle blockConduitBundle; @@ -239,6 +241,7 @@ public class EnderIO { blockPaintedDoubleSlab.init(); blockCrafter = BlockCrafter.create(); blockPaintedGlowstone = BlockPaintedGlowstone.create(); + blockPaintedCarpet = BlockPaintedCarpet.create(); blockHyperCube = BlockHyperCube.create(); blockElectricLight = BlockElectricLight.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 7f4a0343..516ffb94 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -61,6 +61,7 @@ public enum ModObject { blockPaintedSlab, blockPaintedDoubleSlab, blockPaintedGlowstone, + blockPaintedCarpet, itemConduitProbe, itemYetaWrench, diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedCarpet.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedCarpet.java new file mode 100644 index 00000000..ea9123e0 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedCarpet.java @@ -0,0 +1,38 @@ +package crazypants.enderio.machine.painter; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; + +public class BlockItemPaintedCarpet extends ItemBlock { + + public BlockItemPaintedCarpet(Block p_i45328_1_) { + super(p_i45328_1_); + setHasSubtypes(true); + } + + public BlockItemPaintedCarpet() { + super(EnderIO.blockPaintedCarpet); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int par1) { + return par1; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } + + +} diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java new file mode 100644 index 00000000..7275d42f --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java @@ -0,0 +1,256 @@ +package crazypants.enderio.machine.painter; + +import java.util.Collections; +import java.util.List; +import java.util.Random; + +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.ModObject; +import crazypants.enderio.crafting.IEnderIoRecipe; +import crazypants.enderio.crafting.IRecipeInput; +import crazypants.enderio.crafting.IRecipeOutput; +import crazypants.enderio.crafting.impl.EnderIoRecipe; +import crazypants.enderio.crafting.impl.RecipeInputClass; +import crazypants.enderio.crafting.impl.RecipeOutput; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.machine.painter.BlockPaintedGlowstone.PainterTemplate; +import net.minecraft.block.Block; +import net.minecraft.block.BlockCarpet; +import net.minecraft.block.BlockGlowstone; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvider { + + + public static BlockPaintedCarpet create() { + BlockPaintedCarpet result = new BlockPaintedCarpet(); + result.init(); + return result; + } + + private IIcon lastRemovedComponetIcon = null; + + private Random rand = new Random(); + + protected BlockPaintedCarpet() { + setCreativeTab(null); + setBlockName(ModObject.blockPaintedCarpet.unlocalisedName); + } + + private void init() { + GameRegistry.registerBlock(this, BlockItemPaintedCarpet.class, ModObject.blockPaintedCarpet.unlocalisedName); + GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedCarpet.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + public static ItemStack createItemStackForSourceBlock(Block block, int damage) { + ItemStack result = new ItemStack(EnderIO.blockPaintedCarpet, 1, damage); + PainterUtil.setSourceBlock(result, block, damage); + return result; + } + + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if(tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, + EffectRenderer effectRenderer) { + IIcon tex = null; + + TileEntityPaintedBlock cb = (TileEntityPaintedBlock) + world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if(b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + } + if(tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, + target.blockZ, target.sideHit, tex); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int + meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = this.rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, + d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; + + } + + @SideOnly(Side.CLIENT) + private void addBlockHitEffects(World world, EffectRenderer effectRenderer, + int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - + getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); + double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - + getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); + double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - + getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); + if(side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if(side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if(side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if(side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if(side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if(side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, + 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, + z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + + } + + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if(tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityPaintedBlock(); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + Block b = PainterUtil.getSourceBlock(stack); + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + super.onBlockPlacedBy(world, x, y, z, player, stack); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + + if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getTileEntity(x, y, z); + + if(te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } + + } + + world.removeTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + public static final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Blocks.carpet); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if(paintSource == null) { + return new ResultStack[0]; + } + return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + } + + @Override + public List getAllRecipes() { + IRecipeInput input = new RecipeInputClass(new ItemStack(Blocks.carpet), BlockCarpet.class); + IRecipeOutput output = new RecipeOutput(new ItemStack(EnderIO.blockPaintedCarpet, 1, 0)); + IEnderIoRecipe recipe = new EnderIoRecipe(getMachineName(), DEFAULT_ENERGY_PER_TASK, input, output); + return Collections.singletonList(recipe); + } + } + +}