From 051d19be32cd8885c53d1a5b9ddbf170c793ea79 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Mon, 5 Aug 2013 11:56:42 -0400 Subject: [PATCH] Fix multimeter GUI --- .../textures/gui/gui_multimeter.png | Bin 5664 -> 6014 bytes .../battery/TileEntityBattery.java | 2 -- .../contractor/TileEntityEMContractor.java | 1 - .../multimeter/GuiMultimeter.java | 5 ++--- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/resources/assets/resonantinduction/textures/gui/gui_multimeter.png b/resources/assets/resonantinduction/textures/gui/gui_multimeter.png index e9a16fbebb0670b38c30b13bfffaf09f14653c82..9220755dc9d1d5a8d5754e6a0c617e7a97864684 100644 GIT binary patch literal 6014 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 literal 5664 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 diff --git a/src/resonantinduction/battery/TileEntityBattery.java b/src/resonantinduction/battery/TileEntityBattery.java index 0ecdc30a..65a12785 100644 --- a/src/resonantinduction/battery/TileEntityBattery.java +++ b/src/resonantinduction/battery/TileEntityBattery.java @@ -95,7 +95,6 @@ public class TileEntityBattery extends TileEntityBase implements IPacketReceiver for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) { - System.out.println("Read"); NBTTagCompound tagCompound = (NBTTagCompound)tagList.tagAt(tagCount); int slotID = tagCompound.getInteger("Slot"); structure.inventory.add(slotID, ItemStack.loadItemStackFromNBT(tagCompound)); @@ -143,7 +142,6 @@ public class TileEntityBattery extends TileEntityBase implements IPacketReceiver { if(structure.inventory.get(slotCount) != null) { - System.out.println("Save"); NBTTagCompound tagCompound = new NBTTagCompound(); tagCompound.setInteger("Slot", slotCount); structure.inventory.get(slotCount).writeToNBT(tagCompound); diff --git a/src/resonantinduction/contractor/TileEntityEMContractor.java b/src/resonantinduction/contractor/TileEntityEMContractor.java index 37a63bee..8ae64fce 100644 --- a/src/resonantinduction/contractor/TileEntityEMContractor.java +++ b/src/resonantinduction/contractor/TileEntityEMContractor.java @@ -35,7 +35,6 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec public static int PUSH_DELAY = 5; public static double MAX_SPEED = .2; public static double ACCELERATION = .02; - public static float ENERGY_USAGE = .005F; private ForgeDirection facing = ForgeDirection.UP; diff --git a/src/resonantinduction/multimeter/GuiMultimeter.java b/src/resonantinduction/multimeter/GuiMultimeter.java index d56e532b..0e1bdd7b 100644 --- a/src/resonantinduction/multimeter/GuiMultimeter.java +++ b/src/resonantinduction/multimeter/GuiMultimeter.java @@ -95,9 +95,8 @@ public class GuiMultimeter extends GuiContainer GL11.glColor4f(1, 1, 1, 1); this.drawTexturedModalRect(this.containerWidth, this.containerHeight, 0, 0, this.xSize, this.ySize); - int length = (int) (this.tileEntity.getDetectedEnergy() / this.tileEntity.getPeak()) * 117; - // length = 177; - this.drawTexturedModalRect(this.containerWidth + 13, this.containerHeight + 133 - length, 176, 117 - length, 30, length); + int length = (int) (this.tileEntity.getDetectedEnergy() / this.tileEntity.getPeak()) * 115; + this.drawTexturedModalRect(this.containerWidth + 14, this.containerHeight + 126 - length, 176, 115 - length, 6, length); } @Override