mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 13:10:13 +00:00
Added renderer for showing the range of the 'spawn guard'
This commit is contained in:
1 parent
bae518f577
commit
03fb6f0664
10 files changed
+211
-10
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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_) {
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<BlockCoord, TileSpawnGuard> guards = getGuardsForWorld(evt.world);
|
||||
for(TileSpawnGuard guard : guards.values()) {
|
||||
if(guard.isSpawnPrevented(evt.entityLiving)) {
|
||||
if(guard.isSpawnPrevented(evt.entityLiving)) {
|
||||
evt.setResult(Result.DENY);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user