Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix multimeter GUI

Browse source
This commit is contained in:
Aidan Brady 2013-08-05 11:56:42 -04:00
parent c7592ef4c6
commit 051d19be32
4 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/assets/resonantinduction/textures/gui/gui_multimeter.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

2
src/resonantinduction/battery/TileEntityBattery.java
View file

@ -95,7 +95,6 @@ public class TileEntityBattery extends TileEntityBase implements IPacketReceiver
for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++)
{ {
System.out.println("Read");
NBTTagCompound tagCompound = (NBTTagCompound)tagList.tagAt(tagCount); NBTTagCompound tagCompound = (NBTTagCompound)tagList.tagAt(tagCount);
int slotID = tagCompound.getInteger("Slot"); int slotID = tagCompound.getInteger("Slot");
structure.inventory.add(slotID, ItemStack.loadItemStackFromNBT(tagCompound)); structure.inventory.add(slotID, ItemStack.loadItemStackFromNBT(tagCompound));
@ -143,7 +142,6 @@ public class TileEntityBattery extends TileEntityBase implements IPacketReceiver
{ {
if(structure.inventory.get(slotCount) != null) if(structure.inventory.get(slotCount) != null)
{ {
System.out.println("Save");
NBTTagCompound tagCompound = new NBTTagCompound(); NBTTagCompound tagCompound = new NBTTagCompound();
tagCompound.setInteger("Slot", slotCount); tagCompound.setInteger("Slot", slotCount);
structure.inventory.get(slotCount).writeToNBT(tagCompound); structure.inventory.get(slotCount).writeToNBT(tagCompound);

1
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -35,7 +35,6 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
public static int PUSH_DELAY = 5; public static int PUSH_DELAY = 5;
public static double MAX_SPEED = .2; public static double MAX_SPEED = .2;
public static double ACCELERATION = .02; public static double ACCELERATION = .02;
public static float ENERGY_USAGE = .005F;
private ForgeDirection facing = ForgeDirection.UP; private ForgeDirection facing = ForgeDirection.UP;

5
src/resonantinduction/multimeter/GuiMultimeter.java
View file

@ -95,9 +95,8 @@ public class GuiMultimeter extends GuiContainer
GL11.glColor4f(1, 1, 1, 1); GL11.glColor4f(1, 1, 1, 1);
this.drawTexturedModalRect(this.containerWidth, this.containerHeight, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect(this.containerWidth, this.containerHeight, 0, 0, this.xSize, this.ySize);
int length = (int) (this.tileEntity.getDetectedEnergy() / this.tileEntity.getPeak()) * 117; int length = (int) (this.tileEntity.getDetectedEnergy() / this.tileEntity.getPeak()) * 115;
// length = 177; this.drawTexturedModalRect(this.containerWidth + 14, this.containerHeight + 126 - length, 176, 115 - length, 6, length);
this.drawTexturedModalRect(this.containerWidth + 13, this.containerHeight + 133 - length, 176, 117 - length, 30, length);
} }
@Override @Override