From b74904c6be7e708e2a86f9dc9eb99ddf811b5dff Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 12 Sep 2014 22:38:04 +0800 Subject: [PATCH] Aversion Oblisk is 'done' --- .../config/SliceAndSpliceRecipes_Core.xml | 14 +++ resources/assets/enderio/lang/en_US.lang | 7 +- .../java/crazypants/enderio/ClientProxy.java | 16 +++- .../crazypants/enderio/config/Config.java | 4 +- .../item/skull/BlockEndermanSkull.java | 35 ++++++- .../item/skull/EndermanSkullRenderer.java | 95 ++++++++++++++++++- .../enderio/item/skull/ItemEndermanSkull.java | 40 ++++++++ .../enderio/machine/MachineRecipes.java | 9 +- .../machine/attractor/AttractorRenderer.java | 74 ++++++++++++++- .../machine/attractor/BlockAttractor.java | 6 ++ .../spawnguard/SpawnGuardRenderer.java | 28 ++++++ 11 files changed, 311 insertions(+), 17 deletions(-) create mode 100644 src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java create mode 100644 src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardRenderer.java diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml index 06d7b458..5883aba0 100644 --- a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml +++ b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml @@ -29,6 +29,20 @@ + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 6376f3b5..4d0c1117 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -88,6 +88,9 @@ enderio.binderComposite.name=Binder Composite enderio.phasedIronNugget.name=Pulsating Iron Nugget tile.blockDarkIronBars.name=Dark Iron Bars tile.blockEndermanSkull.name=Enderman Skull +tile.blockEndermanSkull.base.name=Enderman Head +tile.blockEndermanSkull.reanimated.name=Reanimated Enderman Head +tile.blockEndermanSkull.tormented.name=Tormented Enderman Head enderio.blastResistant=Blast Resistant enderio.lightEmitter=Emits Light @@ -331,13 +334,13 @@ tile.blockSoulBinder.name=Soul Binder tile.blockSoulBinder.tooltip.detailed.line1=Used to convert the type of tile.blockSoulBinder.tooltip.detailed.line2=a broken spawner -tile.blockAttractor.name=Attractor +tile.blockAttractor.name=Attractor Obelisk tile.blockAttractor.tooltip.detailed.line1=Draws mobs towards it tile.blockAttractor.tooltip.detailed.line2=Specify the mobs to effect tile.blockAttractor.tooltip.detailed.line3=by placing their souls tile.blockAttractor.tooltip.detailed.line4=within the device -tile.blockSpawnGuard.name=Aversion +tile.blockSpawnGuard.name=Aversion Obelisk tile.blockSpawnGuard.tooltip.detailed.line1=Prevents mobs from spawning tile.blockSpawnGuard.tooltip.detailed.line2=within its area of effect diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 275d7849..17878969 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; @@ -89,8 +90,11 @@ import crazypants.enderio.machine.reservoir.TileReservoir; import crazypants.enderio.machine.soul.BlockSoulBinder; import crazypants.enderio.machine.soul.SoulBinderRenderer; import crazypants.enderio.machine.spawner.BrokenSpawnerRenderer; +import crazypants.enderio.machine.spawnguard.BlockSpawnGuard; import crazypants.enderio.machine.spawnguard.RangeEntity; import crazypants.enderio.machine.spawnguard.RangeRenerer; +import crazypants.enderio.machine.spawnguard.SpawnGuardRenderer; +import crazypants.enderio.machine.spawnguard.TileSpawnGuard; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRenderer; import crazypants.enderio.machine.tank.TankFluidRenderer; @@ -102,6 +106,7 @@ import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FusedQuartzFrameRenderer; import crazypants.enderio.material.FusedQuartzRenderer; import crazypants.enderio.material.MachinePartRenderer; +import crazypants.enderio.material.Material; import crazypants.enderio.teleport.BlockTravelAnchor; import crazypants.enderio.teleport.TileTravelAnchor; import crazypants.enderio.teleport.TravelController; @@ -213,6 +218,13 @@ public class ClientProxy extends CommonProxy { AttractorRenderer attRen = new AttractorRenderer(); RenderingRegistry.registerBlockHandler(attRen); ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAttractor), attRen); + + + SpawnGuardRenderer sgr = new SpawnGuardRenderer(); + BlockSpawnGuard.renderId = BlockAttractor.renderId; + ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnGuard.class, sgr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr); if(Config.useCombustionGenModel) { @@ -298,7 +310,9 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileTravelAnchor.class, new TravelEntitySpecialRenderer()); BlockEndermanSkull.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new EndermanSkullRenderer()); + EndermanSkullRenderer esk = new EndermanSkullRenderer(); + RenderingRegistry.registerBlockHandler(esk); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEndermanSkull), esk); conduitRenderers.add(RedstoneSwitchRenderer.getInstance()); conduitRenderers.add(new AdvancedLiquidConduitRenderer()); diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index dfa581be..e62f7f10 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -296,9 +296,9 @@ public final class Config { public static int attractorRangeLevelThree = 64; public static int attractorPowerPerTickLevelThree = 80; - public static int spawnGuardRangeLevelOne = 32; + public static int spawnGuardRangeLevelOne = 48; public static int spawnGuardPowerPerTickLevelOne = 80; - public static int spawnGuardRangeLevelTwo = 64; + public static int spawnGuardRangeLevelTwo = 76; public static int spawnGuardPowerPerTickLevelTwo = 300; public static int spawnGuardRangeLevelThree = 128; public static int spawnGuardPowerPerTickLevelThree = 1000; diff --git a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java index b6927519..c50cfd8c 100644 --- a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java @@ -1,8 +1,10 @@ package crazypants.enderio.item.skull; import java.util.ArrayList; +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.BlockEio; @@ -12,6 +14,7 @@ import crazypants.enderio.machine.AbstractMachineEntity; import net.minecraft.block.BlockSkull; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -30,6 +33,23 @@ public class BlockEndermanSkull extends BlockEio { public static int renderId = -1; + public enum SkullType { + + BASE("base",false), + REANIMATED("reanimated",true), + TORMENTED("tormented",false), + REANIMATED_TORMENTED("reanimatedTormented",true); + + final String name; + final boolean showEyes; + + + SkullType(String name, boolean showEyes) { + this.name = name; + this.showEyes = showEyes; + } + } + public static BlockEndermanSkull create() { BlockEndermanSkull res = new BlockEndermanSkull(); res.init(); @@ -45,6 +65,16 @@ public class BlockEndermanSkull extends BlockEio { super(ModObject.blockEndermanSkull.unlocalisedName, TileEndermanSkull.class, Material.circuits); setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); } + + + + @Override + protected void init() { + GameRegistry.registerBlock(this, ItemEndermanSkull.class, name); + GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + } + + @Override public void registerBlockIcons(IIconRegister iIconRegister) { @@ -59,7 +89,8 @@ public class BlockEndermanSkull extends BlockEio { public IIcon getIcon(int side, int meta) { ForgeDirection orint = ForgeDirection.getOrientation(side); if(orint == ForgeDirection.NORTH) { - return meta == 0 ? frontIcon : frontIconEyes; + meta = MathHelper.clamp_int(meta, 0, SkullType.values().length - 1); + return SkullType.values()[meta].showEyes ? frontIconEyes : frontIcon; } if(orint == ForgeDirection.UP || orint == ForgeDirection.DOWN || orint == ForgeDirection.SOUTH) { return topIcon; @@ -94,7 +125,9 @@ public class BlockEndermanSkull extends BlockEio { if(world.isRemote) { return; } + world.setBlockMetadataWithNotify(x, y, z, stack.getItemDamage(), 2); world.markBlockForUpdate(x, y, z); } + } diff --git a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java index 13d912ab..a5fe415a 100644 --- a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java +++ b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java @@ -8,6 +8,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.machine.generator.zombie.TileZombieGenerator; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; +import crazypants.render.IconUtil; import crazypants.render.RenderUtil; import crazypants.render.VertexRotation; import crazypants.vecmath.Vector3d; @@ -21,25 +22,39 @@ import net.minecraft.client.renderer.entity.RenderEnderman; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; -public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler { +public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { public EndermanSkullRenderer() { } @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + System.out.println("EndermanSkullRenderer.renderInventoryBlock: "); + renderWorldBlock(null, 0, 0, 0, block, modelId, renderer); } + @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + int meta = 0; + if(world != null) { + meta = world.getBlockMetadata(x, y, z); + } + return renderWorldBlock(world, x, y, z, block, modelId, renderer, meta); + } + + + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer, int meta) { Tessellator tes = Tessellator.instance; tes.addTranslation(x, y, z); tes.setColorOpaque_F(1, 1, 1); @@ -55,10 +70,10 @@ public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler { IIcon[] icons = new IIcon[6]; for(int i=0;i 1) { + renderBolts(rot, size); + } + + tes.addTranslation(-x, -y, -z); return true; } + private void renderBolts(VertexRotation rot, float size) { + BoundingBox bb; + float boltSize = size/3; + BoundingBox baseBolt = BoundingBox.UNIT_CUBE.scale(boltSize ,boltSize , boltSize); + IIcon icon = EnderIO.blockSoulFuser.getIcon(ForgeDirection.EAST.ordinal(), 0); + + float offset = 0.15f; + bb = baseBolt.translate(size + boltSize/2, -0.15f, offset); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate(size + boltSize/2, -0.15f, -offset); + CubeRenderer.render(bb, icon, rot, true); + + bb = baseBolt.translate( -(size + boltSize/2), -0.15f, offset); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate( -(size + boltSize/2), -0.15f, -offset); + CubeRenderer.render(bb, icon, rot, true); + + + bb = baseBolt.translate( -offset, -0.15f, -(size + boltSize/2)); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate( offset, -0.15f, -(size + boltSize/2)); + CubeRenderer.render(bb, icon, rot, true); + + bb = baseBolt.translate( offset, -0.15f, (size + boltSize/2)); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate( -offset, -0.15f, (size + boltSize/2)); + CubeRenderer.render(bb, icon, rot, true); + } + @Override public boolean shouldRender3DInInventory(int modelId) { - return false; + return true; } @Override public int getRenderId() { return BlockEndermanSkull.renderId; } - + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + Tessellator.instance.startDrawingQuads(); + GL11.glPushMatrix(); + float scale = 2.5f; + float xTrans = -0.5f; + float yTrans = 0; + float zTrans = -0.5f; + if(type == ItemRenderType.INVENTORY) { + yTrans = -0.25f; + scale = 1.8f; + } else if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + scale = 1.8f; + yTrans = 0f; + zTrans = -0.25f; + xTrans = -0.25f; + } + GL11.glScalef(scale, scale, scale); + GL11.glTranslatef(xTrans, yTrans, zTrans); + RenderUtil.bindBlockTexture(); + renderWorldBlock(null, 0, 0, 0, EnderIO.blockEndermanSkull, getRenderId(), (RenderBlocks)data[0], item.getItemDamage()); + + Tessellator.instance.draw(); + GL11.glPopMatrix(); + + } } diff --git a/src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java new file mode 100644 index 00000000..39c22fd8 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java @@ -0,0 +1,40 @@ +package crazypants.enderio.item.skull; + +import java.util.List; + +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType; +import crazypants.enderio.material.BlockFusedQuartz; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBlockWithMetadata; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class ItemEndermanSkull extends ItemBlockWithMetadata { + + public ItemEndermanSkull(Block block) { + super(block, block); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int meta = par1ItemStack.getItemDamage(); + meta = MathHelper.clamp_int(meta, 0, SkullType.values().length - 1); + return "tile.blockEndermanSkull." + SkullType.values()[meta].name; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < SkullType.values().length; ++j) { + if(!SkullType.values()[j].showEyes) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + } + +} diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index b7b4e188..19dd9997 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -13,6 +13,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.enderio.item.skull.BlockEndermanSkull; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.MachinePart; @@ -206,11 +207,17 @@ public class MachineRecipes { ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser); GameRegistry.addShapedRecipe(soulBinder, "ses", "zmc","sks", 's', soularium, 'm', machineChassi, 'e', enderBit, 'z', zombieSkull, 'c', creeperSkull, 'k', skeletonSkull); + //Attractor ItemStack attractor = new ItemStack(EnderIO.blockAttractor); ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); GameRegistry - .addShapedRecipe(attractor, " c ", "sss", "sms", 's', soularium, 'm', machineChassi, 'c', attractorCrystal); + .addShapedRecipe(attractor, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', attractorCrystal, 'e', energeticAlloy); + //Aversion + ItemStack aversion = new ItemStack(EnderIO.blockSpawnGuard); + ItemStack tormentedEnderman = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); + GameRegistry + .addShapedRecipe(aversion, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', tormentedEnderman, 'e', energeticAlloy); ClearConfigRecipe inst = new ClearConfigRecipe(); MinecraftForge.EVENT_BUS.register(inst); diff --git a/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java b/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java index c2de73b2..ca6297fa 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java @@ -1,13 +1,17 @@ package crazypants.enderio.machine.attractor; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -15,6 +19,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -26,20 +33,69 @@ import crazypants.enderio.machine.killera.TileKillerJoe; import crazypants.enderio.material.Material; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; import crazypants.render.VertexTransform; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; import crazypants.vecmath.Vertex; -public class AttractorRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { +public class AttractorRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { private VertXForm xform = new VertXForm(); private VertXForm2 xform2 = new VertXForm2(); + private ItemStack floatingStack; + + public AttractorRenderer() { + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return type != ItemRenderType.INVENTORY; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + if(type == ItemRenderType.INVENTORY) { + + GL11.glPushMatrix(); + GL11.glTranslatef(-2, 3, 0); + GL11.glScalef(10F, 10F, 10F); + GL11.glTranslatef(1.0F, 0.5F, 1.0F); + GL11.glScalef(1.0F, 1.0F, -1F); + GL11.glRotatef(210F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); + + GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); + renderInventoryBlock(EnderIO.blockAttractor, item.getItemDamage(), 0, (RenderBlocks) data[0]); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + float scale = 0.4f; + GL11.glScalef(scale, scale, scale); + GL11.glTranslatef(12, 2f, 0); + RenderItem ri = new RenderItem(); + ri.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().renderEngine, + getFloatingStack(null, 0, 0, 0, 0), 0, 0); + GL11.glPopMatrix(); + GL11.glEnable(GL11.GL_LIGHTING); + } else { + GL11.glTranslatef(0, 0.25f, 0); + GL11.glScalef(1.5f, 1.5f, 1.5f); + renderInventoryBlock(EnderIO.blockAttractor, item.getItemDamage(), 0, (RenderBlocks) data[0]); + } + + } @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - World world = te.getWorldObj(); + World world = te.getWorldObj(); float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); int l1 = l % 65536; @@ -52,7 +108,7 @@ public class AttractorRenderer extends TileEntitySpecialRenderer implements ISim GL11.glPopMatrix(); - EntityItem ei = new EntityItem(world, x, y, z, new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal())); + EntityItem ei = new EntityItem(world, x, y, z, getFloatingStack(te, x, y, z, tick)); ei.age = (int) world.getTotalWorldTime(); //Remove the bob @@ -63,6 +119,13 @@ public class AttractorRenderer extends TileEntitySpecialRenderer implements ISim } + protected ItemStack getFloatingStack(TileEntity te, double x, double y, double z, float tick) { + if(floatingStack == null) { + floatingStack = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); + } + return floatingStack; + } + @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { @@ -71,6 +134,7 @@ public class AttractorRenderer extends TileEntitySpecialRenderer implements ISim renderWorldBlock(null, 0, 0, 0, block, 0, renderer); Tessellator.instance.draw(); GL11.glEnable(GL11.GL_LIGHTING); + } @Override @@ -81,7 +145,7 @@ public class AttractorRenderer extends TileEntitySpecialRenderer implements ISim Tessellator.instance.addTranslation(x, y, z); - IIcon icon = block.getIcon(ForgeDirection.EAST.ordinal(), 0); + IIcon icon = EnderIO.blockAttractor.getOnIcon(); if(world != null) { icon = block.getIcon(world, x, y, z, 0); } @@ -96,7 +160,7 @@ public class AttractorRenderer extends TileEntitySpecialRenderer implements ISim xform2.isX = true; CubeRenderer.render(bb, icon, xform2, true); - Tessellator.instance.addTranslation(-x, -y, -z); + Tessellator.instance.addTranslation(-x, -y, -z); return true; } diff --git a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java index 8fbafdd3..0d7c3378 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java @@ -8,6 +8,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; @@ -35,6 +36,11 @@ public class BlockAttractor extends AbstractMachineBlock { } return null; } + + @SideOnly(Side.CLIENT) + public IIcon getOnIcon() { + return iconBuffer[0][6]; + } @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardRenderer.java b/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardRenderer.java new file mode 100644 index 00000000..dde93333 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardRenderer.java @@ -0,0 +1,28 @@ +package crazypants.enderio.machine.spawnguard; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import crazypants.enderio.EnderIO; +import crazypants.enderio.item.skull.BlockEndermanSkull; +import crazypants.enderio.machine.attractor.AttractorRenderer; + +public class SpawnGuardRenderer extends AttractorRenderer { + + private ItemStack offStack = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); + private ItemStack onStack = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.REANIMATED_TORMENTED.ordinal()); + + @Override + protected ItemStack getFloatingStack(TileEntity te, double x, double y, double z, float tick) { + if(te == null) { + return offStack; + } + TileSpawnGuard sg = (TileSpawnGuard)te; + if(sg.isActive()) { + return onStack; + } + return offStack; + } + + + +}