diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 47fc4367..9a85531c 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -107,7 +107,7 @@ import crazypants.enderio.machine.power.BlockCapacitorBank; import crazypants.enderio.machine.power.CapBankRenderer2; import crazypants.enderio.machine.power.CapacitorBankRenderer; import crazypants.enderio.machine.ranged.RangeEntity; -import crazypants.enderio.machine.ranged.RangeRenerer; +import crazypants.enderio.machine.ranged.RangeRenderer; import crazypants.enderio.machine.reservoir.ReservoirRenderer; import crazypants.enderio.machine.reservoir.TileReservoir; import crazypants.enderio.machine.solar.BlockSolarPanel; @@ -419,7 +419,7 @@ public class ClientProxy extends CommonProxy { FMLCommonHandler.instance().bus().register(KeyTracker.instance); RenderingRegistry.registerEntityRenderingHandler(SoundEntity.class, new SoundRenderer()); - RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenerer()); + RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenderer()); MinecraftForge.EVENT_BUS.register(SoundDetector.instance); FMLCommonHandler.instance().bus().register(SoundDetector.instance); diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index c171a918..ce477072 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.farm; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -10,9 +12,11 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; +import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; @@ -20,11 +24,42 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; public class GuiFarmStation extends GuiPoweredMachineBase { + private static final int RANGE_ID = 8738924; private static final int LOCK_ID = 1234; + private final ToggleButton showRangeB; + public GuiFarmStation(InventoryPlayer par1InventoryPlayer, TileFarmStation machine) { super(machine, new FarmStationContainer(par1InventoryPlayer, machine), "farmStation"); + + int x = getXSize() - 5 - BUTTON_SIZE / 2; + int y = getGuiTop() + 5; + getRedstoneBtn().setPosition(x, y); + + y += BUTTON_SIZE + 2; + getConfigBtn().setPosition(x, y); + + y += BUTTON_SIZE + 2; + showRangeB = new ToggleButton(this, RANGE_ID, x, y, IconEIO.PLUS, IconEIO.MINUS); + showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + + @Override + public List getToolTipText() { + return Lists.newArrayList( + EnderIO.lang.localize( + showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); + setYSize(ySize + 3); + setXSize(xSize + 8); + + } + + @Override + protected int getPowerU() { + return 184; } @SuppressWarnings("unchecked") @@ -32,6 +67,9 @@ public class GuiFarmStation extends GuiPoweredMachineBase { public void initGui() { super.initGui(); + showRangeB.onGuiInit(); + showRangeB.setSelected(getTileEntity().isShowingRange()); + int x = getGuiLeft() + 36; int y = getGuiTop() + 43; @@ -94,7 +132,10 @@ public class GuiFarmStation extends GuiPoweredMachineBase { protected void actionPerformed(GuiButton b) { if (b.id >= LOCK_ID + TileFarmStation.minSupSlot && b.id <= LOCK_ID + TileFarmStation.maxSupSlot) { getTileEntity().toggleLockedState(b.id - LOCK_ID); + } else if (b.id == RANGE_ID) { + getTileEntity().setShowRange(showRangeB.isSelected()); } + super.actionPerformed(b); } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 6a8203d6..fc2688e4 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -15,12 +15,17 @@ import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +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; @@ -32,13 +37,52 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.farm.farmers.FarmersCommune; import crazypants.enderio.machine.farm.farmers.IHarvestResult; import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; +import crazypants.enderio.machine.ranged.IRanged; +import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.tool.ArrayMappingTool; -public class TileFarmStation extends AbstractPoweredTaskEntity { +public class TileFarmStation extends AbstractPoweredTaskEntity implements IRanged { private static final int TICKS_PER_WORK = 20; + private boolean showingRange; + + @Override + public World getWorld() { + return worldObj; + } + + @Override + public AxisAlignedBB getBounds() { + return null; + } + + @Override + public Vector3d getRange() { + return new Vector3d(getFarmSize(), 0, getFarmSize()); + } + + @Override + public boolean isShowingRange() { + return showingRange; + } + + @SideOnly(Side.CLIENT) + public void setShowRange(boolean showRange) { + if (showingRange == showRange) { + return; + } + showingRange = showRange; + if (showingRange) { + worldObj.spawnEntityInWorld(new RangeEntity(this)); + } + } + + @Override + public int getColor() { + return 0x66FFAA00; + } public enum ToolType { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index ca84331b..2747d8e2 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; @@ -211,4 +212,12 @@ public abstract class GuiMachineBase extends Gu } return 0; } + + protected RedstoneModeButton getRedstoneBtn() { + return redstoneButton; + } + + protected ToggleButton getConfigBtn() { + return configB; + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index de3dc179..b5f018bc 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.killera; import java.awt.Rectangle; +import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; @@ -8,9 +9,11 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.button.IconButton; +import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.SoundUtil; +import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; @@ -23,6 +26,9 @@ import crazypants.enderio.xp.PacketGivePlayerXP; public class GuiKillerJoe extends GuiMachineBase { + private static final int RANGE_ID = 8738924; + private final ToggleButton showRangeB; + private static final int XP_ID = 3489; private static final int XP10_ID = 34892; @@ -32,6 +38,18 @@ public class GuiKillerJoe extends GuiMachineBase { public GuiKillerJoe(InventoryPlayer inventory, final TileKillerJoe tileEntity) { super(tileEntity, new ContainerKillerJoe(inventory, tileEntity), "killerJoe"); + showRangeB = new ToggleButton(this, RANGE_ID, 155, 24 + 18, IconEIO.PLUS, IconEIO.MINUS); + showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + + @Override + public List getToolTipText() { + return Lists.newArrayList( + EnderIO.lang.localize( + showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); + addToolTip(new GuiToolTip(new Rectangle(18, 11, 15, 47), "") { @Override @@ -46,11 +64,17 @@ public class GuiKillerJoe extends GuiMachineBase { } }); - xpB = new IconButton(this, XP_ID, 128, 56, IconEIO.XP); - xpB.setToolTip(EnderIO.lang.localize("killerJoe.giveXp.tooltip")); + int size = 14; + int x = guiLeft + 56 + (65 / 2); + int y = guiTop + 62 + 6; - xp10B = new IconButton(this, XP10_ID, 148, 56, IconEIO.XP_PLUS); + xpB = new IconButton(this, XP_ID, x - 16, y, IconEIO.XP); + xpB.setToolTip(EnderIO.lang.localize("killerJoe.giveXp.tooltip")); + xpB.setSize(size, size); + + xp10B = new IconButton(this, XP10_ID, x + 2, y, IconEIO.XP_PLUS); xp10B.setToolTip(EnderIO.lang.localize("killerJoe.giveXp10.tooltip")); + xp10B.setSize(size, size); } @Override @@ -58,6 +82,9 @@ public class GuiKillerJoe extends GuiMachineBase { super.initGui(); xpB.onGuiInit(); xp10B.onGuiInit(); + + showRangeB.onGuiInit(); + showRangeB.setSelected(getTileEntity().isShowingRange()); ((ContainerKillerJoe) inventorySlots).createGhostSlots(getGhostSlots()); } @@ -70,6 +97,8 @@ public class GuiKillerJoe extends GuiMachineBase { } else if (b.id == XP10_ID) { PacketHandler.INSTANCE.sendToServer(new PacketGivePlayerXP(getTileEntity(), 10)); SoundUtil.playClientSoundFX("random.orb", getTileEntity()); + } else if (b.id == RANGE_ID) { + getTileEntity().setShowRange(showRangeB.isSelected()); } } diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index eec20cfb..4874082c 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; @@ -39,6 +40,8 @@ import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +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; @@ -47,6 +50,8 @@ import crazypants.enderio.machine.FakePlayerEIO; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.zombie.IHasNutrientTank; import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; +import crazypants.enderio.machine.ranged.IRanged; +import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.machine.wireless.WirelessChargedLocation; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.SmartTank; @@ -56,7 +61,46 @@ import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.XpUtil; public class TileKillerJoe extends AbstractMachineEntity - implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess, IHasNutrientTank { + implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess, IHasNutrientTank, IRanged { + + private boolean showingRange; + + @Override + public World getWorld() { + return worldObj; + } + + @Override + public AxisAlignedBB getBounds() { + return getKillBounds(); + } + + @Override + public Vector3d getRange() { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isShowingRange() { + return showingRange; + } + + @SideOnly(Side.CLIENT) + public void setShowRange(boolean showRange) { + if (showingRange == showRange) { + return; + } + showingRange = showRange; + if (showingRange) { + worldObj.spawnEntityInWorld(new RangeEntity(this)); + } + } + + @Override + public int getColor() { + return 0x66FF0000; + } public static class ZombieCache { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index b6ef350b..cb19c2c5 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -67,7 +67,7 @@ public class GuiAttractor extends GuiPoweredMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); - int range = (int) getTileEntity().getRange(); + int range = (int) getTileEntity().getRange().x; drawCenteredString( fontRendererObj, EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java index faff1999..136b7de6 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java @@ -61,8 +61,13 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange } @Override - public float getRange() { - return range; + public AxisAlignedBB getBounds() { + return null; + } + + @Override + public Vector3d getRange() { + return new Vector3d(range, range, range); } @Override @@ -71,6 +76,11 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange return showingRange; } + @Override + public int getColor() { + return 0x66FFFFFF; + } + @SideOnly(Side.CLIENT) public void setShowRange(boolean showRange) { if (showingRange == showRange) { @@ -317,8 +327,7 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange ent.faceEntity(getTarget(), 10.0F, 20.0F); return true; } else if (ent instanceof EntitySilverfish) { - PathEntity pathentity = worldObj - .getPathEntityToEntity(ent, getTarget(), getRange(), true, false, false, true); + PathEntity pathentity = worldObj.getPathEntityToEntity(ent, getTarget(), range, true, false, false, true); ((EntityCreature) ent).setPathToEntity(pathentity); return true; } else if (ent instanceof EntityBlaze) { @@ -339,8 +348,7 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange return; } EntitySilverfish sf = (EntitySilverfish) ent; - PathEntity pathentity = worldObj - .getPathEntityToEntity(ent, getTarget(), getRange(), true, false, false, true); + PathEntity pathentity = worldObj.getPathEntityToEntity(ent, getTarget(), range, true, false, false, true); sf.setPathToEntity(pathentity); } else if (ent instanceof EntityBlaze) { EntityBlaze mob = (EntityBlaze) ent; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index 1c9c4c5e..32d4dee4 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -58,7 +58,7 @@ public class GuiAversionObelisk extends GuiPoweredMachineBase> 16 & 255) / 255.0F, (float) (this.color >> 8 & 255) / 255.0F, + (float) (this.color & 255) / 255.0F, (float) (this.color >> 24 & 255) / 255.0F }; + } } diff --git a/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java b/src/main/java/crazypants/enderio/machine/ranged/RangeRenderer.java similarity index 58% rename from src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java rename to src/main/java/crazypants/enderio/machine/ranged/RangeRenderer.java index 0aac59e6..4fd4c104 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java +++ b/src/main/java/crazypants/enderio/machine/ranged/RangeRenderer.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.ranged; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderEntity; import net.minecraft.entity.Entity; +import net.minecraft.util.AxisAlignedBB; import org.lwjgl.opengl.GL11; @@ -10,17 +11,19 @@ import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.IconUtil; import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RangeRenerer extends RenderEntity { +public class RangeRenderer extends RenderEntity { @Override public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { RangeEntity se = ((RangeEntity) entity); + AxisAlignedBB rangeBB = se.getBoundingBox(); final Tessellator tessellator = Tessellator.instance; GL11.glPushAttrib(GL11.GL_ENABLE_BIT); @@ -30,21 +33,29 @@ public class RangeRenerer extends RenderEntity { 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; + Vector3d translate = new Vector3d( + -(se.posX - rangeBB.minX + 0.01), + -(se.posY - rangeBB.minY + 0.01), + -(se.posZ - rangeBB.minZ + 0.01)); + + Vector3d scale = new Vector3d( + 1 - (se.lifeSpan / (float) se.totalLife), + 1 - (se.lifeSpan / (float) se.totalLife), + rangeBB.maxZ - rangeBB.minZ); + + scale.x = Math.min(scale.x, 1); + scale.y = Math.min(scale.y, 1); + + scale.x *= (rangeBB.maxX - rangeBB.minX); + scale.y *= (rangeBB.maxY - rangeBB.minY); 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); - + GL11.glColor4f(se.getColor()[0], se.getColor()[1], se.getColor()[2], se.getColor()[3]); RenderUtil.bindBlockTexture(); tessellator.startDrawingQuads(); + GL11.glTranslated(x, y, z); + GL11.glTranslated(translate.x, translate.y, translate.z); + GL11.glScaled(scale.x, scale.y, scale.z); tessellator.setBrightness(15 << 20 | 15 << 4); CubeRenderer.get().render(BoundingBox.UNIT_CUBE, IconUtil.whiteTexture); tessellator.draw(); diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index 23a06b9a..b210b5a8 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.spawner; import java.awt.Color; import java.awt.Rectangle; +import java.util.List; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -10,22 +11,40 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; +import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; +import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; public class GuiPoweredSpawner extends GuiPoweredMachineBase { + private static final int RANGE_ID = 8738924; private final MultiIconButton modeB; private final Rectangle progressTooltipRect; + private final ToggleButton showRangeB; private boolean wasSpawnMode; private String header; public GuiPoweredSpawner(InventoryPlayer par1InventoryPlayer, TilePoweredSpawner te) { super(te, new ContainerPoweredSpawner(par1InventoryPlayer, te), "poweredSpawner"); + showRangeB = new ToggleButton(this, RANGE_ID, 155, 24 + 18, IconEIO.PLUS, IconEIO.MINUS); + showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + + @Override + public List getToolTipText() { + return Lists.newArrayList( + EnderIO.lang.localize( + showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); + modeB = MultiIconButton.createRightArrowButton(this, 8888, 115, 10); modeB.setSize(10, 16); @@ -38,6 +57,8 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase @Override public void initGui() { super.initGui(); + showRangeB.onGuiInit(); + showRangeB.setSelected(getTileEntity().isShowingRange()); modeB.onGuiInit(); ((ContainerPoweredSpawner) inventorySlots).createGhostSlots(getGhostSlots()); } @@ -47,9 +68,9 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase if (par1GuiButton == modeB) { getTileEntity().setSpawnMode(!getTileEntity().isSpawnMode()); PacketHandler.INSTANCE.sendToServer(new PacketMode(getTileEntity())); - } else { - super.actionPerformed(par1GuiButton); - } + } else if (par1GuiButton.id == RANGE_ID) { + getTileEntity().setShowRange(showRangeB.isSelected()); + } else super.actionPerformed(par1GuiButton); } private void updateSpawnMode(boolean spawnMode) { diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index e9422803..d2d5795a 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -7,7 +7,12 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; +import com.enderio.core.common.vecmath.Vector3d; + +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; @@ -16,11 +21,13 @@ import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.PoweredTask; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.ranged.IRanged; +import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -public class TilePoweredSpawner extends AbstractPoweredTaskEntity { +public class TilePoweredSpawner extends AbstractPoweredTaskEntity implements IRanged { public static final int MIN_SPAWN_DELAY_BASE = Config.poweredSpawnerMinDelayTicks; public static final int MAX_SPAWN_DELAY_BASE = Config.poweredSpawnerMaxDelayTicks; @@ -94,6 +101,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { private boolean isSpawnMode = true; private int powerUsePerTick; private int remainingSpawnTries; + private boolean showingRange; public TilePoweredSpawner() { super(new SlotDefinition(1, 1, 1)); @@ -178,6 +186,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { basePowerUse = POWER_PER_TICK_TEN; break; } + double multiplier = PoweredSpawnerConfig.getInstance().getCostMultiplierFor(getEntityName()); setCapacitor( new BasicCapacitor( @@ -375,4 +384,41 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { public boolean hasEntityName() { return !NULL_ENTITY_NAME.equals(entityTypeName); } + + @Override + public World getWorld() { + return worldObj; + } + + @Override + public AxisAlignedBB getBounds() { + return null; + } + + @Override + public Vector3d getRange() { + int range = Config.poweredSpawnerSpawnRange - 1; + return new Vector3d(range, 1, range); + } + + @Override + public boolean isShowingRange() { + return showingRange; + } + + @SideOnly(Side.CLIENT) + public void setShowRange(boolean showRange) { + if (showingRange == showRange) { + return; + } + showingRange = showRange; + if (showingRange) { + worldObj.spawnEntityInWorld(new RangeEntity(this)); + } + } + + @Override + public int getColor() { + return 0x66FF0000; + } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index 0f38936d..01894b84 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.vacuum; import java.awt.Color; import java.awt.Rectangle; +import java.util.List; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -18,6 +19,7 @@ import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.EnderWidget; import com.enderio.core.common.util.BlockCoord; +import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.item.filter.ItemFilter; @@ -28,6 +30,7 @@ import crazypants.enderio.network.PacketHandler; public class GuiVacuumChest extends GuiContainerBaseEIO { + private static final int RANGE_ID = 8738924; private static final int RANGE_LEFT = 145; private static final int RANGE_TOP = 86; private static final int RANGE_WIDTH = 16; @@ -43,6 +46,7 @@ public class GuiVacuumChest extends GuiContainerBaseEIO { private final TileVacuumChest te; + private final ToggleButton showRangeB; private final GuiToolTip rangeTooltip; private final MultiIconButton rangeUpB; private final MultiIconButton rangeDownB; @@ -75,6 +79,18 @@ public class GuiVacuumChest extends GuiContainerBaseEIO { y = 104; rsB = new RedstoneModeButton(this, ID_REDSTONE, x, y, te, new BlockCoord(te)); + showRangeB = new ToggleButton(this, RANGE_ID, x - 18, y, IconEIO.PLUS, IconEIO.MINUS); + showRangeB.setSize(16, 16); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + + @Override + public List getToolTipText() { + return Lists.newArrayList( + EnderIO.lang.localize( + showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); + x = FILTER_LEFT + TileVacuumChest.FILTER_SLOTS * 18 + 2; y = 86; whiteListB = new ToggleButton(this, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST, IconEIO.FILTER_BLACKLIST); @@ -110,6 +126,8 @@ public class GuiVacuumChest extends GuiContainerBaseEIO { public void initGui() { super.initGui(); + showRangeB.onGuiInit(); + showRangeB.setSelected(te.isShowingRange()); rangeUpB.onGuiInit(); rangeDownB.onGuiInit(); rsB.onGuiInit(); @@ -124,11 +142,13 @@ public class GuiVacuumChest extends GuiContainerBaseEIO { ItemFilter itemFilter; switch (guiButton.id) { case ID_RANGE_UP: - setRange(te.getRange() + 1); + setRange((int) te.getRange().x + 1); break; case ID_RANGE_DOWN: - setRange(te.getRange() - 1); + setRange((int) te.getRange().x - 1); break; + case RANGE_ID: + te.setShowRange(showRangeB.isSelected()); case ID_WHITELIST: itemFilter = te.getItemFilter(); if (itemFilter != null) { @@ -193,7 +213,7 @@ public class GuiVacuumChest extends GuiContainerBaseEIO { fr.drawString(headerInventory, sx + 7, sy + 111, headerColor); IconEIO.map.render(EnderWidget.BUTTON_DOWN, sx + RANGE_LEFT, sy + RANGE_TOP, RANGE_WIDTH, 16, 0, true); - String str = Integer.toString(te.getRange()); + String str = Integer.toString((int) te.getRange().x); int sw = fr.getStringWidth(str); fr.drawString(str, sx + RANGE_LEFT + RANGE_WIDTH - sw - 5, sy + RANGE_TOP + 5, ColorUtil.getRGB(Color.black)); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index 8d892519..ca6a5eed 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -13,10 +13,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; @@ -26,8 +30,11 @@ import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.config.Config; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.machine.ranged.IRanged; +import crazypants.enderio.machine.ranged.RangeEntity; -public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory, IRedstoneModeControlable { +public class TileVacuumChest extends TileEntityEio + implements IEntitySelector, IInventory, IRedstoneModeControlable, IRanged { public static final int ITEM_ROWS = 3; public static final int ITEM_SLOTS = 9 * ITEM_ROWS; @@ -42,6 +49,8 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I protected boolean redstoneCheckPassed; private boolean redstoneStateDirty = true; + private boolean showingRange; + @Override public void doUpdate() { if (redstoneStateDirty) { @@ -226,8 +235,41 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I && itemstack.getItemDamage() == 0; } - public int getRange() { - return range; + @Override + public World getWorld() { + return worldObj; + } + + @Override + public AxisAlignedBB getBounds() { + return null; + } + + @Override + public Vector3d getRange() { + return new Vector3d(range, range, range); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isShowingRange() { + return showingRange; + } + + @Override + public int getColor() { + return 0x660000FF; + } + + @SideOnly(Side.CLIENT) + public void setShowRange(boolean showRange) { + if (showingRange == showRange) { + return; + } + showingRange = showRange; + if (showingRange) { + worldObj.spawnEntityInWorld(new RangeEntity(this)); + } } private int limitRange(int range) { diff --git a/src/main/resources/assets/enderio/textures/gui/23/farmStation.png b/src/main/resources/assets/enderio/textures/gui/23/farmStation.png index 9c6c9323..e431091c 100644 Binary files a/src/main/resources/assets/enderio/textures/gui/23/farmStation.png and b/src/main/resources/assets/enderio/textures/gui/23/farmStation.png differ