mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
GUIs are back!
This commit is contained in:
1 parent
0179ea1f38
commit
bc024b851f
69 files changed
+372
-229
No files matched your search
@@ -1,5 +1,6 @@
|
||||
package mekanism.client.gui;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
@@ -8,7 +9,7 @@ import mekanism.client.sound.SoundHandler;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Upgrade;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.block.states.BlockStateMachine.MachineType;
|
||||
import mekanism.common.inventory.container.ContainerUpgradeManagement;
|
||||
import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage;
|
||||
import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage;
|
||||
@@ -125,7 +126,7 @@ public class GuiUpgradeManagement extends GuiMekanism
|
||||
|
||||
if(xAxis >= xPos && xAxis <= xPos+58 && yAxis >= yPos && yAxis <= yPos+12)
|
||||
{
|
||||
func_146283_a(MekanismUtils.splitLines(upgrade.getDescription()), xAxis, yAxis);
|
||||
drawHoveringText(MekanismUtils.splitLines(upgrade.getDescription()), xAxis, yAxis);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,7 +146,7 @@ public class GuiUpgradeManagement extends GuiMekanism
|
||||
GL11.glPushMatrix();
|
||||
GL11.glScalef(size, size, size);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), type.getStack(), scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y);
|
||||
itemRender.renderItemAndEffectIntoGUI(type.getStack(), scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
@@ -263,9 +264,9 @@ public class GuiUpgradeManagement extends GuiMekanism
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseMovedOrUp(int mouseX, int mouseY, int type)
|
||||
protected void mouseReleased(int mouseX, int mouseY, int type)
|
||||
{
|
||||
super.mouseMovedOrUp(mouseX, mouseY, type);
|
||||
super.mouseReleased(mouseX, mouseY, type);
|
||||
|
||||
if(type == 0 && isDragging)
|
||||
{
|
||||
@@ -275,7 +276,7 @@ public class GuiUpgradeManagement extends GuiMekanism
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void mouseClicked(int mouseX, int mouseY, int button)
|
||||
protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException
|
||||
{
|
||||
super.mouseClicked(mouseX, mouseY, button);
|
||||
|
||||
|
||||
Reference in new issue
Block a user