From 03fb6f066400e93d87b3fa193a191f9e0d5e438b Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 12 Sep 2014 16:51:54 +0800 Subject: [PATCH] Added renderer for showing the range of the 'spawn guard' --- resources/assets/enderio/lang/en_US.lang | 4 ++ .../java/crazypants/enderio/ClientProxy.java | 3 + src/main/java/crazypants/enderio/EnderIO.java | 5 ++ .../machine/attractor/GuiAttractor.java | 10 ++++ .../machine/attractor/TileAttractor.java | 4 ++ .../machine/spawnguard/GuiSpawnGurad.java | 38 +++++++++++- .../machine/spawnguard/RangeEntity.java | 59 +++++++++++++++++++ .../machine/spawnguard/RangeRenerer.java | 54 +++++++++++++++++ .../spawnguard/SpawnGuardController.java | 4 +- .../machine/spawnguard/TileSpawnGuard.java | 40 +++++++++++-- 10 files changed, 211 insertions(+), 10 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/spawnguard/RangeEntity.java create mode 100644 src/main/java/crazypants/enderio/machine/spawnguard/RangeRenerer.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index d26ce75e..6376f3b5 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -633,6 +633,10 @@ enderio.gui.travelAccessable.unauthorised=You are not allowed to access this blo enderio.gui.travelAccessable.enterCode=Access Code Required enderio.gui.travelAccessable.ok=Authorise +//Spawn Gurad +enderio.gui.spawnGurad.showRange=Show Range +enderio.gui.spawnGurad.range=Range: + //conduits enderio.gui.conduit.ioMode=Mode enderio.gui.conduit.ioMode.inOut=In / Out diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index f0183b65..275d7849 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -89,6 +89,8 @@ 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.RangeEntity; +import crazypants.enderio.machine.spawnguard.RangeRenerer; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRenderer; import crazypants.enderio.machine.tank.TankFluidRenderer; @@ -341,6 +343,7 @@ public class ClientProxy extends CommonProxy { KeyTracker.instance.isGlideActive(); RenderingRegistry.registerEntityRenderingHandler(SoundEntity.class, new SoundRenderer()); + RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenerer()); MinecraftForge.EVENT_BUS.register(SoundDetector.instance); FMLCommonHandler.instance().bus().register(SoundDetector.instance); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index c8c4be17..3f869a2a 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -100,6 +100,7 @@ import crazypants.enderio.machine.soul.BlockSoulBinder; import crazypants.enderio.machine.spawner.BlockPoweredSpawner; import crazypants.enderio.machine.spawner.ItemBrokenSpawner; import crazypants.enderio.machine.spawnguard.BlockSpawnGuard; +import crazypants.enderio.machine.spawnguard.RangeEntity; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRecipeManager; import crazypants.enderio.machine.tank.BlockTank; @@ -405,6 +406,10 @@ public class EnderIO { int entityID = EntityRegistry.findGlobalUniqueEntityId(); EntityRegistry.registerGlobalEntityID(SoundEntity.class, "soundEntity", entityID); EntityRegistry.registerModEntity(SoundEntity.class, "soundEntity", entityID, this, 0, 0, false); + + entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(RangeEntity.class, "rangeEntity", entityID); + EntityRegistry.registerModEntity(RangeEntity.class, "rangeEntity", entityID, this, 0, 0, false); FMLInterModComms.sendMessage("Waila", "register", "crazypants.enderio.compat.waila.WailaCompat.load"); } diff --git a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java index da2b8f1d..6f86d658 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.attractor; +import java.awt.Color; + import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; @@ -7,12 +9,17 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.spawner.ContainerPoweredSpawner; import crazypants.enderio.machine.spawner.TilePoweredSpawner; +import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiAttractor extends GuiMachineBase { + private TileAttractor ta; + public GuiAttractor(InventoryPlayer par1InventoryPlayer, TileAttractor te) { super(te, new ContainerAttractor(par1InventoryPlayer, te)); + ta = te; } @Override @@ -25,6 +32,9 @@ public class GuiAttractor extends GuiMachineBase { drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + int range = ta.getRange(); + drawCenteredString(fontRendererObj, Lang.localize("gui.spawnGurad.range") + " " + range, getGuiLeft() + sx/2 + 9, getGuiTop() + 68, ColorUtil.getRGB(Color.white)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java index a45ce516..97d88656 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java @@ -58,6 +58,10 @@ public class TileAttractor extends AbstractMachineEntity { public ICapacitor getCapacitor() { return capacitor; } + + public int getRange() { + return range; + } private void setUpdrade(Capacitors capacitorType) { switch (capacitorType) { diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/GuiSpawnGurad.java b/src/main/java/crazypants/enderio/machine/spawnguard/GuiSpawnGurad.java index 29f6a180..7fceb123 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/GuiSpawnGurad.java +++ b/src/main/java/crazypants/enderio/machine/spawnguard/GuiSpawnGurad.java @@ -1,20 +1,43 @@ package crazypants.enderio.machine.spawnguard; +import java.awt.Color; + +import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.GuiMachineBase; -import crazypants.enderio.machine.attractor.ContainerAttractor; -import crazypants.enderio.machine.attractor.TileAttractor; +import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiSpawnGurad extends GuiMachineBase { + TileSpawnGuard sg; + ToggleButtonEIO showRangeB; + + private static final int RANGE_ID = 8738924; + public GuiSpawnGurad(InventoryPlayer par1InventoryPlayer, TileSpawnGuard te) { super(te, new ContainerSpawnGuard(par1InventoryPlayer, te)); + sg = te; + + int x = getXSize() - 5 - BUTTON_SIZE; + showRangeB = new ToggleButtonEIO(this, RANGE_ID, x, 44, IconEIO.ADD_BUT, IconEIO.ADD_BUT); + showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); + showRangeB.setToolTip(Lang.localize("gui.spawnGurad.showRange")); } + @Override + public void initGui() { + super.initGui(); + showRangeB.onGuiInit(); + showRangeB.setSelected(sg.isShowingRange()); + } + @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -25,6 +48,17 @@ public class GuiSpawnGurad extends GuiMachineBase { drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + int range = sg.getRange(); + drawCenteredString(fontRendererObj, Lang.localize("gui.spawnGurad.range") + " " + range, getGuiLeft() + sx/2 + 9, getGuiTop() + 68, ColorUtil.getRGB(Color.white)); + } + + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if(b.id == RANGE_ID) { + sg.setShowRange(showRangeB.isSelected()); + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/RangeEntity.java b/src/main/java/crazypants/enderio/machine/spawnguard/RangeEntity.java new file mode 100644 index 00000000..8f80c6be --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/spawnguard/RangeEntity.java @@ -0,0 +1,59 @@ +package crazypants.enderio.machine.spawnguard; + +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class RangeEntity extends Entity { + + int totalLife = 80; + int lifeSpan = totalLife; + float range; + private TileSpawnGuard spawnGuard; + + public RangeEntity(TileSpawnGuard sg) { + super(sg.getWorldObj()); + spawnGuard = sg; + setPosition(sg.xCoord + 0.5, sg.yCoord + 0.5, sg.zCoord + 0.5); + ignoreFrustumCheck = true; + this.range = sg.getRange() + 0.5f; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isInRangeToRender3d(double p_145770_1_, double p_145770_3_, double p_145770_5_) { + return true; + } + + @Override + protected void entityInit() { + } + + protected boolean canTriggerWalking() { + return false; + } + + @Override + public AxisAlignedBB getBoundingBox() { + return null; + } + + @Override + public void onUpdate() { + super.onUpdate(); + lifeSpan--; + if(spawnGuard.isInvalid() || !spawnGuard.isShowingRange()) { + setDead(); + } + } + + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { + } + + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { + } +} diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/RangeRenerer.java b/src/main/java/crazypants/enderio/machine/spawnguard/RangeRenerer.java new file mode 100644 index 00000000..a6366ecd --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/spawnguard/RangeRenerer.java @@ -0,0 +1,54 @@ +package crazypants.enderio.machine.spawnguard; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderEntity; +import net.minecraft.entity.Entity; + +import org.lwjgl.opengl.GL11; + +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.IconUtil; +import crazypants.render.RenderUtil; + +public class RangeRenerer extends RenderEntity { + + public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { + + RangeEntity se = ((RangeEntity) entity); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDepthMask(false); + + float scale = 1 - ( se.lifeSpan / (float)se.totalLife); + scale = Math.min(scale, 1); + scale *= se.range; + + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + + GL11.glTranslatef(0.5f,0.5f,0.5f); + GL11.glScalef(scale, scale, scale); + GL11.glTranslatef(-0.5f,-0.5f,-0.5f); + + GL11.glColor4f(1, 1, 1, 0.4f); + + RenderUtil.bindBlockTexture(); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setBrightness(15 << 20 | 15 << 4); + CubeRenderer.render(BoundingBox.UNIT_CUBE, IconUtil.whiteTexture); + Tessellator.instance.draw(); + + RenderUtil.bindItemTexture(); + + GL11.glDepthMask(true); + GL11.glPopAttrib(); + GL11.glPopMatrix(); + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardController.java b/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardController.java index c330fe17..ab5eedb4 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardController.java +++ b/src/main/java/crazypants/enderio/machine/spawnguard/SpawnGuardController.java @@ -18,10 +18,8 @@ import crazypants.util.BlockCoord; public class SpawnGuardController { public static SpawnGuardController instance = new SpawnGuardController(); - static { - FMLCommonHandler.instance().bus().register(SpawnGuardController.instance); MinecraftForge.EVENT_BUS.register(SpawnGuardController.instance); } @@ -50,7 +48,7 @@ public class SpawnGuardController { public void onEntitySpawn(LivingSpawnEvent evt) { Map guards = getGuardsForWorld(evt.world); for(TileSpawnGuard guard : guards.values()) { - if(guard.isSpawnPrevented(evt.entityLiving)) { + if(guard.isSpawnPrevented(evt.entityLiving)) { evt.setResult(Result.DENY); return; } diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/TileSpawnGuard.java b/src/main/java/crazypants/enderio/machine/spawnguard/TileSpawnGuard.java index 20069713..e089bdbb 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/TileSpawnGuard.java +++ b/src/main/java/crazypants/enderio/machine/spawnguard/TileSpawnGuard.java @@ -4,16 +4,19 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Vec3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.wireless.WirelessChargerController; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.vecmath.Vector3d; +import crazypants.render.BoundingBox; public class TileSpawnGuard extends AbstractMachineEntity { @@ -22,10 +25,29 @@ public class TileSpawnGuard extends AbstractMachineEntity { private int range; private int rangeSqu; private boolean registered = false; + private AxisAlignedBB bounds; + + private boolean showingRange; public TileSpawnGuard() { super(new SlotDefinition(12, 0)); - setUpdrade(Capacitors.BASIC_CAPACITOR); + setUpdrade(Capacitors.BASIC_CAPACITOR); + } + + @SideOnly(Side.CLIENT) + public boolean isShowingRange() { + return showingRange; + } + + @SideOnly(Side.CLIENT) + public void setShowRange(boolean showRange) { + if(showingRange == showRange) { + return; + } + this.showingRange = showRange; + if(showingRange) { + worldObj.spawnEntityInWorld(new RangeEntity(this)); + } } @Override @@ -34,6 +56,10 @@ public class TileSpawnGuard extends AbstractMachineEntity { SpawnGuardController.instance.deregisterGuard(this); registered = false; } + + public int getRange() { + return range; + } @Override public void setCapacitor(Capacitors capacitorType) { @@ -64,6 +90,10 @@ public class TileSpawnGuard extends AbstractMachineEntity { } rangeSqu = range * range; capacitor = new BasicCapacitor(powerPerTick * 8, capacitorType.capacitor.getMaxEnergyStored(), powerPerTick); + + BoundingBox bb = new BoundingBox(getLocation()); + bb = bb.scale(range + 0.5f, range + 0.5f, range + 0.5f).translate(0.5f, 0.5f, 0.5f); + bounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); } @Override @@ -132,7 +162,8 @@ public class TileSpawnGuard extends AbstractMachineEntity { if(mob == null) { return false; } - return new Vector3d(mob.posX, mob.posY, mob.posZ).distanceSquared(new Vector3d(xCoord, yCoord, zCoord)) <= rangeSqu; + //return new Vector3d(mob.posX, mob.posY, mob.posZ).distanceSquared(new Vector3d(xCoord, yCoord, zCoord)) <= rangeSqu; + return bounds.isVecInside(Vec3.createVectorHelper(mob.posX, mob.posY, mob.posZ)); } private boolean isMobInFilter(EntityLivingBase ent) { @@ -151,5 +182,4 @@ public class TileSpawnGuard extends AbstractMachineEntity { return false; } - }