From 8ecc703cdb26b69c95fccbdd70a82ee0697c9f90 Mon Sep 17 00:00:00 2001 From: Henry Loenwind Date: Tue, 5 May 2015 14:14:14 +0200 Subject: [PATCH 01/25] Refactored Tank Classes --- .../generator/zombie/IHasNutrientTank.java | 4 +- .../generator/zombie/NutrientTank.java | 55 ------ .../generator/zombie/TileZombieGenerator.java | 5 +- .../machine/invpanel/GuiInventoryPanel.java | 4 +- .../machine/invpanel/TileInventoryPanel.java | 9 +- .../machine/killera/TileKillerJoe.java | 6 +- .../machine/reservoir/ReservoirRenderer.java | 3 +- .../machine/reservoir/ReservoirTank.java | 66 ------- .../machine/reservoir/TileReservoir.java | 28 +-- .../enderio/machine/tank/FluidTankEio.java | 44 ----- .../machine/tank/TankFluidRenderer.java | 3 +- .../enderio/machine/tank/TileTank.java | 11 +- .../crazypants/enderio/tool/SmartTank.java | 165 ++++++++++++++++++ 13 files changed, 206 insertions(+), 197 deletions(-) delete mode 100644 src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java delete mode 100644 src/main/java/crazypants/enderio/machine/reservoir/ReservoirTank.java delete mode 100644 src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java create mode 100644 src/main/java/crazypants/enderio/tool/SmartTank.java diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java index f803e634..73724fa0 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java @@ -1,7 +1,9 @@ package crazypants.enderio.machine.generator.zombie; +import crazypants.enderio.tool.SmartTank; + public interface IHasNutrientTank { - NutrientTank getNutrientTank(); + SmartTank getNutrientTank(); } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java deleted file mode 100644 index fbe18e69..00000000 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java +++ /dev/null @@ -1,55 +0,0 @@ -package crazypants.enderio.machine.generator.zombie; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import crazypants.enderio.EnderIO; - -public class NutrientTank extends FluidTank { - - public NutrientTank(int capacity) { - super(capacity); - } - - public boolean canFill(Fluid fluid) { - return fluid != null && fluid.getID() == EnderIO.fluidNutrientDistillation.getID(); - } - - @Override - public int fill(FluidStack resource, boolean doFill) { - if(resource == null || !canFill(resource.getFluid())) { - return 0; - } - return super.fill(resource, doFill); - } - - public float getFilledRatio() { - return (float) getFluidAmount() / getCapacity(); - } - - public void setFluidAmount(int amount) { - if(amount > 0) { - setFluid(new FluidStack(EnderIO.fluidNutrientDistillation, Math.min(capacity, amount))); - } else { - setFluid(null); - } - } - - public void writeCommon(String name, NBTTagCompound nbtRoot) { - if(getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - writeToNBT(tankRoot); - nbtRoot.setTag(name, tankRoot); - } - } - - public void readCommon(String name, NBTTagCompound nbtRoot) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag(name); - if(tankRoot != null) { - readFromNBT(tankRoot); - } else { - setFluid(null); - } - } -} diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index 5788eaf1..97e70a3f 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -18,6 +18,7 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.AbstractGeneratorEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerDistributor; +import crazypants.enderio.tool.SmartTank; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; import crazypants.util.ITankAccess; @@ -26,7 +27,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu private static int IO_MB_TICK = 250; - final NutrientTank fuelTank = new NutrientTank(FluidContainerRegistry.BUCKET_VOLUME * 2); + final SmartTank fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME * 2); int outputPerTick = Config.zombieGeneratorRfPerTick; int tickPerBucketOfFuel = Config.zombieGeneratorTicksPerBucketFuel; @@ -274,7 +275,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu } @Override - public NutrientTank getNutrientTank() { + public SmartTank getNutrientTank() { return fuelTank; } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index bebf46fe..1104a9b6 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -24,7 +24,6 @@ import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.gui.VScrollbarEIO; -import crazypants.enderio.machine.generator.zombie.NutrientTank; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.machine.invpanel.client.DatabaseView; import crazypants.enderio.machine.invpanel.client.ICraftingHelper; @@ -32,6 +31,7 @@ import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.client.ItemEntry; import crazypants.enderio.machine.invpanel.client.SortOrder; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.SmartTank; import crazypants.gui.GhostSlot; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; @@ -198,7 +198,7 @@ public class GuiInventoryPanel extends GuiMachineBase { fr.drawString(headerInventory, sx + 38, sy + 120, headerColor); TileInventoryPanel te = getTileEntity(); - NutrientTank fuelTank = te.fuelTank; + SmartTank fuelTank = te.fuelTank; if(fuelTank.getFluidAmount() > 0) { RenderUtil.renderGuiTank(fuelTank.getFluid(), fuelTank.getCapacity(), fuelTank.getFluidAmount(), sx + 12, sy + 132, zLevel, 16, 47); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index 688820f5..5f40c7ab 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.item.FilterRegister; @@ -20,12 +21,12 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.zombie.IHasNutrientTank; -import crazypants.enderio.machine.generator.zombie.NutrientTank; import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; import crazypants.enderio.machine.invpanel.client.ClientDatabaseManager; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.SmartTank; import crazypants.util.ITankAccess; public class TileInventoryPanel extends AbstractMachineEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { @@ -35,7 +36,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH public static final int SLOT_VIEW_FILTER = 10; public static final int SLOT_RETURN_START = 11; - protected final NutrientTank fuelTank; + protected final SmartTank fuelTank; protected boolean tanksDirty; private InventoryDatabaseServer dbServer; @@ -48,7 +49,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH public TileInventoryPanel() { super(new SlotDefinition(0, 8, 11, 20, 21, 20)); - this.fuelTank = new NutrientTank(2000); + this.fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, 2000); } public InventoryDatabaseServer getDatabaseServer() { @@ -294,7 +295,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH } @Override - public NutrientTank getNutrientTank() { + public SmartTank getNutrientTank() { return fuelTank; } diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 3fbab123..0fcb41b4 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -34,10 +34,10 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.zombie.IHasNutrientTank; -import crazypants.enderio.machine.generator.zombie.NutrientTank; import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; import crazypants.enderio.machine.wireless.WirelessChargedLocation; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.SmartTank; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; @@ -63,7 +63,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle protected WirelessChargedLocation chargedLocation; - final NutrientTank fuelTank = new NutrientTank(FluidContainerRegistry.BUCKET_VOLUME * 2); + final SmartTank fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME * 2); int lastFluidLevelUpdate; @@ -569,7 +569,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } @Override - public NutrientTank getNutrientTank() { + public SmartTank getNutrientTank() { return fuelTank; } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java index e8a5dbcd..a2036ad7 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java @@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; @@ -170,7 +171,7 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer implements IRes private IIcon getLiquidTexture() { if(tex == null) { - tex = ReservoirTank.WATER.getFluid().getStillIcon(); + tex = FluidRegistry.WATER.getStillIcon(); } return tex; } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirTank.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirTank.java deleted file mode 100644 index 7ca0d7f7..00000000 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirTank.java +++ /dev/null @@ -1,66 +0,0 @@ -package crazypants.enderio.machine.reservoir; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -public class ReservoirTank extends FluidTank { - - static final FluidStack WATER = FluidRegistry.getFluidStack("water", 0); - - ReservoirTank(int quantity, int capacity) { - super(WATER.getFluid(), quantity, capacity); - } - - ReservoirTank(int capacity) { - this(0, capacity); - } - - ReservoirTank(FluidStack liquid, int capacity) { - super(liquid, capacity); - } - - public int getAmount() { - return getFluid().amount; - } - - public float getFilledRatio() { - return (float) getAmount() / getCapacity(); - } - - public boolean isFull() { - return getAmount() >= getCapacity(); - } - - public void setAmount(int amount) { - FluidStack newLiquid = WATER.copy(); - newLiquid.amount = Math.min(getCapacity(), amount); - setFluid(newLiquid); - } - - @Override - public FluidStack getFluid() { - FluidStack l = super.getFluid(); - if(l == null) { - l = WATER.copy(); - setFluid(l); - } - return l; - } - - public int getAvailableSpace() { - return getCapacity() - getAmount(); - } - - public void addAmount(int amount) { - setAmount(getAmount() + amount); - } - - @Override - public void setCapacity(int capacity) { - super.setCapacity(capacity); - if(getAmount() > capacity) { - setAmount(capacity); - } - } -} diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index a2c4c58c..2898be45 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -16,6 +16,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.tool.SmartTank; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.ITankAccess; @@ -66,9 +67,9 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank // Position within multiblock Pos pos = Pos.UNKNOWN; - ReservoirTank tank = new ReservoirTank(BUCKET_VOLUME); + SmartTank tank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME); - ReservoirTank regenTank = null; + SmartTank regenTank = null; boolean autoEject; @@ -105,8 +106,8 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank if(autoEject && neighboursDirty) { doUpdateTankNeighbours(); } - if(autoEject && tankNeighbours != null && !tankNeighbours.isEmpty() && tank.getAmount() > 0) { - int ejectable = tank.getAmount(); + if(autoEject && tankNeighbours != null && !tankNeighbours.isEmpty() && tank.getFluidAmount() > 0) { + int ejectable = tank.getFluidAmount(); int amountPerNeighbour = ejectable / tankNeighbours.size(); FluidStack source = WATER_BUCKET.copy(); int used = 0; @@ -256,13 +257,14 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank if(liquid != null) { tank.setFluid(liquid); } else { - tank.setAmount(0); + tank.setFluidAmount(0); } if(regenLiquid == null) { regenTank = null; } else { - regenTank = new ReservoirTank(regenLiquid, BUCKET_VOLUME * 2); + regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); + regenTank.setFluidAmount(regenLiquid.amount); } boolean wasMulti = isMultiblock(); @@ -416,19 +418,19 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank if(isMaster()) { - regenTank = new ReservoirTank(BUCKET_VOLUME * 2); + regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); tank.setCapacity(BUCKET_VOLUME * 2); for (BlockCoord bc : multiblock) { TileReservoir res = getReservoir(bc); if(res != null) { FluidStack drained = res.doDrain(ForgeDirection.UNKNOWN, regenTank.getAvailableSpace(), true); if(drained != null) { - regenTank.addAmount(drained.amount); + regenTank.addFluidAmount(drained.amount); } // incase regen tank is full, add to normal tank drained = res.doDrain(ForgeDirection.UNKNOWN, tank.getAvailableSpace(), true); if(drained != null) { - tank.addAmount(drained.amount); + tank.addFluidAmount(drained.amount); } } } @@ -681,10 +683,10 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank @Override public void setTanksDirty() { if (isMaster() && regenTank != null && tank != null) { - if (!regenTank.isFull() && tank.getAmount() > 0) { - int toMove = Math.min(tank.getAmount(), regenTank.getCapacity() - regenTank.getAmount()); - regenTank.setAmount(regenTank.getAmount() + toMove); - tank.setAmount(tank.getAmount() - toMove); + if (!regenTank.isFull() && tank.getFluidAmount() > 0) { + int toMove = Math.min(tank.getFluidAmount(), regenTank.getCapacity() - regenTank.getFluidAmount()); + regenTank.setFluidAmount(regenTank.getFluidAmount() + toMove); + tank.setFluidAmount(tank.getFluidAmount() - toMove); } } tankDirty = true; diff --git a/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java b/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java deleted file mode 100644 index 0c226b40..00000000 --- a/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java +++ /dev/null @@ -1,44 +0,0 @@ -package crazypants.enderio.machine.tank; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -public class FluidTankEio extends FluidTank { - - public FluidTankEio(int capacity) { - super(capacity); - } - - public float getFilledRatio() { - return (float) getFluidAmount() / getCapacity(); - } - - public boolean isFull() { - return getFluidAmount() >= getCapacity(); - } - - public boolean canDrainFluidType(FluidStack resource) { - if(resource == null || resource.getFluid() == null || fluid == null) { - return false; - } - return fluid.isFluidEqual(resource); - } - - public boolean canDrainFluidType(Fluid fl) { - if(fl == null || fluid == null) { - return false; - } - return fl.getID() == fluid.fluidID; - } - - public FluidStack drain(FluidStack resource, boolean doDrain) { - if(!canDrainFluidType(resource)) { - return null; - } - return drain(resource.amount, doDrain); - } - - - -} diff --git a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java index 7449d782..f829c481 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java @@ -9,6 +9,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.tool.SmartTank; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; @@ -26,7 +27,7 @@ public class TankFluidRenderer extends TileEntitySpecialRenderer { renderTankFluid(tank.tank, (float)x, (float)y, (float)z); } - public static void renderTankFluid(FluidTankEio tank, float x, float y, float z) { + public static void renderTankFluid(SmartTank tank, float x, float y, float z) { if(tank == null || tank.getFluid() == null) { return; } diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index c89f6cfb..cd150a1a 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -18,6 +18,7 @@ import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.SmartTank; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; import crazypants.util.ITankAccess; @@ -28,7 +29,7 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT private static int IO_MB_TICK = 100; - protected FluidTankEio tank;// = new FluidTankEio(16000); + protected SmartTank tank;// = new FluidTankEio(16000); protected int lastUpdateLevel = -1; private boolean tankDirty = false; @@ -37,9 +38,9 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT public TileTank(int meta) { super(new SlotDefinition(0, 1, 2, 3, -1, -1)); if(meta == 1) { - tank = new FluidTankEio(32000); + tank = new SmartTank(32000); } else { - tank = new FluidTankEio(16000); + tank = new SmartTank(16000); } } @@ -346,9 +347,9 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT int tankType = nbtRoot.getInteger("tankType"); tankType = MathHelper.clamp_int(tankType, 0, 1); if(tankType == 1) { - tank = new FluidTankEio(32000); + tank = new SmartTank(32000); } else { - tank = new FluidTankEio(16000); + tank = new SmartTank(16000); } if(nbtRoot.hasKey("tankContents")) { diff --git a/src/main/java/crazypants/enderio/tool/SmartTank.java b/src/main/java/crazypants/enderio/tool/SmartTank.java new file mode 100644 index 00000000..b99fa0d0 --- /dev/null +++ b/src/main/java/crazypants/enderio/tool/SmartTank.java @@ -0,0 +1,165 @@ +package crazypants.enderio.tool; + +import com.google.common.base.Strings; + +import crazypants.enderio.EnderIO; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; + +public class SmartTank extends FluidTank { + + protected Fluid restriction; + + public SmartTank(FluidStack liquid, int capacity) { + super(liquid, capacity); + if (liquid != null) { + restriction = liquid.getFluid(); + } else { + restriction = null; + } + } + + public SmartTank(int capacity) { + super(capacity); + } + + public SmartTank(Fluid liquid, int capacity) { + super(capacity); + restriction = liquid; + } + + public void setRestriction(Fluid restriction) { + this.restriction = restriction; + } + + public float getFilledRatio() { + return (float) getFluidAmount() / getCapacity(); + } + + public boolean isFull() { + return getFluidAmount() >= getCapacity(); + } + + public boolean canDrainFluidType(FluidStack resource) { + if(resource == null || resource.getFluid() == null || fluid == null) { + return false; + } + return fluid.isFluidEqual(resource); + } + + public boolean canDrainFluidType(Fluid fl) { + if(fl == null || fluid == null) { + return false; + } + return fl.getID() == fluid.fluidID; + } + + public FluidStack drain(FluidStack resource, boolean doDrain) { + if(!canDrainFluidType(resource)) { + return null; + } + return drain(resource.amount, doDrain); + } + + public boolean canFill(FluidStack resource) { + if (fluid != null) { + return fluid.isFluidEqual(resource); + } else if (restriction != null) { + return resource.getFluid() != null && restriction.getID() == resource.getFluid().getID(); + } else { + return true; + } + } + + public boolean canFill(Fluid fl) { + if (fluid != null) { + return fluid.getFluid().getID() == fl.getID(); + } else if (restriction != null) { + return restriction.getID() == fl.getID(); + } else { + return true; + } + } + + public void setFluidAmount(int amount) { + if(amount > 0) { + if (fluid != null) { + fluid.amount = Math.min(capacity, amount); + } else if (restriction != null) { + setFluid(new FluidStack(restriction, Math.min(capacity, amount))); + } else { + throw new RuntimeException("Cannot set fluid amount of an empty tank"); + } + } else { + setFluid(null); + } + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + if(!canFill(resource)) { + return 0; + } + return super.fill(resource, doFill); + } + + @Override + public FluidStack getFluid() { + if (fluid != null) { + return fluid; + } else if (restriction != null) { + return new FluidStack(restriction, 0); + } else { + return null; + } + } + + public int getAvailableSpace() { + return getCapacity() - getFluidAmount(); + } + + public void addFluidAmount(int amount) { + setFluidAmount(getFluidAmount() + amount); + } + + @Override + public void setCapacity(int capacity) { + super.setCapacity(capacity); + if(getFluidAmount() > capacity) { + setFluidAmount(capacity); + } + } + + public void writeCommon(String name, NBTTagCompound nbtRoot) { + if(getFluidAmount() > 0 || restriction != null) { + NBTTagCompound tankRoot = new NBTTagCompound(); + writeToNBT(tankRoot); + if (restriction != null) { + tankRoot.setString("FluidRestriction", FluidRegistry.getFluidName(restriction.getID())); + } + nbtRoot.setTag(name, tankRoot); + } else { + nbtRoot.removeTag(name); + } + } + + public void readCommon(String name, NBTTagCompound nbtRoot) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag(name); + if(tankRoot != null) { + readFromNBT(tankRoot); + restriction = null; + if (tankRoot.hasKey("FluidRestriction")) { + String fluidName = tankRoot.getString("FluidRestriction"); + if (!Strings.isNullOrEmpty(fluidName)) { + restriction = FluidRegistry.getFluid(fluidName); + } + } + } else { + setFluid(null); + // not reseting 'restriction' here on purpose + } + } +} From 05ab60db97ccceaa9382b1501b3c24e9eebbde5e Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 7 May 2015 10:43:33 -0400 Subject: [PATCH 02/25] Add syncing to other clients for toggleable DS upgrades --- .../item/darksteel/DarkSteelController.java | 25 ++++++++++++++ .../item/darksteel/PacketUpgradeState.java | 33 +++++++++++++------ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index c67790db..614478ec 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -10,6 +10,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -17,6 +18,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.util.MovementInput; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import org.lwjgl.opengl.GL11; @@ -28,6 +30,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.PacketUpgradeState.Type; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; @@ -77,8 +80,21 @@ public class DarkSteelController { private DarkSteelController() { PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.CLIENT); } + public boolean isActive(EntityPlayer player, Type type) { + switch(type) { + case GLIDE: + return isGlideActive(player); + case SPEED: + return isSpeedActive(player); + case STEP_ASSIST: + return isStepAssistActive(player); + } + return false; + } + public void setGlideActive(EntityPlayer player, boolean isGlideActive) { if(player.getGameProfile().getId() != null) { glideActiveMap.put(player.getGameProfile().getId(), isGlideActive); @@ -360,6 +376,15 @@ public class DarkSteelController { } return res; } + + @SubscribeEvent + public void onStartTracking(PlayerEvent.StartTracking event) { + if (event.target instanceof EntityPlayerMP) { + for (PacketUpgradeState.Type type : PacketUpgradeState.Type.values()) { + PacketHandler.sendTo(new PacketUpgradeState(type, isActive((EntityPlayer) event.target, type), event.target.getEntityId()), (EntityPlayerMP) event.entityPlayer); + } + } + } @SideOnly(Side.CLIENT) @SubscribeEvent diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java index 7498c84f..bfd94043 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java @@ -1,10 +1,12 @@ package crazypants.enderio.item.darksteel; -import net.minecraft.entity.player.EntityPlayerMP; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketHandler; public class PacketUpgradeState implements IMessage, IMessageHandler { @@ -19,28 +21,36 @@ public class PacketUpgradeState implements IMessage, IMessageHandler Date: Thu, 7 May 2015 17:15:01 -0400 Subject: [PATCH 03/25] Fix renders being incorrectly offset while sneaking --- .../item/darksteel/DarkSteelController.java | 4 ++++ .../item/darksteel/upgrade/GliderUpgrade.java | 3 ++- .../darksteel/upgrade/IRenderUpgrade.java | 24 +++++++++++++++++++ .../item/darksteel/upgrade/SolarUpgrade.java | 6 ++--- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 614478ec..50d59fad 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -40,6 +40,7 @@ import crazypants.enderio.item.darksteel.upgrade.NightVisionUpgrade; import crazypants.enderio.item.darksteel.upgrade.SolarUpgrade; import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade; import crazypants.enderio.item.darksteel.upgrade.SwimUpgrade; +import crazypants.enderio.item.darksteel.upgrade.IRenderUpgrade.Helper; import crazypants.enderio.machine.solar.TileEntitySolarPanel; import crazypants.enderio.network.PacketHandler; import crazypants.util.Util; @@ -428,6 +429,9 @@ public class DarkSteelController { float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; GL11.glPushMatrix(); + if(player.isSneaking()) { + GL11.glTranslatef(0, 0.0625f, 0); + } GL11.glRotatef(yawOffset, 0, -1, 0); GL11.glRotatef(yaw - 270, 0, 1, 0); GL11.glRotatef(pitch, 0, 0, 1); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java index bc792e72..68e6fefe 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java @@ -83,8 +83,9 @@ public class GliderUpgrade extends AbstractUpgrade { RenderUtil.bindItemTexture(); glDepthMask(true); item.hoverStart = 0; + Helper.rotateIfSneaking(event.entityPlayer); GL11.glTranslatef(-0, 1, 0.25f); - GL11.glRotatef(180, 0, 0, 1); + GL11.glRotatef(180, 1, 0, 0); GL11.glScalef(3, 3, 3); RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java index 3a675e1e..34214efc 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java @@ -1,10 +1,34 @@ package crazypants.enderio.item.darksteel.upgrade; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; +import org.lwjgl.opengl.GL11; + public interface IRenderUpgrade { void render(RenderPlayerEvent event, ItemStack stack, boolean head); + /** + * A few helper methods for rendering. Credit to Vazkii, used from Botania. + * {@link #translateToHeadLevel(EntityPlayer)} edited to remove sneaking + * translation. + */ + public static class Helper { + + public static void rotateIfSneaking(EntityPlayer player) { + if (player.isSneaking()) + applySneakingRotation(); + } + + public static void applySneakingRotation() { + GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F); + } + + public static void translateToHeadLevel(EntityPlayer player) { + GL11.glTranslated(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : -0.08F) - player.getDefaultEyeHeight(), 0); + } + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java index a9441365..3f32f918 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java @@ -16,8 +16,8 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.item.darksteel.upgrade.IRenderUpgrade.Helper; import crazypants.render.RenderUtil; - import static org.lwjgl.opengl.GL11.glDepthMask; public class SolarUpgrade extends AbstractUpgrade { @@ -106,7 +106,7 @@ public class SolarUpgrade extends AbstractUpgrade { public IRenderUpgrade getRender() { return render; } - + @SideOnly(Side.CLIENT) private class Render implements IRenderUpgrade { @@ -120,8 +120,8 @@ public class SolarUpgrade extends AbstractUpgrade { RenderUtil.bindItemTexture(); glDepthMask(true); item.hoverStart = 0; + Helper.translateToHeadLevel(event.entityPlayer); GL11.glTranslated(0, -0.08, 0); - GL11.glTranslated(0, (event.entityPlayer != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - event.entityPlayer.getDefaultEyeHeight() + (event.entityPlayer.isSneaking() ? 0.0625 : 0), 0); GL11.glRotated(180, 1, 0, 0); GL11.glScalef(2.1f, 2.1f, 2.1f); byte level = loadFromItem(stack).level; From 1aaf1139108473dad4fc8906af20b0a4d78cf06c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 7 May 2015 18:02:15 -0400 Subject: [PATCH 04/25] Fix crash on dedicated server --- .../enderio/item/darksteel/upgrade/AbstractUpgrade.java | 1 + .../enderio/item/darksteel/upgrade/GliderUpgrade.java | 6 ++++-- .../enderio/item/darksteel/upgrade/SolarUpgrade.java | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java index d5a3d42f..712ddae0 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java @@ -92,6 +92,7 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade { } @Override + @SideOnly(Side.CLIENT) public IRenderUpgrade getRender() { return null; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java index 68e6fefe..f7612b79 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java @@ -22,7 +22,8 @@ public class GliderUpgrade extends AbstractUpgrade { public static final GliderUpgrade INSTANCE = new GliderUpgrade(); - private final Render render = new Render(); + @SideOnly(Side.CLIENT) + private Render render; public static GliderUpgrade loadFromItem(ItemStack stack) { if(stack == null) { @@ -59,8 +60,9 @@ public class GliderUpgrade extends AbstractUpgrade { } @Override + @SideOnly(Side.CLIENT) public IRenderUpgrade getRender() { - return render; + return render == null ? render = new Render() : render; } @Override diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java index 3f32f918..11f917e5 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java @@ -29,7 +29,7 @@ public class SolarUpgrade extends AbstractUpgrade { public static final SolarUpgrade SOLAR_ONE = new SolarUpgrade("enderio.darksteel.upgrade.solar_one", (byte) 1, Config.darkSteelSolarOneCost); public static final SolarUpgrade SOLAR_TWO = new SolarUpgrade("enderio.darksteel.upgrade.solar_two", (byte) 2, Config.darkSteelSolarTwoCost); - private Render render = new Render(); + private Render render; public static SolarUpgrade loadFromItem(ItemStack stack) { if(stack == null) { @@ -103,8 +103,9 @@ public class SolarUpgrade extends AbstractUpgrade { } @Override + @SideOnly(Side.CLIENT) public IRenderUpgrade getRender() { - return render; + return render == null ? render = new Render() : render; } @SideOnly(Side.CLIENT) From b5d0b8df0df092e6bbd90ab4c5b5ce2ec8d47115 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 7 May 2015 20:07:30 -0400 Subject: [PATCH 05/25] More tweaks to render translations, add particle effects for jump boost --- .../enderio/item/darksteel/DarkSteelController.java | 11 ++++++++++- .../item/darksteel/upgrade/IRenderUpgrade.java | 2 +- .../enderio/item/darksteel/upgrade/SolarUpgrade.java | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 50d59fad..d0d29ed5 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -2,10 +2,12 @@ package crazypants.enderio.item.darksteel; import java.util.HashMap; import java.util.Map; +import java.util.Random; import java.util.UUID; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.particle.EntityReddustFX; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; @@ -40,7 +42,6 @@ import crazypants.enderio.item.darksteel.upgrade.NightVisionUpgrade; import crazypants.enderio.item.darksteel.upgrade.SolarUpgrade; import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade; import crazypants.enderio.item.darksteel.upgrade.SwimUpgrade; -import crazypants.enderio.item.darksteel.upgrade.IRenderUpgrade.Helper; import crazypants.enderio.machine.solar.TileEntitySolarPanel; import crazypants.enderio.network.PacketHandler; import crazypants.util.Util; @@ -480,6 +481,14 @@ public class DarkSteelController { ticksSinceLastJump = 0; usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, requiredPower); player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.MODID + ":ds.jump", 1.0f, player.worldObj.rand.nextFloat() * 0.5f + 0.75f, false); + Random rand = player.worldObj.rand; + for (int i = rand.nextInt(10) + 5; i >= 0; i--) { + EntityReddustFX fx = new EntityReddustFX(player.worldObj, player.posX + (rand.nextDouble() * 0.5 - 0.25), player.posY - player.yOffset, player.posZ + + (rand.nextDouble() * 0.5 - 0.25), 1, 1, 1); + fx.setVelocity(player.motionX + (rand.nextDouble() * 0.5 - 0.25), (player.motionY / 2) + (rand.nextDouble() * -0.05), + player.motionZ + (rand.nextDouble() * 0.5 - 0.25)); + Minecraft.getMinecraft().effectRenderer.addEffect(fx); + } PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, DarkSteelItems.itemDarkSteelBoots.armorType)); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java index 34214efc..c5a71670 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java @@ -28,7 +28,7 @@ public interface IRenderUpgrade { } public static void translateToHeadLevel(EntityPlayer player) { - GL11.glTranslated(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : -0.08F) - player.getDefaultEyeHeight(), 0); + GL11.glTranslated(0, (player != Minecraft.getMinecraft().thePlayer ? 1.7F : 0) - player.getDefaultEyeHeight(), 0); } } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java index 11f917e5..aabf684f 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java @@ -122,7 +122,7 @@ public class SolarUpgrade extends AbstractUpgrade { glDepthMask(true); item.hoverStart = 0; Helper.translateToHeadLevel(event.entityPlayer); - GL11.glTranslated(0, -0.08, 0); + GL11.glTranslated(0, -0.155, 0); GL11.glRotated(180, 1, 0, 0); GL11.glScalef(2.1f, 2.1f, 2.1f); byte level = loadFromItem(stack).level; From b0783a22913f709114a691a12a55aee04472c3c5 Mon Sep 17 00:00:00 2001 From: RAnders00 Date: Fri, 8 May 2015 21:49:31 +0200 Subject: [PATCH 06/25] Fix typos in configuration file. Fixes #2440 I was not able to find the "level" misspells, sorry. It looks like the issue creator had a outdated configuration file, I just looked over a freshly generated file and could not locate any "level" misspells. --- src/main/java/crazypants/enderio/config/Config.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index e3ef7ec2..4e94d81b 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -625,10 +625,10 @@ public final class Config { "Number of millibuckets per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); advancedFluidConduitExtractRate = config.get(sectionEfficiency.name, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate, - "Number of millibuckets per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); + "Number of millibuckets per tick extracted by pressurized fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); advancedFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate, - "Number of millibuckets per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to an pressurized fluid conduit.").getInt(advancedFluidConduitMaxIoRate); enderFluidConduitExtractRate = config.get(sectionEfficiency.name, "enderFluidConduitExtractRate", enderFluidConduitExtractRate, "Number of millibuckets per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); @@ -1224,7 +1224,7 @@ public final class Config { lootTheEnder = config.getBoolean("lootTheEnder", sectionLootConfig.name, lootTheEnder, "Adds The Ender to loot tables"); lootDarkSteelBoots = config.getBoolean("lootDarkSteelBoots", sectionLootConfig.name, lootDarkSteelBoots, "Adds Darksteel Boots to loot tables"); - enderRailEnabled = config.getBoolean("enderRailEnabled", sectionRailConfig.name, enderRailEnabled, "Wether Ender Rails are enabled"); + enderRailEnabled = config.getBoolean("enderRailEnabled", sectionRailConfig.name, enderRailEnabled, "Whether Ender Rails are enabled"); enderRailPowerRequireCrossDimensions = config.get(sectionRailConfig.name, "enderRailPowerRequireCrossDimensions", enderRailPowerRequireCrossDimensions, "The amount of power required to transport a cart across dimensions").getInt(enderRailPowerRequireCrossDimensions); enderRailPowerRequiredPerBlock = config.get(sectionRailConfig.name, "enderRailPowerRequiredPerBlock", enderRailPowerRequiredPerBlock, From 63d7aa24ae707c1eb46cd5bafb9947265c65e0b8 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 9 May 2015 09:19:39 +0200 Subject: [PATCH 07/25] allow storing the current crafting recipe for the crafting helper --- resources/assets/enderio/lang/en_US.lang | 3 + .../enderio/textures/gui/inventorypanel.png | Bin 2906 -> 3306 bytes .../machine/invpanel/GuiInventoryPanel.java | 34 ++- .../invpanel/InventoryPanelContainer.java | 4 + .../invpanel/client/CraftingHelper.java | 221 ++++++++++++++++++ .../InventoryPanelNEIOverlayHandler.java | 214 +---------------- 6 files changed, 269 insertions(+), 207 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 0e91875c..f9da1c9d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -509,6 +509,9 @@ enderio.gui.inventorypanel.tooltip.refill.line2=A normal click puts items enderio.gui.inventorypanel.tooltip.refill.line3=for one crafting opperations, enderio.gui.inventorypanel.tooltip.refill.line4=while a shift click tries to enderio.gui.inventorypanel.tooltip.refill.line5=fill the crafting grid. +enderio.gui.inventorypanel.tooltip.setrecipe.line1=Learn the current crafting recipe +enderio.gui.inventorypanel.tooltip.setrecipe.line2=Allows the refilling for the +enderio.gui.inventorypanel.tooltip.setrecipe.line3=current recipe from the network. enderio.gui.inventorypanel.tooltip.clear.line1=Clear crafting grid enderio.gui.inventorypanel.tooltip.clear.line2=Moves all items to the return area enderio.gui.inventorypanel.tooltip.fuelTank=Nutrient Tank diff --git a/resources/assets/enderio/textures/gui/inventorypanel.png b/resources/assets/enderio/textures/gui/inventorypanel.png index 9b49c80526e2c92f6355dc53eda9d811c74cc81e..baeec6e208087b2cc93912378cc07e61b3030082 100644 GIT binary patch literal 3306 zcmai0dpwi-AOCK1Yvyo@ET!q<7TF}lm{#P_Wu}!RMiG%#3YmU*)al|( zDXF>FNtCSIM$sy=+;W*~%zlqL=lss^yk5W8@A>0-KF|02+2{Ltzd!HK=UE(;@{1Z; z2MqvFb9Qpr0RRFv5kN%=es~_c;|~Dlp0mTooe^&bI<_BNBGG+5ESA>Q7X;TjI-4n} zZmZFc+u?wI>`rxfTOIp*)@q90>ua7{(1Dw-3a&J)D@vx~w%qzej#E`*M0)D0g}t>u zHjiYatevR0`thXCQ8KSv~Uf8Y3>TzPKa z6px^KS<+8^a;MX~HyfR&@hE{IA?Df@(vIkbNG=p}j}^mnNnhHQ6xk}CVr)>|3Lp{y z{Rm+6t6Of?z*li9hhqSsLiJe!rnzsdd?>(GvuEhzQ&R*~7~kpM;<3nA^K8Zw!WDDJ z3y$_7OZsXquTTI~Hwz1k-cVwWsE-)>h2`(>-*j+oQ%`89kTl`cP`RvfJ}_eW`G_Bd z*mp42%LK>G0!Li=qU6D8;<2vt>(;Fs*9Nx)h<#yUmb=3oLyjvEvSZWprZ4H*+&&~K zsI}%1Fj~)tZmIBLT^Z#O&H85$|ZGYz?-zQE{cdifyl zw7j=D7shpfU}H0V1`*ZYdT+FIYHDiKS3D6m*1PLfeSJ`PcnSb7bdWZ$7BbckDSIG6 zO@K=K$-%Ou%#y)!8`=GpOO$kHV0f=JzK9pJ3M&l(lw_(rZZR|ua21vjOp#nNg-y(A z9T(l4DrK$u0oJNcpmiLUu>aCP8% zCNbC@>jM=4YngaLOQA}Fs`pUbs3)E%j(UhgfGeiJR+wDm#*t(<_GI?SZGF^14VBk; z+1$WOI^i;%958K;0$W~K8w#ZjYL$Kl8k=3sqU~U!sY{;6-*hVSINT^1i}VUv!tq5_U&0m6b;gg-wni-YCS3}+ypeE77{R&kwxBYKc&|}MQcf<{P2?1 zLTOV_Q5TcLcwcJlTX$I5_#`05PJqZV&M7^oL6!coNc2-eRN}k}JVTLJeK?ND309*Ua>N7b@BuP?E+svCXFNFutFV!kphiXl ztUXv+27ZX=!bWE0QdnkxLZ9OxUK!e1Ne5l(hC`aUlr^8Pp<7k&mX_Lv4tHgjH?=*k z4|g$nKW}dH;uSd^dO^~C^u@)bTY>Yb$=M&|yKQZ3Yz!)X7l?->OgNQYt*HNE*Xa8Z z0EV>rPi$xA3|o*nGmg{%tjZ z2kxPJ-k=IH%<1IJ;P)NKGd{G3eN|jl* z^MiweRz)fM^mTv8e60%njN+Fc4i3IU=YO97JUtb^{9SxeTaW!tl5Ep0Cw)8@gkv!67jhO!IS*9;f~$FN;yCv%Wl zYy>NZ%)C2K<BNpihk|8=^**{PP z(DMN%9MT8Ss(Mg;hKHsZs)xN`xVR|O>GY+0Z3u=)S9rxBB>b6G`cHLnzmUixz z0R+s|&ItAIVzroq{{s=11@o!`RhhRU{sxs?i<)z^h4+3#03RjRiW@ua*|tr_HWY=M zKZS*7KaC?V;3#4iue%Xp&(6cUUG+fD#kT_3ell~&>_1HB>=ULzvMA8L5VO-1U`N5$ zzn$$q{$QR{f{bRXnArDDAN7Sm$t|ZqVT}AkD z0QvK6dFPH~zeID!;lqdf#Y@O`{-AquxU*D;OiA=b9W6QXA)+VNlTZpX_s#A&$(Dv-JN=I482iU(irTA%>d41b#vHC&3BoH@RNACti}mQAJ_Qbtal2H0~0 z{%U(G!k_D&ILKg7l0s$Q#z?Q$DrLt=Wa>d5-yC`2k!vE4NK3`2Kp|}cKc;NvP+Gwd zKRsr(?#%QaMsPkHF0fH+c9S&e>-4wI-mn!+gZl7jN;EhoR&p1*k6EOl$P%ECd-7udt>n%UR2?Gm#Hy_mboEh3nD2x9EMh ze_Be+qsd9RGx>tiCO~xub4(!d4k<tMR9%wnI5w)bqH!B~YfK`gj_*{poc+iwq0x3+kuJc}7h+u*lXepPzW fd)fD9OUjfZ^i&te^`GUfnOkt)OmQgK8-LHt(4<-HqM2yMREn5wx+r2?@*^=Zq)DnBQ<|ZCwwtkT;mFcbOQE}A z$ht%&WtDLm*;uKWFtQS(6y;vVAeY%Qc58S4`kjByIiK^s&-1-J@AI4l4|nIUH1st9 z0AIOmbKC&{ggin3tB&0Eoyg|`uxOc!sc2UUbat6izlu)^!vj~eI_p}k#C@9iYrcf zB#g||t-Hlozj};U79zBkX|Z9dB3VxCdvN8!>{I>OCktV%Cyj=deFPb`yMw7_mv>Ow6C#>>hG z?}&&9eyG@YT&N9fW@;TKI;*3jIrM%`=9u^F8VUpy02D6(0(@>ufmj&j9~gKBfOy-< zGua*)ebtjJpNr*DvsQG#&cAUZrF2&vLC+~G+vMQcrU3IDOlJA<9(4%dS`~_4Q;a;9 z)|dY&uy7d(QDL? z*RNl9Z_ScHk@DFInMKQV*tj(mmNB3h>PXDaUoykUwB=|4!YMwV?~8l4x9rG9Ls?a% zaLO`qxlQD!oz~XYFWTFe0XQpOOed5d!vFy7qgf#q83P#lQB;D3Ne?0>ZVk(-CFq)Z`x+Y?OMU*w_m^bc z!2o*z$NXt9}iGVi7)Ovi|tnwpyPMy1A6yaI8UF{(6jdZi!)@=$tGuQQBM$6sh; z0Wb^d6B9dyA&lwiX^q^hBF4^Q3INq#PN{LZpNhyvLriD{g630k~|?UA8+93YtVrJo`PYytyU z?0qisCugxh;KXDWQ0Q^{Cm;45Us`zMM(+RytbGQ~Nw<#=NE%B9f1|)QFsZ$>vvqFH zHaL7oUdBiI4nn+X;|?cJ^P}jbtt(LAQpkxDCGtZX#}h21hpLn0En8)wv?E;_MRu7_ zxdvfoqut#wcsEU9FG+uMx5{c9$F|}h4h*EibWx%(Lfk0j7_rvg8B#$ zmSNUd(wiuvNtn7$K?WmkmNZ(LQ7sMxv+-oOSJhA_NkufTvCH`4PIbKjT)3&G3+)dA^sqQxFBnM3LmTQ;2bhrk2 zOrUlLUNCB?qs~3p38ZN5l1Qtsu>t5x0N1}$1GKGF&>aT0bq=YK0laC!AN#0q&~V(w zXnZ)N5^uazNsS&(ANcJK8*%32JTY^91e+WQOC3~gf`%a89lW6K7m~ zpd1BA*YRMK269MUcu}5C4E&t6e>&V3X7W>7O07gz!9!Jm0>K+4Kt-SnEkITi5I%j4 z@GS*O8`z)eXTeize=jN0F@Q0kI3DCjK&QwaDMoI79(bhv-1`Yhjj0CpsSO3UlL;0i^+&;Js&l!mQPid zJ~wsqa`KcWXy0E8l9G}x+K%ViZa!^=Z+qn^*q@0tmn~x7WTqGyR8RIbM}YJ3jc``mLoPTuTCQ|aX5WwnM`cgL>IlC7)1uZRJkB%3WQ1mb{ zC6v_CT}VG{y6%h|F30-%`b(cCx}uel7Xd(;1qJ|=YR17x^FNS|z4yxMOt%XAd-RHi z*0vSYa7#6~)!NeXoDq>kdhVCD@}Kp8^(XEBgkiJ%C7AT>tLSa{Bd_Vi{)!`fr{S*c zpokEnmn+U4z*TNJk_C3R7Jhu@rAHXV!8_IBW8LhL?4P6cg@1gLkUT%&O0jfckuu z)NY{y5e|S2u;!~A{eE7S_}OtJeEwLXl}b1tQOW*VRTG+i^tf>4e0)g6UJxG}0)3IV z`*fTI)He<8QwXCJK#>23mha*hn4Cx7j9LPPLZL1rsv!_WICiRKLA=#>`5SnP_*je} za)9>rPb-0lr1Amwwh}J=)d%)VpjY{Xob=p^3ExBJc-VMZe2U*|sw6;MsM@cQH zlfkB0)A9!I_n-VX=m4m=#=FU_(luKC0nJ5?UVXdl@0wKr^&dCdb{_&#;k3okE*}1S zbCm6LYgu*t=q55A1A)=RC2(NS4$ug4lg5zn#$RmYG+a5G zdcwd|!@=d3$Jx(X&HUU__j$4}a0|BX&!HO5y^8x}NSir*x9;(7Go8A}%~xKp-E|(X z@p^a6`DWfKKlGA74reDf!PV!x1m~-6dCdVvJ+4>C&)c-3Bt;AA)*<{mUv zP0HewVAl+#$=-_^_2-+Hd%rEpF6=0`(l@&{XX3RuF}6Fe=C~7~&J62NUYBWA9a~eZ!P%KpP&GBkFuSR&sip2?`fT3J49iuXobzWj#L%CB=j(MQ zCyWiRn*3z6`9j^ziaBpBJM*|gUH!bKabm`Pb`1!y!BovO+IYDnesA5jY<8kW%Z-(G zLp)c%0Y|AR^_dCDoGtA96s^qbSv_9?_9^n{R6Q?S=fm;H&oTfmPVSDk9N4G+1V-QC AqW}N^ diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 1104a9b6..f34cdb68 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -25,6 +25,7 @@ import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.gui.VScrollbarEIO; import crazypants.enderio.machine.gui.GuiMachineBase; +import crazypants.enderio.machine.invpanel.client.CraftingHelper; import crazypants.enderio.machine.invpanel.client.DatabaseView; import crazypants.enderio.machine.invpanel.client.ICraftingHelper; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; @@ -55,6 +56,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private final TextFieldEIO tfFilter; private final IconButtonEIO btnSort; private final GuiToolTip ttRefill; + private final GuiToolTip ttSetReceipe; private final VScrollbarEIO scrollbar; private final MultiIconButtonEIO btnClear; @@ -130,6 +132,16 @@ public class GuiInventoryPanel extends GuiMachineBase { ttRefill.setVisible(false); addToolTip(ttRefill); + list.clear(); + TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.setrecipe.line"); + ttSetReceipe = new GuiToolTip(btnRefill, list) { + @Override + public boolean shouldDraw() { + return super.shouldDraw() && getContainer().hasCraftingRecipe(); + } + }; + addToolTip(ttSetReceipe); + list.clear(); TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.clear.line"); btnClear.setToolTip(list.toArray(new String[list.size()])); @@ -147,6 +159,7 @@ public class GuiInventoryPanel extends GuiMachineBase { public void setCraftingHelper(ICraftingHelper craftingHelper) { this.craftingHelper = craftingHelper; ttRefill.setVisible(craftingHelper != null); + ttSetReceipe.setVisible(craftingHelper == null); } @Override @@ -170,7 +183,7 @@ public class GuiInventoryPanel extends GuiMachineBase { if(getContainer().clearCraftingGrid()) { if(craftingHelper != null) { craftingHelper.remove(); - craftingHelper = null; + setCraftingHelper(null); } } } @@ -189,6 +202,10 @@ public class GuiInventoryPanel extends GuiMachineBase { boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); int iconX = hover ? (isShiftKeyDown() ? 48 : 24) : 0; drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); + } else if(getContainer().hasCraftingRecipe()) { + boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); + int iconX = hover ? 96 : 72; + drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); } int headerColor = 0x404040; @@ -328,12 +345,21 @@ public class GuiInventoryPanel extends GuiMachineBase { x -= guiLeft; y -= guiTop; - if(craftingHelper != null && btnRefill.contains(x, y)) { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); - craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + if(btnRefill.contains(x, y)) { + if(craftingHelper != null) { + playClickSound(); + craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + } else if(getContainer().hasCraftingRecipe()) { + playClickSound(); + setCraftingHelper(CraftingHelper.createFromSlots(getContainer().getCraftingGridSlots())); + } } } + private void playClickSound() { + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + } + @Override protected void mouseWheel(int x, int y, int delta) { super.mouseWheel(x, y, delta); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index f7b73584..d69f680d 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -238,6 +238,10 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements return cleared; } + public boolean hasCraftingRecipe() { + return getSlot(slotCraftResult).getHasStack(); + } + @Override protected List getTargetSlotsForTransfer(int slotIndex, Slot slot) { if((slotIndex == slotCraftResult) || (slotIndex >= firstSlotReturn && slotIndex < endSlotReturn)) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java new file mode 100644 index 00000000..738c84da --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java @@ -0,0 +1,221 @@ +package crazypants.enderio.machine.invpanel.client; + +import crazypants.enderio.machine.invpanel.GuiInventoryPanel; +import crazypants.enderio.machine.invpanel.InventoryPanelContainer; +import crazypants.enderio.machine.invpanel.PacketFetchItem; +import crazypants.enderio.network.PacketHandler; +import crazypants.util.ItemUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class CraftingHelper implements ICraftingHelper { + final ItemStack[][] ingredients; + + public CraftingHelper(ItemStack[][] ingredients) { + this.ingredients = ingredients; + } + + public static ICraftingHelper createFromSlots(List slots) { + if (slots.size() != 9) { + return null; + } + ItemStack[][] ingredients = new ItemStack[9][]; + int count = 0; + for (int idx = 0; idx < 9; idx++) { + Slot slot = slots.get(idx); + ItemStack stack = slot.getStack(); + if(stack != null) { + stack = stack.copy(); + stack.stackSize = 1; + ingredients[idx] = new ItemStack[] { stack }; + count++; + } + } + if (count > 0) { + return new CraftingHelper(ingredients); + } + return null; + } + + @Override + public void remove() { + } + + @Override + public void refill(GuiInventoryPanel gui, int amount) { + InventoryPanelContainer container = gui.getContainer(); + InventoryDatabaseClient db = gui.getDatabase(); + List craftingGrid = container.getCraftingGridSlots(); + int slotsToProcess = (1 << 9) - 1; + boolean madeProgress; + int maxAmount = 64; + do { + Candidate[] candidates = new Candidate[9]; + for (int idx = 0; idx < 9; idx++) { + if ((slotsToProcess & (1 << idx)) != 0) { + ItemStack[] pstack = ingredients[idx]; + Slot slot = craftingGrid.get(idx); + ItemStack stack = slot.getStack(); + if (pstack == null) { + if (stack != null) { + return; + } + } else { + Candidate candidate; + if (stack != null) { + if (!isStackCompatible(pstack, stack)) { + return; + } + candidate = findCandidates(stack, gui, db, candidates); + } else { + candidate = findAllCandidates(pstack, gui, db, candidates); + } + if (candidate == null) { + return; + } + candidate.used++; + candidates[idx] = candidate; + } + } + } + int targetAmount = maxAmount; + int currentAmount = 0; + for (int idx = 0; idx < 9; idx++) { + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + int current = getSlotStackSize(slot); + int maxStackSize = candidate.stack.getMaxStackSize(); + currentAmount = Math.max(currentAmount, current); + if (candidate.stack.isStackable() && maxStackSize > 1) { + targetAmount = Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); + } + } + } + targetAmount = Math.min(targetAmount, currentAmount + amount); + madeProgress = false; + for (int idx = 0; idx < 9; idx++) { + final int mask = 1 << idx; + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + for (Slot srcSlot : candidate.sourceSlots) { + int current = getSlotStackSize(slot); + if (current >= targetAmount) { + break; + } + if (container.moveItems(srcSlot.slotNumber, slot.slotNumber, slot.slotNumber + 1, targetAmount - current)) { + slotsToProcess &= ~mask; + madeProgress = true; + } + } + int current = getSlotStackSize(slot); + if (candidate.entry != null) { + if (current < targetAmount) { + int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); + slotsToProcess &= ~mask; + current += toMove; + } + } + if (current > 0) { + maxAmount = Math.min(maxAmount, current); + } + } + } + } while (madeProgress && slotsToProcess != 0); + } + + private static int getSlotStackSize(Slot slot) { + ItemStack stack = slot.getStack(); + return (stack != null) ? stack.stackSize : 0; + } + + private static boolean isStackCompatible(ItemStack[] pstack, ItemStack stack) { + for (ItemStack istack : pstack) { + if (ItemUtil.areStackMergable(stack, istack)) { + return true; + } + } + return false; + } + + private Candidate findAllCandidates(ItemStack[] pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + Candidate bestInventory = null; + Candidate bestNetwork = null; + for (ItemStack istack : pstack) { + Candidate candidate = findCandidates(istack, gui, db, candidates); + if (candidate.available > 0) { + if (bestInventory == null || bestInventory.available < candidate.available) { + bestInventory = candidate; + } + } + if (candidate.entry != null) { + if (bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { + bestNetwork = candidate; + } + } + } + if (bestInventory != null) { + return bestInventory; + } else { + return bestNetwork; + } + } + + private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + for (Candidate candidate : candidates) { + if (candidate != null && ItemUtil.areStackMergable(candidate.stack, stack)) { + return candidate; + } + } + Candidate candidate = new Candidate(stack); + InventoryPanelContainer container = gui.getContainer(); + findCandidates(candidate, stack, container.getReturnAreaSlots()); + findCandidates(candidate, stack, container.getPlayerInventorySlots()); + findCandidates(candidate, stack, container.getPlayerHotbarSlots()); + if (candidate.available == 0 && db != null) { + candidate.entry = db.lookupItem(stack, null, false); + if (candidate.entry != null && candidate.entry.getCount() <= 0) { + candidate.entry = null; + } + } + return candidate; + } + + private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { + for (Slot slot : slots) { + ItemStack slotStack = slot.getStack(); + if (slotStack != null && ItemUtil.areStackMergable(slotStack, stack)) { + candidates.sourceSlots.add(slot); + candidates.available += slotStack.stackSize; + } + } + } + + static class Candidate { + final ItemStack stack; + final ArrayList sourceSlots = new ArrayList(); + ItemEntry entry; + int available; + int used; + + public Candidate(ItemStack stack) { + this.stack = stack; + } + + public int getAvailable() { + int avail = available; + if(entry != null) { + avail += entry.getCount(); + } + if(avail > 0 && used > 1) { + avail = Math.max(1, avail / used); + } + return avail; + } + } +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java index 419a2e81..bca1add3 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.invpanel.client; -import codechicken.lib.inventory.InventoryUtils; import codechicken.nei.LayoutManager; import codechicken.nei.OffsetPositioner; import codechicken.nei.PositionedStack; @@ -10,10 +9,6 @@ import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.IRecipeHandler; import crazypants.enderio.machine.invpanel.GuiInventoryPanel; import crazypants.enderio.machine.invpanel.InventoryPanelContainer; -import crazypants.enderio.machine.invpanel.PacketFetchItem; -import crazypants.enderio.network.PacketHandler; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; @@ -40,9 +35,15 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { shift = guiInvPanel.getContainer().clearCraftingGrid(); } - PositionedStack[] slots = mapSlots(ingredients, guiInvPanel.getContainer()); + ItemStack[][] slots = mapSlots(ingredients, guiInvPanel.getContainer()); if(slots != null) { - CraftingHelper helper = new CraftingHelper(slots); + CraftingHelper helper = new CraftingHelper(slots) { + @Override + public void remove() { + super.remove(); + LayoutManager.overlayRenderer = null; + } + }; guiInvPanel.setCraftingHelper(helper); if(shift) { helper.refill(guiInvPanel, 64); @@ -52,15 +53,15 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { } } - private PositionedStack[] mapSlots(List ingredients, InventoryPanelContainer c) { - PositionedStack[] slots = new PositionedStack[9]; + private ItemStack[][] mapSlots(List ingredients, InventoryPanelContainer c) { + ItemStack[][] slots = new ItemStack[9][]; List craftingGrid = c.getCraftingGridSlots(); int found = 0; for(PositionedStack pstack : ingredients) { for(int idx = 0; idx < 9 ; idx++) { Slot slot = craftingGrid.get(idx); if(slot.xDisplayPosition == pstack.relx + CRAFTING_GRID_OFFSET_X && slot.yDisplayPosition == pstack.rely + CRAFTING_GRID_OFFSET_Y) { - slots[idx] = pstack; + slots[idx] = pstack.items; found++; break; } @@ -71,197 +72,4 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { } return slots; } - - static class CraftingHelper implements ICraftingHelper { - final PositionedStack[] ingredients; - - public CraftingHelper(PositionedStack[] ingredients) { - this.ingredients = ingredients; - } - - @Override - public void remove() { - LayoutManager.overlayRenderer = null; - } - - @Override - public void refill(GuiInventoryPanel gui, int amount) { - InventoryPanelContainer container = gui.getContainer(); - InventoryDatabaseClient db = gui.getDatabase(); - List craftingGrid = container.getCraftingGridSlots(); - int slotsToProcess = (1<<9)-1; - boolean madeProgress; - int maxAmount = 64; - do { - Candidate[] candidates = new Candidate[9]; - for(int idx = 0; idx < 9; idx++) { - if((slotsToProcess & (1 << idx)) != 0) { - PositionedStack pstack = ingredients[idx]; - Slot slot = craftingGrid.get(idx); - ItemStack stack = slot.getStack(); - if(pstack == null) { - if(stack != null) { - return; - } - } else { - Candidate candidate; - if(stack != null) { - if(!isStackCompatible(pstack, stack)) { - return; - } - candidate = findCandidates(stack, gui, db, candidates); - } else { - candidate = findAllCandidates(pstack, gui, db, candidates); - } - - if(candidate == null) { - return; - } - candidate.used++; - candidates[idx] = candidate; - } - } - } - - int targetAmount = maxAmount; - int currentAmount = 0; - for(int idx = 0; idx < 9; idx++) { - Candidate candidate = candidates[idx]; - if(candidate != null) { - Slot slot = craftingGrid.get(idx); - int current = getSlotStackSize(slot); - int maxStackSize = candidate.stack.getMaxStackSize(); - currentAmount = Math.max(currentAmount, current); - if(candidate.stack.isStackable() && maxStackSize > 1) { - targetAmount = Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); - } - } - } - - targetAmount = Math.min(targetAmount, currentAmount + amount); - madeProgress = false; - for(int idx = 0; idx < 9; idx++) { - final int mask = 1 << idx; - Candidate candidate = candidates[idx]; - if(candidate != null) { - Slot slot = craftingGrid.get(idx); - for(Slot srcSlot : candidate.sourceSlots) { - int current = getSlotStackSize(slot); - if(current >= targetAmount) { - break; - } - if(container.moveItems(srcSlot.slotNumber, slot.slotNumber, slot.slotNumber+1, targetAmount - current)) { - slotsToProcess &= ~mask; - madeProgress = true; - } - } - - int current = getSlotStackSize(slot); - if(candidate.entry != null) { - if(current < targetAmount) { - int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); - slotsToProcess &= ~mask; - current += toMove; - } - } - - if(current > 0) { - maxAmount = Math.min(maxAmount, current); - } - } - } - }while(madeProgress && slotsToProcess != 0); - } - - private static int getSlotStackSize(Slot slot) { - ItemStack stack = slot.getStack(); - return (stack != null) ? stack.stackSize : 0; - } - - private static boolean isStackCompatible(PositionedStack pstack, ItemStack stack) { - for(ItemStack istack : pstack.items) { - if(InventoryUtils.canStack(stack, istack)) { - return true; - } - } - return false; - } - - private Candidate findAllCandidates(PositionedStack pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - Candidate bestInventory = null; - Candidate bestNetwork = null; - for(ItemStack istack : pstack.items) { - Candidate candidate = findCandidates(istack, gui, db, candidates); - if(candidate.available > 0) { - if(bestInventory == null || bestInventory.available < candidate.available) { - bestInventory = candidate; - } - } - if(candidate.entry != null) { - if(bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { - bestNetwork = candidate; - } - } - } - if(bestInventory != null) { - return bestInventory; - } else { - return bestNetwork; - } - } - - private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - for(Candidate candidate : candidates) { - if(candidate != null && InventoryUtils.canStack(candidate.stack, stack)) { - return candidate; - } - } - Candidate candidate = new Candidate(stack); - InventoryPanelContainer container = gui.getContainer(); - findCandidates(candidate, stack, container.getReturnAreaSlots()); - findCandidates(candidate, stack, container.getPlayerInventorySlots()); - findCandidates(candidate, stack, container.getPlayerHotbarSlots()); - if(candidate.available == 0 && db != null) { - candidate.entry = db.lookupItem(stack, null, false); - if(candidate.entry != null && candidate.entry.getCount() <= 0) { - candidate.entry = null; - } - } - return candidate; - } - - private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { - for(Slot slot : slots) { - ItemStack slotStack = slot.getStack(); - if(slotStack != null && InventoryUtils.canStack(slotStack, stack)) { - candidates.sourceSlots.add(slot); - candidates.available += slotStack.stackSize; - } - } - } - } - - static class Candidate { - final ItemStack stack; - final ArrayList sourceSlots = new ArrayList(); - ItemEntry entry; - int available; - int used; - - public Candidate(ItemStack stack) { - this.stack = stack; - } - - public int getAvailable() { - int avail = available; - if(entry != null) { - avail += entry.getCount(); - } - if(avail > 0 && used > 1) { - avail = Math.max(1, avail / used); - } - return avail; - } - } } From e55d6d1d8b3905f23190cc8a32b9353a64f5fb28 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 10 May 2015 00:01:00 +0200 Subject: [PATCH 08/25] #2441 Use the correct variable names for the slots --- .../enderio/conduit/gui/ExternalConnectionContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index e5b93c49..b4a0fdc9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -64,12 +64,12 @@ public class ExternalConnectionContainer extends Container { x = 10; y = 47; - slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 3, x, y)); + slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 3, x, y)); slotLocations.add(new Point(x, y)); x = 10; y = 47; - slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 2, x, y)); + slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 2, x, y)); slotLocations.add(new Point(x, y)); x = 28; From b1cd97eef56d15864a5be9ff217a08aa31ae922f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 9 May 2015 18:20:30 -0400 Subject: [PATCH 09/25] #2355 Disallow non-opaque blocks from being used for painted glowstone --- .../enderio/machine/painter/BlockPaintedGlowstone.java | 9 ++++++++- src/main/java/crazypants/util/BlockCoord.java | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index a4d5dc25..2f30b179 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -33,8 +33,10 @@ import crazypants.enderio.TileEntityEio; import crazypants.enderio.item.IRotatableFacade; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.util.BlockCoord; import crazypants.util.IFacade; import crazypants.util.Lang; +import crazypants.util.Util; public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvider, IPaintedBlock, IFacade, IRotatableFacade { @@ -185,7 +187,7 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid } return Blocks.anvil.getIcon(world, x, y, z, blockSide); } - + @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister IIconRegister) { @@ -239,6 +241,11 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid super(Blocks.glowstone, BlockPaintedGlowstone.this); MinecraftForge.EVENT_BUS.register(this); } + + @Override + public boolean isValidPaintSource(ItemStack paintSource) { + return super.isValidPaintSource(paintSource) && Util.getBlockFromItemId(paintSource).isOpaqueCube(); + } @Override public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { diff --git a/src/main/java/crazypants/util/BlockCoord.java b/src/main/java/crazypants/util/BlockCoord.java index 9c871ea1..668b9dbc 100644 --- a/src/main/java/crazypants/util/BlockCoord.java +++ b/src/main/java/crazypants/util/BlockCoord.java @@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -72,11 +73,11 @@ public final class BlockCoord { return (int)Math.ceil(Math.sqrt(dsq)); } - public Block getBlock(World world) { + public Block getBlock(IBlockAccess world) { return world.getBlock(x, y, z); } - public TileEntity getTileEntity(World world) { + public TileEntity getTileEntity(IBlockAccess world) { return world.getTileEntity(x, y, z); } From 37770cb6f8d4668b84d222267e8c75a606f40635 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 9 May 2015 18:48:11 -0400 Subject: [PATCH 10/25] #2339 Fix being able to improperly rotate double chests --- .../enderio/item/ItemYetaWrench.java | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index fc8322e4..1e3e8670 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -8,8 +8,10 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; @@ -38,7 +40,7 @@ import crazypants.enderio.tool.ToolUtil; public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdvancedTooltipProvider, InvocationHandler { public static ItemYetaWrench create() { - if(Config.useSneakMouseWheelYetaWrench) { + if (Config.useSneakMouseWheelYetaWrench) { PacketHandler.INSTANCE.registerMessage(YetaWrenchPacketProcessor.class, YetaWrenchPacketProcessor.class, PacketHandler.nextID(), Side.SERVER); } ItemYetaWrench result = new ItemYetaWrench(); @@ -69,26 +71,43 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { Block block = world.getBlock(x, y, z); boolean ret = false; - if(block != null) { + if (block != null) { PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, x, y, z, side, world); - if(MinecraftForge.EVENT_BUS.post(e) || e.getResult() == Result.DENY || e.useBlock == Result.DENY || e.useItem == Result.DENY) { + if (MinecraftForge.EVENT_BUS.post(e) || e.getResult() == Result.DENY || e.useBlock == Result.DENY || e.useItem == Result.DENY) { return false; } - if(player.isSneaking() && block instanceof IDismantleable && ((IDismantleable) block).canDismantle(player, world, x, y, z)) { - if(!world.isRemote) { + if (player.isSneaking() && block instanceof IDismantleable && ((IDismantleable) block).canDismantle(player, world, x, y, z)) { + if (!world.isRemote) { ((IDismantleable) block).dismantleBlock(player, world, x, y, z, false); } ret = true; - } else if(!player.isSneaking() && block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) { + } else if (!player.isSneaking() && block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) { + if (block == Blocks.chest) { + // This works around a forge bug where you can rotate double chests to invalid directions + TileEntityChest te = (TileEntityChest) world.getTileEntity(x, y, z); + if (te.adjacentChestXNeg != null || te.adjacentChestXPos != null || te.adjacentChestZNeg != null || te.adjacentChestZPos != null) { + // Render master is always the chest to the negative direction + TileEntityChest masterChest = te.adjacentChestXNeg == null && te.adjacentChestZNeg == null ? te : te.adjacentChestXNeg == null ? te.adjacentChestZNeg: te.adjacentChestXNeg; + if (masterChest != te) { + int meta = world.getBlockMetadata(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord); + // Black magic + int newMeta = meta + (meta % 2 == 0 ? 1 : -1); + world.setBlockMetadataWithNotify(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord, newMeta, 3); + } else { + // If this is the master chest, we can just rotate twice + block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side)); + } + } + } ret = true; - } else if(block instanceof IRotatableFacade && !player.isSneaking() + } else if (block instanceof IRotatableFacade && !player.isSneaking() && (block != EnderIO.blockConduitBundle || ConduitDisplayMode.getDisplayMode(stack) == ConduitDisplayMode.NONE)) { - if(((IRotatableFacade) block).tryRotateFacade(world, x, y, z, ForgeDirection.getOrientation(side))) { + if (((IRotatableFacade) block).tryRotateFacade(world, x, y, z, ForgeDirection.getOrientation(side))) { ret = true; } } } - if(ret) { + if (ret) { player.swingItem(); } return ret && !world.isRemote; @@ -96,14 +115,14 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv @Override public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { - if(!Config.useSneakRightClickYetaWrench) { + if (!Config.useSneakRightClickYetaWrench) { return equipped; } - if(!player.isSneaking()) { + if (!player.isSneaking()) { return equipped; } ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); - if(curMode == null) { + if (curMode == null) { curMode = ConduitDisplayMode.ALL; } ConduitDisplayMode newMode = curMode.next(); @@ -166,7 +185,7 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv ArrayList tmp = new ArrayList(); TooltipAddera.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); - for(String line : tmp) { + for (String line : tmp) { list.add(String.format(line, keyName)); } } From 6ac625e62db44d0a15f981ee0efdf412447621e7 Mon Sep 17 00:00:00 2001 From: downslope7 Date: Sat, 9 May 2015 17:53:40 -0500 Subject: [PATCH 11/25] Fix config typos, closes #2447 --- src/main/java/crazypants/enderio/config/Config.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 4e94d81b..baeec75f 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -712,9 +712,9 @@ public final class Config { "Travel Anchors send a chat warning when skipping inaccessible anchors").getBoolean(travelAnchorSkipWarning); travelStaffMaxDistance = config.get(sectionStaff.name, "travelStaffMaxDistance", travelStaffMaxDistance, - "Maximum number of blocks that can be traveled using the Staff of the Traveling.").getInt(travelStaffMaxDistance); + "Maximum number of blocks that can be traveled using the Staff of Traveling.").getInt(travelStaffMaxDistance); travelStaffPowerPerBlockRF = (float) config.get(sectionStaff.name, "travelStaffPowerPerBlockRF", travelStaffPowerPerBlockRF, - "Number of RF required per block travelled using the Staff of the Traveling.").getDouble(travelStaffPowerPerBlockRF); + "Number of RF required per block traveled using the Staff of Traveling.").getDouble(travelStaffPowerPerBlockRF); travelStaffMaxBlinkDistance = config.get(sectionStaff.name, "travelStaffMaxBlinkDistance", travelStaffMaxBlinkDistance, "Max number of blocks teleported when shift clicking the staff.").getInt(travelStaffMaxBlinkDistance); @@ -1060,7 +1060,7 @@ public final class Config { "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getBoolean(magnetAllowDeactivatedInBaublesSlot); magnetBaublesType = config.get(sectionMagnet.name, "magnetBaublesType", magnetBaublesType, - "The BaulesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString(); + "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString(); useCombustionGenModel = config.get(sectionAesthetic.name, "useCombustionGenModel", useCombustionGenModel, "If set to true: WIP Combustion Generator model will be used").getBoolean(useCombustionGenModel); @@ -1239,7 +1239,7 @@ public final class Config { "When set to true a list of all registered mobs will be dumped to config/enderio/mobTypes.txt The names are in the format required by EIOs mob blacklists."); xpObeliskMaxXpLevel = config.get(sectionMisc.name, "xpObeliskMaxXpLevel", xpObeliskMaxXpLevel, "Maximum level of XP the xp obelisk can contain.").getInt(); - xpJuiceName = config.getString("xpJuiceName", sectionMisc.name, xpJuiceName, "Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds) - this should match the with OpenBlocks when installed"); + xpJuiceName = config.getString("xpJuiceName", sectionMisc.name, xpJuiceName, "Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds) - this should match with OpenBlocks when installed"); clearGlassSameTexture = config.getBoolean("clearGlassSameTexture", sectionMisc.name, clearGlassSameTexture, "If true, quite clear glass will use the fused quartz border texture for the block instead of the white border."); clearGlassConnectToFusedQuartz = config.getBoolean("clearGlassConnectToFusedQuartz", sectionMisc.name, clearGlassConnectToFusedQuartz, "If true, quite clear glass will connect textures with fused quartz."); From cfcc8a6435c7c6e81a03b8691e000900ba3a6696 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 9 May 2015 19:06:17 -0400 Subject: [PATCH 12/25] Clean up double chest meta logic --- src/main/java/crazypants/enderio/item/ItemYetaWrench.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index 1e3e8670..e66203ab 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -90,9 +90,7 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv TileEntityChest masterChest = te.adjacentChestXNeg == null && te.adjacentChestZNeg == null ? te : te.adjacentChestXNeg == null ? te.adjacentChestZNeg: te.adjacentChestXNeg; if (masterChest != te) { int meta = world.getBlockMetadata(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord); - // Black magic - int newMeta = meta + (meta % 2 == 0 ? 1 : -1); - world.setBlockMetadataWithNotify(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord, newMeta, 3); + world.setBlockMetadataWithNotify(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord, meta ^ 1, 3); } else { // If this is the master chest, we can just rotate twice block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side)); From 1735fb59c8378e07bd741ce3c3ac28fa3d9437fe Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 10 May 2015 04:05:19 -0400 Subject: [PATCH 13/25] #2453 Fix compat with newer forge versions in reservoir --- .../crazypants/enderio/machine/reservoir/TileReservoir.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 2898be45..8365e006 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -301,7 +301,7 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank nbtRoot.setBoolean("autoEject", autoEject); - if(tank.getFluid() != null && FluidRegistry.getFluidName(tank.getFluid().fluidID) != null) { + if(tank.getFluid() != null && FluidRegistry.getFluidName(tank.getFluid()) != null) { nbtRoot.setTag("tank", tank.getFluid().writeToNBT(new NBTTagCompound())); } if(regenTank != null) { From ed8845db87b687faa549bbbd4237c1c7defb49e9 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 10 May 2015 23:27:40 -0400 Subject: [PATCH 14/25] Use .chatString() when displaying block coords in item conduit printout --- .../enderio/conduit/item/ItemConduitNetwork.java | 4 ++-- src/main/java/crazypants/util/BlockCoord.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 46489985..e9b99a4b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -180,7 +180,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork Date: Wed, 13 May 2015 14:05:34 -0400 Subject: [PATCH 15/25] Add tooltip to telepad, add coord selector recipe --- resources/assets/enderio/lang/en_US.lang | 3 +++ src/main/java/crazypants/enderio/EnderIO.java | 4 ++-- .../java/crazypants/enderio/teleport/TeleportRecipes.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index f9da1c9d..2d96789d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -553,6 +553,9 @@ enderio.blockTravelPlatform.invalidTarget=Destination is Obstructed enderio.blockTravelPlatform.outOfRange=Destination out of range tile.blockTelePad.name=Telepad Block +tile.blockTelePad.tooltip.detailed.line1=Uses power to teleport entities +tile.blockTelePad.tooltip.detailed.line2=to a specific position and dimension. +tile.blockTelePad.tooltip.detailed.line3=Must be placed in a 3x1x3 multiblock. enderio.gui.telepad.teleport=Teleport! item.itemTravelStaff.name=Staff of Traveling diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index a2b2e03e..aea165b3 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -194,7 +194,7 @@ public class EnderIO { //Teleporting public static BlockTravelAnchor blockTravelPlatform; public static BlockTelePad blockTelePad; - public static ItemCoordSelector itemCoordsCard; + public static ItemCoordSelector itemCoordSelector; public static ItemTravelStaff itemTravelStaff; // Painter @@ -353,7 +353,7 @@ public class EnderIO { blockEnderIo = BlockEnderIO.create(); blockTravelPlatform = BlockTravelAnchor.create(); blockTelePad = BlockTelePad.create(); - itemCoordsCard = ItemCoordSelector.create(); + itemCoordSelector = ItemCoordSelector.create(); blockSliceAndSplice = BlockSliceAndSplice.create(); blockSoulFuser = BlockSoulBinder.create(); diff --git a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java index bd2af4ac..bd5af150 100644 --- a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java +++ b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java @@ -43,5 +43,8 @@ public class TeleportRecipes { ItemStack fq = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()); GameRegistry.addRecipe(new ShapedOreRecipe(telepad, "gSg", "dAd", "dod", 'g', fq, 'S', staff, 'd', "ingotDarkSteel", 'A', travelBlock, 'o', octadic)); } + + ItemStack coordSelector = new ItemStack(EnderIO.itemCoordSelector); + GameRegistry.addRecipe(new ShapedOreRecipe(coordSelector, "sps", " cs", " s", 's', "ingotElectricalSteel", 'p', Items.ender_pearl, 'c', Items.compass)); } } From efb13d192367c85e2f932eff6778787abf78c4e7 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 13 May 2015 14:34:31 -0400 Subject: [PATCH 16/25] Fix telepad rendering with breaking animation --- .../teleport/telepad/TelePadRenderer.java | 36 +++++++++++++++---- .../enderio/teleport/telepad/TileTelePad.java | 2 +- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index eb74aca1..663df966 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -9,12 +9,14 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.GroupObject; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.collect.Lists; import crazypants.render.CubeRenderer; import crazypants.render.TechneModelRenderer; import crazypants.render.TechneUtil; +import crazypants.util.BlockCoord; public class TelePadRenderer extends TechneModelRenderer { @@ -37,21 +39,41 @@ public class TelePadRenderer extends TechneModelRenderer { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { TileTelePad te = (TileTelePad) world.getTileEntity(x, y, z); - IIcon cached = renderer.overrideBlockTexture; boolean ret = true; - if(te.inNetwork()) { - renderer.overrideBlockTexture = null; - if(te.isMaster()) { - super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + if (te.inNetwork()) { + if (renderer.hasOverrideBlockTexture()) { + IIcon icon = renderer.overrideBlockTexture; + renderer.renderFaceYNeg(block, x, y, z, icon); + renderer.renderFaceYPos(block, x, y, z, icon); + BlockCoord bc = te.getLocation(); + if (!isTelepad(world, bc, ForgeDirection.EAST)) { + renderer.renderFaceXPos(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.WEST)) { + renderer.renderFaceXNeg(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.SOUTH)) { + renderer.renderFaceZPos(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.NORTH)) { + renderer.renderFaceZNeg(block, x, y, z, icon); + } } else { - ret = false; + if (te.isMaster()) { + super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } else { + ret = false; + } } } else { renderer.renderStandardBlock(block, x, y, z); } - renderer.overrideBlockTexture = cached; return ret; } + + private boolean isTelepad(IBlockAccess world, BlockCoord pos, ForgeDirection dir) { + return pos.getLocation(dir).getTileEntity(world) instanceof TileTelePad; + } @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index ec731ca5..9c3964a0 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -49,7 +49,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private boolean inNetwork; - private EnumSet connections = EnumSet.noneOf(ForgeDirection.class); + EnumSet connections = EnumSet.noneOf(ForgeDirection.class); private EnergyStorage energy = new EnergyStorage(100000, 1000, 1000); From 50542a8799029194f6d286093f2702f1e54db781 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 15 May 2015 02:29:40 -0400 Subject: [PATCH 17/25] More new textures! --- .../textures/items/extractSpeedDowngrade.png | Bin 203 -> 1722 bytes .../textures/items/filterUpgradePower.png | Bin 391 -> 1503 bytes .../enderio/textures/items/itemGliderWing.png | Bin 262 -> 1395 bytes .../textures/items/itemGliderWings.png | Bin 280 -> 1351 bytes .../items/old/extractSpeedDowngrade.png | Bin 0 -> 203 bytes .../textures/items/old/filterUpgradePower.png | Bin 0 -> 391 bytes .../textures/items/old/itemGliderWing.png | Bin 0 -> 262 bytes .../textures/items/old/itemGliderWings.png | Bin 0 -> 280 bytes .../enderio/textures/items/old/silicon.png | Bin 427 -> 1334 bytes .../assets/enderio/textures/items/silicon.png | Bin 1334 -> 1396 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png create mode 100644 resources/assets/enderio/textures/items/old/filterUpgradePower.png create mode 100644 resources/assets/enderio/textures/items/old/itemGliderWing.png create mode 100644 resources/assets/enderio/textures/items/old/itemGliderWings.png diff --git a/resources/assets/enderio/textures/items/extractSpeedDowngrade.png b/resources/assets/enderio/textures/items/extractSpeedDowngrade.png index 0a98aedb92ce210b9061902c4d7735dace3b87de..a8c85b9824e8b1908a161fb2966b7ad990a3f4a5 100644 GIT binary patch literal 1722 zcmbVNdrT8|950}P6$B@4fPiOl4kzvP30%`!`#>H7Ld8+%=D4;8RP0^3p0qSL5RLM% zgE?`auG30}B7z{!F+_raF{g+ICdgz!CP5U$D8`8ncje*shcU}8x%<67pU?O4`+jq| zG0~weR4*!pLU9QXlgY^uu)R+6$gkdH8Yc%&B1A!K#1aVuj3X4W8dD-bxE4-ABvHbQ@VU|ZrcWFz!Zc? z5z?leQbff7QVd4`9)m|$G1)922x72!T!_UA0N6|x2V^lpHbiH!_}m~qD-f7@Xrwh< zoyeEV*3H-=S3+7cLFo7(XfPNU1`Y$mlRy>(K_HV2ve|SJLD#3F1Z-Nc5W}lev4lAsdkNhQ9&Vke32)mtm?MS_CD+WkMQx!cc3}d?;86 z!9l!0I;`Yz=`fG0qC?Ce6`iHxA+QqW1*;O(vpR3$b68RtJ6I}~KpZiP6~cwYL7ZTT zRLo&YATBeAJ+|p z8dQxL^s8()G##)E!8K`!dL52wfvFVpHE%Hg-$I|}tN(B6K+-ADRww_eo7pY07;V$n zT|h2g_Ys1U&4ZI&^2dlmLZR6Ah0DZo#-5S*_7tyJH_NA8%ThYcEuTz??)ql?=NR2q zw7zths|hLejVOTL3+a)c$)RRvnp@rWcniX;j@7xn6Z+oXhu0?#Tr__dc-y+~($!W$ z*G^7f29|gzcGHsY>lEFOdwz7dQ{G1K&FLlWL&>Z2l!9xi?gw_(7%ibkBUk3+w`7|> z7x;4cx3-=4L4cwN_-<1|Vcv~FJT_4L&Z!c+C-VCG0PP#YV`slWhY{r)9TF%#@B|ScPlz6ryP&RIE`*Q zpJ&wR5}a0RD`I@jxGHTwt8h5K$Y+^Ilv$WX@vVXf%g zi(~OwhWus8nX12zJ(xVvd$M$_DzjT{V@b{WSX zT58tRO$=CT(kEYaFZiOMV2r!gWXG-^n%DSK^U~|Zj+ffKb$+LrhY&#q)1!ZKczBia z-0eMsE5>mbU~%`RF`q8it|MPsKQ6VCJK}ZT){fx}uIs(g;v~;4nJ@ErzW#^d=bQhsI~Y7&{an^LB{Ts5lNv(1 diff --git a/resources/assets/enderio/textures/items/filterUpgradePower.png b/resources/assets/enderio/textures/items/filterUpgradePower.png index ac49007be8f09c73d039c76d50592da7d8408662..5d1b13ffb77129feafa47c96a485578dcc9c0bde 100644 GIT binary patch literal 1503 zcmaJ>drT8|96zX_anuyc9BTy6b7IHZUazmCCsj%x(2aJ84dO-|$Mt{{dROlbTOhHd zL>)SxlVwZ{F2*>63NAAQ!GM!JbYo;jgGvK<89uS$1i1yct6gPfZ4+olAyzj7n3<8 z?x|RHl1v2v(Ok-%$LBe-FoN-_@GwRd@cINc0HiJs_;8|>QCUhDJ<#GsU}^vp9C%3{2Ls+Rn!^GnXxuL*+{0!V0>>eI zsR?>6D$kh>S{RlD^(wuRP-_qnHL4K3&WIoiP@_h)FrtPvMkRt^Iut_;;KYK2Xso9Q z%dy%gVhJx3RKoK<42J!Fzsj#wF>Eo67>!0)t${TfrGQX!6*P|rlr%SQ(u0-c2$u5k z6hnhyk9Z+d&YK`X>GKr4KBx1AW15>Nlu$A_fcs!XrG~xUa9-nRj?W=q%6KK3b65CC zIEUnza+VPKQ8aIoEY$Axfx!OV!&f@;jD#fDlD#HKSN zh}ohwqk7b?Mo_JNlIx&39;XR%l1shh8eYrAEG&uh4C`i?vdQjcmoPlTl`uZgVgcpL zDB8pLxp%{roe)a0)N0aWXBjUzUK)&gMR+ttpPph(v6(dp8kTNEbQX(2uS>VtP`lA= zh9{7R12ezW%4rlO|z!!q*p5D?DDzJxL40&I(ga0N?EafJnE)YIX-M z3@z&^l`WA3o36a|&9wC61a;$NgUxF0t^qIII;@LJRfP7PUYDP)QpydIxLEzP(+`>Z z@?6Okvm&~?=AS1CyLuG$XRYNLm=V(vIa=f+wF!9y8g!7y4R=e(~w`HcS z_~MuOL#_P>AGEkKB)z|9B}oU%45IwzzCT89^2xJX@>SfaYWW69Ti@;Zv9e9}Z!@|x z>tf^w2Zlw4olbX0*8auj8?==j~tM7tr;8{E%+q4 z&Lif7PeXs5Y}K}{Y{3jW#rvz=!DB0?{(60+p>!~~?PJBPnfr5_NdIDbFP&0%^zzL* zd9YYhFA=ByG^J6Nne@5u#@}OjV^2}UF4uy#i$7jPcAqaR3c@4X4ZroCD^ORLgA(vo z?=`le6j->s|4!~5(fZ8B3twM4Jf~yqk>l>vbFmqFVheP#s39J!-tXSPi9u=Nmh~mT za7ZNe5A0121n)239M3E~lcty@I&gO7(5ji0b7ftNwz~F3h@)$6rS8^sh<1#m$>X4e zKPmk^eJnns>R95E=EwJlC;erHF1mGWDC<+HR1=a)JD){WeK;50WUtu~?MjQU-Hu#K u81$w5eCD&^;UirYZ+1LwNIa1^B_5b_RC#J+;e{>XU#`REvK~q=2>lD$0xMtu literal 391 zcmV;20eJq2P)|mCcTYZj3QTvC&fvhnaKE%)r0IWw$FyZLJk+txR&?;=Wv#$zf})6t~JV1)Q%$ zthE9V1OY)1eBdUbrinsnQ!<$h0K?%B*L4ZQkW4xa!0pX7xm<2M=T19TYjvvI6-IGP z9LFf75D^fef7c)PCL&I@1)VvLc(MoHF-8%cw*Ybo5`c_4Bf?+=4w*?EZZwcMo(&Ngu19eUB}fFvDTA59P0->4t7;Nk zPWhd#MJ;t@gM*49QYab@hjn4SPLL{4oFqvUBT#}sR0~9|=M_4F@N#;L!3ktW3W-Wc z;GrlZ9S~|28?1V|a0O2EdY6cKc`;CG$j}HaqPPx2IWBsyd23nmgMZyv)>P;b0xZ0UXa8^LP}M0k zS||Uho7k3GjM3>*7pRM+J_5YjJd)Zap4HYwjVA7>$7wH$jGZVP_VwpHWh)$Vv^1Tv z=B{tscsXb7iG5*8BQ9@9r6H z)xOiYFL~R0&mH&@PGzRrM_;+$KD_Ri6UDnkxh$~lv4`1}GqnZ1m&W@0tgqgz>l(Fe zpS6$AarPaZ=WjKf?qf5KwC-rC`Bh#?_9EKvTe5b#&yF70P&nOf?EdLuW#hSL2Jj}!+%`4lNwCUp3Xb`Ah7q@j8Qw`DZSLpbPrs=ihZ>vDJgL-$j+o?5BXM! zJ4eJrKe*hr*zL4?&29OHgT1a|?e501f|lme)0y8)xF*0Bv)8aE{nqhK5w5o5$3)aM z+1~U?W&Dvr4Y4Bo?urRyw$2t2UW1=bI6i(K*>CC1xz@t|b;ci;mLOhDZL6y}`o_l{ z0(5R|f8K>Bx^Bdmo;)`7K>IrP^B4K4V{11M#xhvT?8T}15jgR3=A9lx&I`x0{NT;9+AZi419+{nDKc2 ziWH!rREcXuNpOBzNqJ&XDnmeGW?qS&pKFLhnX#U!o}q!km!gG0Ri&OTjv*HQOZztR zHW=`*7_(|CTr_5}Rh`P7EOX6BHT=Dm5;g z{%vD>dH3x0j<|h&rs5Zhv=%%qj+R>3Filn9SK~BSkvj~N4m0XztFST07xhc8m@ep( hAYzf$kSwETp8s(58tuP*K0p^Rc)I$ztaD0e0sy*sQ-1&e diff --git a/resources/assets/enderio/textures/items/itemGliderWings.png b/resources/assets/enderio/textures/items/itemGliderWings.png index 523371ce66830003d7a1cfea134aed96d67edc4c..c876e7478266d4216aba56d6f9f6fb6c13a8bf70 100644 GIT binary patch literal 1351 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij}3CiKD5psk5Vzp|PQ%tBIwPv8khhlasNF zv8$1rlM_s@OMY@`Zfaf$Om7N8uM1ASpp=kX0JPa9wJ5VJHN~wcKUV?lW2;QuZgIqE z9#n4%Znrq$)TVL91WY_2COp*wIq-C!ng>kmMZi=o-?O%#fq`+4r;B4q z#jQ7Cw%&&WMBW;&luc5OI^(YUYJo;mw+FjAySVv(hnJTgneDxBsn@I{9`E<^^Mp)PGHJEpX!pLi*Yf+5J+lq&e@{Lfle|%JeTRcf!WPaa z#g_Zad$%yHG4J3xe4t@t{KeN>7T*4L+V;rGsig;woi$A`+RUNh;py?f`JK9nZ}AVV zj`}<7Q(mt%V>`?C;Ob4o1@jIVZCk^%DrnO0rq+AR4twKPD;3-FMr=LRkQv+V7j&l4 zLc5+pu2Sy7v1@z}KL6x=pm(=ECH703zEj=Kq>Xi74=;95>pc^v+pXPrrt@XiBGwfv zF5lM`ES6Ch(4H*Z@ct_MfknFPudaG<{@e3GBS4WqV-=H+?yEfp$N4$S;;OPIZM}Hs zV}*^t=il5*LK-*m&)YC>-AX&#{#I{BU&pjN%(uUst9)KAHt)Bpt!w@skr~XZI(W~X z_xXDF{Oh?vk2ja>s(RG=IC{c)J?6!J*Igr77}aNY>-l#aY|N~l-|*>{TEgmz#@{Uo z_S;?u*;O4~`ctttdGF!Vw$)eKMLPi$b9{HAdD{gDEuk}nSr U)s*eO0(26Cr>mdKI;Vst03s`6?EnA( diff --git a/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png b/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png new file mode 100644 index 0000000000000000000000000000000000000000..0a98aedb92ce210b9061902c4d7735dace3b87de GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4$}%o!BpvgYpqif|Tq zL>4nJ@ErzW#^d=bQhsI~Y7&{an^LB{Ts5lNv(1 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/filterUpgradePower.png b/resources/assets/enderio/textures/items/old/filterUpgradePower.png new file mode 100644 index 0000000000000000000000000000000000000000..ac49007be8f09c73d039c76d50592da7d8408662 GIT binary patch literal 391 zcmV;20eJq2P)|mCcTYZj3QTvC&fvhnaKE%)r0IWw$FyZLJk+txR&?;=Wv#$zf})6t~JV1)Q%$ zthE9V1OY)1eBdUbrinsnQ!<$h0K?%B*L4ZQkW4xa!0pX7xm<2M=T19TYjvvI6-IGP z9LFf75D^fef7c)PCL&I@1)VvLc(MoHF-8I%jUD}^c z&JCLJQ@r4dg3`JZH*G!$RBBu}{oBU&^6uH~9dY~mOvNu0X)SnK94)o5VVbJIuf}Pv zB6k=j9cI+cR$*g~FY1?GF$)eKMLPi$b9{HAdD{gDEuk}nSr U)s*eO0(26Cr>mdKI;Vst03s`6?EnA( literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/silicon.png b/resources/assets/enderio/textures/items/old/silicon.png index c47990cff64ca1af0e87127695899a4f6dd7ec6b..c840d947ba6c1041abcdf66df817877937e5adce 100644 GIT binary patch literal 1334 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvG z&L-wgrp}fwrp8X@1|}9Ty`Fi+C5d^-sW7`Ufp$ann&8!ItLH#=V}vG{MKK#R`19ETLmuH^p=M+$pp=bb;77Azw#b2y_pWQoV+ zavK}lTPiahPE1*AF7>qG;cbD*nN5rTIycN}v1z#`WyG;@@7B)e*Tv_X&pv3L0IY~HgTg?O$AMf<3r4Pv1Na{U)`%s&3)<5?L{7y9DN&%}?%tveQV%rW2RJV|B0 rJ!kRzL!$ie-iyuK{Qv(H;LN@>a0VhdBK~y+T-B8(1!ax-5 zoB!ehvIr6c3$+w*XenKUu23s#MO2Lb{p2`PYfKR2os-mg0R=20nhz`ecF?AyrJx=5MHz5qw z0$~-dm_Vg;zJEPMUm+N2CdS4Dj_tu^V-9VoJq;bHi;G$l#e8|YK&vTHE<$=L)V>CN zV1RVLoyA5QwMreiqtpLCk}pc447shOL_W>Bh-$fpLawy#evqBNU>zxU;v^oK-^+zc v8vW!jzwZ85;0KIA^T&nMbpvsKAP8UKX_s)+x!O?x015yANkvXXu0mjfhD)kH diff --git a/resources/assets/enderio/textures/items/silicon.png b/resources/assets/enderio/textures/items/silicon.png index c840d947ba6c1041abcdf66df817877937e5adce..8b932a0cc0b0cfbf62e45c2a5d1dee95cffa66e3 100644 GIT binary patch delta 563 zcmdnS^@VFg9Fu~fg|VBtrL%#PtC6drp{t3LfvJ&`g^{zRnVX5BshP>-Iwl#YA}2ST zigq!@t0X2H8Yfv8rs$@anJ4O+nVDGXT3DEx>6)1&8Kfl}S(qmorA)SEZmKW&8XdvF zz&O*>#WAGf){$UeZ>B&ITjRc2EkP`Ty-hA6YnwBk_h$&2PMYyweUY!=kBx;_*X436 zo9EsQagkd1*nL*pzq9;)S3S_nu>0hUi)m~DZOus= zIc{%LJiY0Ihl`aaICmE)t9(-D)D8m=bS5Q=Stb1Xm)Yl3d4;7(H zKhC(RSj_b+jI_2o_VcJ}UeR}@{d+feKRs)Duw%2tHo+qS8ZP{ih5x>CvZ)r7-;}hD zzs0ra(}$k4y^XWt9MvXIR5J`o#?^N_>eZa%9J3wn+r{8Ms?u;#2AAapI*vB(% zvY}nGAVZ(roe1`+oU@L&Yz;{>W_Wc~YTsEtt26&uJeFS$`u1wp-sLRL>pw*aBrUxD z_Tch$2Xdr4jz7M1CHz765o?#lffMJXU#Yy4SIbpaW3h0@mWQrVj2BA(hI4I?&~f8b r^jI2n=|kJ9RaTM@;_WW?GcYsEs6BC?Wi59+0}yz+`njxgN@xNAC)Vq( delta 500 zcmeyuwT){-9Fu~pxsjoTrJ1RtAqcpdI69k{JDECLx|kX}nH!i`Os->+fhjV&#LVV42;p9 zE{-7;x2{ay?Z<2=;JSXVwr=G_HO}aU6%FQcoKm-WHgg z*|hktbHl6_o0e-*MjRXWZtZ-2U3|Xz?DMB>U-17b%P&7(9uoCab*jqAosSn@&f9IG zy;LXsfs!zj+4cu#HcDy+m~3wd<2uTn-t+L+w=7A86t;9ZekLt-h0@?9PF4a3_g5b7 z4O?|U)l<)tvH0BYq=~8f4oGZ1@tSwnQU)`r-kjA}nV#1a#^yciQHbY?P_&N<+8`Ec zAlH8}$L!-zKAx2Ub)hfL{7n3K+`3~?#~ky0&XZL3+jADbKP1Zk?!DN&&Hw+;v}2KA YXf8OqN~m&o9|I70y85}Sb4q9e0N66g1ONa4 From b9bfbb64c8c71b517c64157743b30263ffe38b2b Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 15 May 2015 11:54:34 -0400 Subject: [PATCH 18/25] Fix gas conduit item not disabling, fix loading NBT of disabled conduits --- src/main/java/crazypants/enderio/conduit/ConduitUtil.java | 8 ++++++-- .../crazypants/enderio/conduit/gas/ItemGasConduit.java | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 7a9dc356..9abb2289 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -24,10 +24,10 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; -import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.gas.GasConduitNetwork; +import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.ItemConduitNetwork; @@ -39,6 +39,7 @@ import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.liquid.LiquidConduitNetwork; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.me.MEConduitNetwork; +import crazypants.enderio.conduit.me.MEUtil; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; @@ -328,7 +329,10 @@ public class ConduitUtil { if(typeName == null || conduitBody == null) { return null; } - if(nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) { + if ((typeName.contains("conduit.me") && !MEUtil.isMEEnabled()) || typeName.contains("conduit.gas") && !GasUtil.isGasConduitEnabled()) { + return null; + } + if (nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) { Log.debug("ConduitUtil.readConduitFromNBT: Converted pre 0.7.3 fluid conduit to advanced fluid conduit."); typeName = "crazypants.enderio.conduit.liquid.AdvancedLiquidConduit"; } diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 5a160933..97d01be1 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -23,7 +23,9 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool public static ItemGasConduit create() { ItemGasConduit result = new ItemGasConduit(); - result.init(subtypes); + if (GasUtil.isGasConduitEnabled()) { + result.init(subtypes); + } return result; } From a70b4805d00391a8e32b9bcb9a3c3578c8fa0a13 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 15 May 2015 11:55:57 -0400 Subject: [PATCH 19/25] Fix not calling AbstractItemConduit.init() corrupting the item's state --- .../crazypants/enderio/conduit/AbstractItemConduit.java | 8 ++++---- .../crazypants/enderio/conduit/gas/ItemGasConduit.java | 4 ++-- .../crazypants/enderio/conduit/item/ItemItemConduit.java | 4 ++-- .../enderio/conduit/liquid/ItemLiquidConduit.java | 4 ++-- .../java/crazypants/enderio/conduit/me/ItemMEConduit.java | 4 ++-- .../enderio/conduit/power/ItemPowerConduit.java | 4 ++-- .../enderio/conduit/redstone/ItemRedstoneConduit.java | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 58e4cfc0..279f0e91 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -30,23 +30,23 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { protected IIcon[] icons; - protected AbstractItemConduit(ModObject modObj) { + protected AbstractItemConduit(ModObject modObj, ItemConduitSubtype... subtypes) { this.modObj = modObj; + this.subtypes = subtypes; setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(modObj.unlocalisedName); setMaxStackSize(64); setHasSubtypes(true); } - protected void init(ItemConduitSubtype[] subtypes) { - this.subtypes = subtypes; - icons = new IIcon[subtypes.length]; + protected void init() { GameRegistry.registerItem(this, modObj.unlocalisedName); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { + icons = new IIcon[subtypes.length]; int index = 0; for (ItemConduitSubtype subtype : subtypes) { icons[index] = IIconRegister.registerIcon(subtype.iconKey); diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 97d01be1..212fb634 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -24,13 +24,13 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool public static ItemGasConduit create() { ItemGasConduit result = new ItemGasConduit(); if (GasUtil.isGasConduitEnabled()) { - result.init(subtypes); + result.init(); } return result; } protected ItemGasConduit() { - super(ModObject.itemGasConduit); + super(ModObject.itemGasConduit, subtypes); if(!GasUtil.isGasConduitEnabled()) { setCreativeTab(null); } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java index 4e2ce9fb..019bd54c 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java @@ -19,12 +19,12 @@ public class ItemItemConduit extends AbstractItemConduit { public static ItemItemConduit create() { ItemItemConduit result = new ItemItemConduit(); - result.init(subtypes); + result.init(); return result; } protected ItemItemConduit() { - super(ModObject.itemItemConduit); + super(ModObject.itemItemConduit, subtypes); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index 7260c6df..6506d69c 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -26,12 +26,12 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT public static ItemLiquidConduit create() { ItemLiquidConduit result = new ItemLiquidConduit(); - result.init(subtypes); + result.init(); return result; } protected ItemLiquidConduit() { - super(ModObject.itemLiquidConduit); + super(ModObject.itemLiquidConduit, subtypes); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index 0b588c0b..a50429d0 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -18,13 +18,13 @@ public class ItemMEConduit extends AbstractItemConduit { public static ItemMEConduit create() { ItemMEConduit result = new ItemMEConduit(); if (MEUtil.isMEEnabled()) { - result.init(subtypes); + result.init(); } return result; } protected ItemMEConduit() { - super(ModObject.itemMEConduit); + super(ModObject.itemMEConduit, subtypes); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index ec4768f8..7d3dc4d3 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -27,12 +27,12 @@ public class ItemPowerConduit extends AbstractItemConduit { public static ItemPowerConduit create() { ItemPowerConduit result = new ItemPowerConduit(); - result.init(subtypes); + result.init(); return result; } protected ItemPowerConduit() { - super(ModObject.itemPowerConduit); + super(ModObject.itemPowerConduit, subtypes); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java index 0a88deb4..705636d8 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java @@ -18,12 +18,12 @@ public class ItemRedstoneConduit extends AbstractItemConduit { public static ItemRedstoneConduit create() { ItemRedstoneConduit result = new ItemRedstoneConduit(); - result.init(subtypes); + result.init(); return result; } protected ItemRedstoneConduit() { - super(ModObject.itemRedstoneConduit); + super(ModObject.itemRedstoneConduit, subtypes); } @Override From 26cbc4edee40d5a5331b52087dbbe1625c20e3e8 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 15 May 2015 12:00:18 -0400 Subject: [PATCH 20/25] Fix adding gas conduit recipe even when it is disabled --- .../java/crazypants/enderio/conduit/ConduitRecipes.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index c1fcd73e..375c9720 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; +import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.item.filter.ClearFilterRecipe; import crazypants.enderio.conduit.item.filter.CopyFilterRecipe; import crazypants.enderio.conduit.me.MEUtil; @@ -57,8 +58,11 @@ public class ConduitRecipes { Blocks.lever); GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 2), "bbb", "###", "bbb", 'b', conduitBinder, '#', redstoneAlloy); - GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', conduitBinder, '#', - electricalSteel, 'g', fusedGlass); + + if (GasUtil.isGasConduitEnabled()) { + GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', conduitBinder, '#', electricalSteel, 'g', + fusedGlass); + } ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0); GameRegistry.addShapedRecipe(itemConduit, "bbb", "###", "bbb", 'b', conduitBinder, '#', phasedIronNugget); From 2dd90902202a52c7c15acda31f6fab264c2bd9ee Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 16 May 2015 09:05:57 +0200 Subject: [PATCH 21/25] allow placing the inventory panels on all sides --- .../machine/invpanel/BlockInventoryPanel.java | 22 +++++++++++++ .../invpanel/BlockItemInventoryPanel.java | 33 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/BlockItemInventoryPanel.java diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index ecca1d2b..bd5c913d 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -7,13 +7,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ClientProxy; +import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; public class BlockInventoryPanel extends AbstractMachineBlock { @@ -36,6 +40,13 @@ public class BlockInventoryPanel extends AbstractMachineBlock Date: Sat, 16 May 2015 11:56:30 +0200 Subject: [PATCH 22/25] remember filter and sort mode, show item count in tooltip for large stacks, fix NEI overlapping with GUI --- resources/assets/enderio/lang/en_US.lang | 1 + .../machine/invpanel/BlockInventoryPanel.java | 1 + .../machine/invpanel/GuiInventoryPanel.java | 67 ++++++++++++++++- .../machine/invpanel/PacketGuiSettings.java | 71 +++++++++++++++++++ .../machine/invpanel/TileInventoryPanel.java | 25 +++++++ .../java/crazypants/gui/GuiContainerBase.java | 12 ++-- 6 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 2d96789d..fe0df9be 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -515,6 +515,7 @@ enderio.gui.inventorypanel.tooltip.setrecipe.line3=current recipe from the netwo enderio.gui.inventorypanel.tooltip.clear.line1=Clear crafting grid enderio.gui.inventorypanel.tooltip.clear.line2=Moves all items to the return area enderio.gui.inventorypanel.tooltip.fuelTank=Nutrient Tank +enderio.gui.inventorypanel.tooltip.itemsstored=Items Stored: %s enderio.machine.tooltip.configured=(Configured) diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index bd5c913d..3ee556d9 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -30,6 +30,7 @@ public class BlockInventoryPanel extends AbstractMachineBlock { @@ -61,6 +65,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private final MultiIconButtonEIO btnClear; private int scrollPos; + private int ghostSlotTooltipStacksize; private final String headerCrafting; private final String headerReturn; @@ -83,10 +88,18 @@ public class GuiInventoryPanel extends GuiMachineBase { this.view = new DatabaseView(); + int sortMode = te.getGuiSortMode(); + int sortOrderIdx = sortMode >> 1; + SortOrder[] orders = SortOrder.values(); + if(sortOrderIdx >= 0 && te.getGuiSortMode() < orders.length) { + view.setSortOrder(orders[sortOrderIdx], (sortMode & 1) != 0); + } + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; tfFilter = new TextFieldEIO(fr, 108, 11, 106, 10); tfFilter.setEnableBackgroundDrawing(false); + tfFilter.setText(te.getGuiFilterString()); btnSort = new IconButtonEIO(this, ID_SORT, 233, 27, getSortOrderIcon()) { @Override public boolean mousePressed(Minecraft mc, int x, int y) { @@ -156,6 +169,16 @@ public class GuiInventoryPanel extends GuiMachineBase { }); } + @Override + public void onGuiClosed() { + int sortMode = (view.getSortOrder().ordinal() << 1); + if(view.isSortOrderInverted()) { + sortMode |= 1; + } + getTileEntity().setGuiParameter(sortMode, tfFilter.getText()); + super.onGuiClosed(); + } + public void setCraftingHelper(ICraftingHelper craftingHelper) { this.craftingHelper = craftingHelper; ttRefill.setVisible(craftingHelper != null); @@ -251,13 +274,40 @@ public class GuiInventoryPanel extends GuiMachineBase { font = fontRendererObj; } String str = null; - if(stack.stackSize > 999) { - str = (stack.stackSize / 1000) + "k"; + if(stack.stackSize >= 1000) { + int value = stack.stackSize / 1000; + String unit = "k"; + if(value >= 1000) { + value /= 1000; + unit = "m"; + } + str = value + unit; } itemRender.renderItemAndEffectIntoGUI(font, mc.renderEngine, stack, x, y); itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, stack, x, y, str); } + @Override + protected void drawGhostSlotTooltip(GhostSlot slot, int mouseX, int mouseY) { + ItemStack stack = slot.getStack(); + if(stack != null) { + ghostSlotTooltipStacksize = stack.stackSize; + try { + renderToolTip(stack, mouseX, mouseY); + } finally { + ghostSlotTooltipStacksize = 0; + } + } + } + + @Override + public void drawHoveringText(List list, int mouseX, int mouseY, FontRenderer font) { + if(ghostSlotTooltipStacksize >= 1000) { + list.add(EnumChatFormatting.WHITE + Lang.localize("gui.inventorypanel.tooltip.itemsstored", Integer.toString(ghostSlotTooltipStacksize))); + } + super.drawHoveringText(list, mouseX, mouseY, font); + } + public InventoryPanelContainer getContainer() { return (InventoryPanelContainer) inventorySlots; } @@ -338,6 +388,19 @@ public class GuiInventoryPanel extends GuiMachineBase { return 212; } + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + // NEI seems to have an issue with the shifted GUI position - so let's work around it + if(x+w >= guiLeft && x < guiLeft+xSize && y+h >= guiTop && y < guiTop+49) { + return true; + } + if(x+w >= guiLeft && x < guiLeft+232 && x+h >= guiTop+49 && y < guiTop+ySize) { + return true; + } + return false; + } + @Override protected void mouseClicked(int x, int y, int button) { super.mouseClicked(x, y, button); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java new file mode 100644 index 00000000..4a36f2fe --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java @@ -0,0 +1,71 @@ +package crazypants.enderio.machine.invpanel; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.MessageTileEntity; +import io.netty.buffer.ByteBuf; +import java.io.UnsupportedEncodingException; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; + +public class PacketGuiSettings extends MessageTileEntity implements IMessageHandler { + + private int sortMode; + private String filterString; + + public PacketGuiSettings() { + filterString = ""; + } + + public PacketGuiSettings(TileInventoryPanel tile, int sortMode, String filterString) { + super(tile); + this.sortMode = sortMode; + this.filterString = filterString; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + sortMode = buf.readInt(); + int len = buf.readUnsignedShort(); + if(len > 0) { + byte[] utf8 = new byte[len]; + buf.readBytes(utf8); + try { + filterString = new String(utf8, "UTF8"); + } catch (UnsupportedEncodingException ex) { + // should not happen - if it does we can't do anything + } + } + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(sortMode); + if(filterString.isEmpty()) { + buf.writeShort(0); + } else { + try { + byte[] utf8 = filterString.getBytes("UTF8"); + buf.writeShort((short) utf8.length); + buf.writeBytes(utf8); + } catch (UnsupportedEncodingException ex) { + // should not happen - if it does we can't do anything + buf.writeShort(0); + } + } + } + + @Override + public IMessage onMessage(PacketGuiSettings message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if(te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + teInvPanel.setGuiParameter(message.sortMode, message.filterString); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index 5f40c7ab..ee6e2493 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -47,6 +47,9 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH public Container eventHandler; private IItemFilter itemFilter; + private int guiSortMode; + private String guiFilterString = ""; + public TileInventoryPanel() { super(new SlotDefinition(0, 8, 11, 20, 21, 20)); this.fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, 2000); @@ -201,16 +204,38 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH return false; } + public int getGuiSortMode() { + return guiSortMode; + } + + public String getGuiFilterString() { + return guiFilterString; + } + + public void setGuiParameter(int sortMode, String filterString) { + this.guiSortMode = sortMode; + this.guiFilterString = filterString; + if(worldObj != null && worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketGuiSettings(this, sortMode, filterString)); + } else { + markDirty(); + } + } + @Override public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); fuelTank.writeCommon("fuelTank", nbtRoot); + nbtRoot.setInteger("guiSortMode", guiSortMode); + nbtRoot.setString("guiFilterString", guiFilterString); } @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); fuelTank.readCommon("fuelTank", nbtRoot); + guiSortMode = nbtRoot.getInteger("guiSortMode"); + guiFilterString = nbtRoot.getString("guiFilterString"); } @Override diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index e8f13cad..82ffcc45 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -337,10 +337,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe if(draggingScrollbar == null) { if(hoverGhostSlot != null && mc.thePlayer.inventory.getItemStack() == null) { - ItemStack stack = hoverGhostSlot.getStack(); - if(stack != null) { - renderToolTip(stack, par1, par2); - } + drawGhostSlotTooltip(hoverGhostSlot, par1, par2); } ttMan.drawTooltips(this, par1, par2); @@ -396,6 +393,13 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe zLevel = 0.0F; } + protected void drawGhostSlotTooltip(GhostSlot slot, int mouseX, int mouseY) { + ItemStack stack = slot.getStack(); + if(stack != null) { + renderToolTip(stack, mouseX, mouseY); + } + } + protected void drawGhostSlots(int mouseX, int mouseY) { if(ghostSlots.isEmpty()) { return; From 6215e394104a5609d1058099d21339e1fad1bc4c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 18 May 2015 15:16:05 -0400 Subject: [PATCH 23/25] Fix machine active state blinking in between successive tasks --- .../crazypants/enderio/machine/AbstractMachineEntity.java | 6 +++++- .../enderio/machine/AbstractPoweredTaskEntity.java | 5 ++--- .../java/crazypants/enderio/machine/PacketProgress.java | 3 --- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 4c7b6cbe..cf2e9d46 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -212,11 +212,15 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public float getPitch() { return 1.0f; } + + protected boolean shouldPlaySound() { + return isActive() && !isInvalid(); + } @SideOnly(Side.CLIENT) private void updateSound() { if(Config.machineSoundsEnabled && hasSound()) { - if(isActive() && !isInvalid()) { + if(shouldPlaySound()) { if(sound == null) { sound = new MachineSound(soundRes, xCoord + 0.5f, yCoord + 0.5f, zCoord + 0.5f, getVolume(), getPitch()); FMLClientHandler.instance().getClient().getSoundHandler().playSound(sound); diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 1c995edb..af873ffd 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -67,7 +67,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt @Override public float getProgress() { - return currentTask == null ? 0 : currentTask.getProgress(); + return currentTask == null ? -1 : currentTask.getProgress(); } @Override @@ -132,11 +132,11 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt // this chance value has been used up nextChance = Float.NaN; } - sendTaskProgressPacket(); startFailed = !started; } else { startFailed = true; } + sendTaskProgressPacket(); return requiresClientSync; } @@ -181,7 +181,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt markDirty(); currentTask = null; lastProgressScaled = 0; - sendTaskProgressPacket(); } protected void mergeResults(ResultStack[] results) { diff --git a/src/main/java/crazypants/enderio/machine/PacketProgress.java b/src/main/java/crazypants/enderio/machine/PacketProgress.java index 8a9225b5..132d86cf 100644 --- a/src/main/java/crazypants/enderio/machine/PacketProgress.java +++ b/src/main/java/crazypants/enderio/machine/PacketProgress.java @@ -19,9 +19,6 @@ public class PacketProgress extends MessageTileEntity implements IMe public PacketProgress(IProgressTile tile) { super(tile.getTileEntity()); progress = tile.getProgress(); - if (progress == 0) { - progress = -1; - } } @Override From a9c73b70d469bb8a642fef418f18369e9a305e39 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 18 May 2015 20:45:16 -0400 Subject: [PATCH 24/25] Improve telepad power usage curve and add configs for values --- src/main/java/crazypants/enderio/config/Config.java | 6 ++++++ .../enderio/teleport/telepad/TileTelePad.java | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index baeec75f..4bb7c972 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -468,6 +468,8 @@ public final class Config { public static boolean telepadLockDimension = true; public static boolean telepadLockCoords = true; + public static int telepadPowerCoefficient = 100000; + public static int telepadPowerInterdimensional = 100000; public static float inventoryPanelPowerPerMB = 800.0f; public static float inventoryPanelScanCostPerSlot = 0.1f; @@ -1266,6 +1268,10 @@ public final class Config { "If true, the dimension cannot be set via the GUI, the coord selector must be used.").getBoolean(); telepadLockCoords = config.get(sectionTelepad.name, "lockCoords", telepadLockCoords, "If true, the coordinates cannot be set via the GUI, the coord selector must be used.").getBoolean(); + telepadPowerCoefficient = config.get(sectionTelepad.name, "powerCoefficient", telepadPowerCoefficient, + "Power for a teleport is calculated by the formula:\npower = [this value] * ln(0.005*distance + 1)").getInt(); + telepadPowerInterdimensional = config.get(sectionTelepad.name, "powerInterdimensional", telepadPowerInterdimensional, + "The amount of RF required for an interdimensional teleport.").getInt(); inventoryPanelPowerPerMB = config.getFloat("powerPerMB", sectionInventoryPanel.name, inventoryPanelPowerPerMB, 1.0f, 10000.0f, "Internal power generated per mB. The default of 800/mB matches the RF generation of the Zombie generator. A panel tries to refill only once every second - setting this value too low slows down the scanning speed."); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 9c3964a0..34bb5ac3 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -343,9 +343,11 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private int calculateTeleportPower() { if (worldObj.provider.dimensionId == targetDim) { - this.maxPower = new BlockCoord(this).distance(target) * 1000; + int distance = new BlockCoord(this).distance(target); + double base = Math.log((0.005 * distance) + 1); + this.maxPower = (int) (base * Config.telepadPowerCoefficient); } else { - this.maxPower = 100000; + this.maxPower = Config.telepadPowerInterdimensional; } return this.maxPower; } @@ -390,6 +392,11 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei public float getProgress() { return ((float) powerUsed) / ((float) maxPower); } + + @Override + protected int getProgressUpdateFreq() { + return 1; + } @Override public void setProgress(float progress) { From 789fa1f3452972b6188e8598f6ad9e7b6f43a958 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 18 May 2015 20:57:36 -0400 Subject: [PATCH 25/25] Centralize config sync packet, sync telepad lock configs --- .../java/crazypants/enderio/config/Config.java | 12 +++++++++++- .../packet => config}/PacketConfigSync.java | 11 +++++++++-- .../enderio/teleport/ConnectionHandler.java | 16 ---------------- .../teleport/anchor/BlockTravelAnchor.java | 7 ------- 4 files changed, 20 insertions(+), 26 deletions(-) rename src/main/java/crazypants/enderio/{teleport/packet => config}/PacketConfigSync.java (82%) delete mode 100644 src/main/java/crazypants/enderio/teleport/ConnectionHandler.java diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 4bb7c972..756b7754 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -4,6 +4,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import tterrag.core.common.event.ConfigFileChangedEvent; @@ -12,10 +13,13 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; import crazypants.enderio.Log; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; +import crazypants.enderio.network.PacketHandler; import crazypants.vecmath.VecmathUtil; public final class Config { @@ -477,6 +481,7 @@ public final class Config { public static float inventoryPanelExtractCostPerOperation = 32.0f; public static void load(FMLPreInitializationEvent event) { + PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); FMLCommonHandler.instance().bus().register(new Config()); configDirectory = new File(event.getModConfigurationDirectory(), EnderIO.MODID.toLowerCase()); @@ -507,7 +512,7 @@ public final class Config { @SubscribeEvent public void onConfigChanged(OnConfigChangedEvent event) { - if(event.modID.equals(EnderIO.MODID)) { + if (event.modID.equals(EnderIO.MODID)) { Log.info("Updating config..."); syncConfig(false); postInit(); @@ -525,6 +530,11 @@ public final class Config { } } + @SubscribeEvent + public void onPlayerLoggon(PlayerLoggedInEvent evt) { + PacketHandler.INSTANCE.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); + } + public static void processConfig(Configuration config) { capacitorBankMaxIoRF = config.get(sectionPower.name, "capacitorBankMaxIoRF", capacitorBankMaxIoRF, "The maximum IO for a single capacitor in RF/t") diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketConfigSync.java b/src/main/java/crazypants/enderio/config/PacketConfigSync.java similarity index 82% rename from src/main/java/crazypants/enderio/teleport/packet/PacketConfigSync.java rename to src/main/java/crazypants/enderio/config/PacketConfigSync.java index 02d06d96..49fdc12a 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketConfigSync.java +++ b/src/main/java/crazypants/enderio/config/PacketConfigSync.java @@ -1,11 +1,14 @@ -package crazypants.enderio.teleport.packet; +package crazypants.enderio.config; import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.config.Config; +/** + * Syncs some configs that are only used clientside, but must use the serverside + * value for balance purposes. + */ public class PacketConfigSync implements IMessage, IMessageHandler { @Override @@ -20,6 +23,8 @@ public class PacketConfigSync implements IMessage, IMessageHandler