tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

minor change

Browse source
This commit is contained in:
Robert 2013-11-24 17:17:01 -05:00
parent fb2b8baca7
commit 517a5a506d
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/builtbroken/common/science/ChemicalCompound.java
View file

@ -14,7 +14,7 @@ public enum ChemicalCompound
public final String compoundName;
/** g/mol */
public final float molarMass;
/** g/cmｳ */
/** g/cm^3 */
public final float density;
public final MatterPhase defaultPhase;

12
src/dark/core/client/gui/GuiMachineBase.java
View file

@ -19,7 +19,7 @@ import dark.core.prefab.machine.TileEntityMachine;
public class GuiMachineBase extends GuiBase
{
public static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkMain.GUI_DIRECTORY + "gui_base_machine.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkMain.GUI_DIRECTORY + "gui_grey.png");
protected static final int MAX_BUTTON_ID = 3;
protected TileEntityMachine tileEntity;
@ -89,15 +89,15 @@ public class GuiMachineBase extends GuiBase
/** Render Tool Tips */
if (((GuiButtonImage) this.buttonList.get(0)).isIntersect(x, y) && guiID != -1)
{
this.drawTooltip(x - this.guiTopLeftCorner.intX(), y - this.guiTopLeftCorner.intY() + 10, invName);
this.drawTooltip(x - this.c.intX(), y - this.c.intY() + 10, invName);
}
else if (((GuiButtonImage) this.buttonList.get(1)).isIntersect(x, y) && guiID2 != -1)
{
this.drawTooltip(x - this.guiTopLeftCorner.intX(), y - this.guiTopLeftCorner.intY() + 10, invName2);
this.drawTooltip(x - this.c.intX(), y - this.c.intY() + 10, invName2);
}
else if (((GuiButtonImage) this.buttonList.get(2)).isIntersect(x, y) && guiID3 != -1)
{
this.drawTooltip(x - this.guiTopLeftCorner.intX(), y - this.guiTopLeftCorner.intY() + 10, invName3);
this.drawTooltip(x - this.c.intX(), y - this.c.intY() + 10, invName3);
}
}
@ -147,9 +147,9 @@ public class GuiMachineBase extends GuiBase
var9 += 2 + (toolTips.length - 1) * 10;
}
if (this.guiTopLeftCorner.intY() + var7 + var9 + 6 > this.height)
if (this.c.intY() + var7 + var9 + 6 > this.height)
{
var7 = this.height - var9 - this.guiTopLeftCorner.intY() - 6;
var7 = this.height - var9 - this.c.intY() - 6;
}
this.zLevel = 300.0F;

12
src/dark/core/prefab/invgui/GuiBase.java
View file

@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public abstract class GuiBase extends GuiScreen
{
protected Vector2 guiTopLeftCorner;
protected Vector2 c;
protected Vector2 guiSize = new Vector2(176, 166);
/** Adds the buttons (and other controls) to the screen in question. */
@ -23,7 +23,7 @@ public abstract class GuiBase extends GuiScreen
public void initGui()
{
super.initGui();
guiTopLeftCorner = new Vector2((this.width - this.guiSize.intX()) / 2, (this.height - this.guiSize.intY()) / 2);
c = new Vector2((this.width - this.guiSize.intX()) / 2, (this.height - this.guiSize.intY()) / 2);
}
/** Draws the screen and all the components in it. */
@ -31,8 +31,8 @@ public abstract class GuiBase extends GuiScreen
public void drawScreen(int par1, int par2, float par3)
{
this.drawDefaultBackground();
int var4 = (int) this.guiTopLeftCorner.x;
int var5 = (int) this.guiTopLeftCorner.y;
int var4 = (int) this.c.x;
int var5 = (int) this.c.y;
this.drawBackgroundLayer(par1, par2, par3);
GL11.glPushMatrix();
GL11.glTranslatef(var4, var5, 0.0F);
@ -123,9 +123,9 @@ public abstract class GuiBase extends GuiScreen
var9 += 2 + (toolTips.length - 1) * 10;
}
if (this.guiTopLeftCorner.intY() + var7 + var9 + 6 > this.height)
if (this.c.intY() + var7 + var9 + 6 > this.height)
{
var7 = this.height - var9 - this.guiTopLeftCorner.intY() - 6;
var7 = this.height - var9 - this.c.intY() - 6;
}
this.zLevel = 300.0F;