mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 08:29:05 +00:00
Scroll Wheel now works in EVERY MENU!!!
This commit is contained in:
1 parent
50be68f33a
commit
ae0effdf99
3 files changed
+6
-26
No files matched your search
@@ -28,7 +28,6 @@ import java.util.HashMap;
|
||||
|
||||
public abstract class GuiNPCInterface extends GuiScreen
|
||||
{
|
||||
public static Window AWTWindow;
|
||||
public EntityClientPlayerMP player;
|
||||
public boolean drawDefaultBackground = true;
|
||||
public EntityNPCInterface npc;
|
||||
@@ -52,8 +51,6 @@ public abstract class GuiNPCInterface extends GuiScreen
|
||||
public float bgScaleY = 1;
|
||||
public float bgScaleZ = 1;
|
||||
|
||||
public int mouseWheel;
|
||||
|
||||
public GuiNPCInterface(EntityNPCInterface npc)
|
||||
{
|
||||
this.player = Minecraft.getMinecraft().thePlayer;
|
||||
@@ -113,8 +110,6 @@ public abstract class GuiNPCInterface extends GuiScreen
|
||||
|
||||
public void mouseClicked(int i, int j, int k)
|
||||
{
|
||||
if(AWTWindow != null)
|
||||
return;
|
||||
if(subgui != null)
|
||||
subgui.mouseClicked(i,j,k);
|
||||
else{
|
||||
@@ -145,8 +140,6 @@ public abstract class GuiNPCInterface extends GuiScreen
|
||||
|
||||
@Override
|
||||
public void keyTyped(char c, int i){
|
||||
if(AWTWindow != null)
|
||||
return;
|
||||
if(subgui != null)
|
||||
subgui.keyTyped(c,i);
|
||||
for(GuiNpcTextField tf : textfields.values())
|
||||
@@ -218,18 +211,6 @@ public abstract class GuiNPCInterface extends GuiScreen
|
||||
|
||||
@Override
|
||||
public void drawScreen(int i, int j, float f){
|
||||
this.mouseWheel = Mouse.getDWheel();
|
||||
|
||||
if(AWTWindow != null){
|
||||
if(!AWTWindow.isVisible()){
|
||||
AWTWindow.dispose();
|
||||
AWTWindow = null;
|
||||
}
|
||||
else if(Display.isActive()){
|
||||
Toolkit.getDefaultToolkit().beep();
|
||||
AWTWindow.setVisible(true);
|
||||
}
|
||||
}
|
||||
mouseX = i;
|
||||
mouseY = j;
|
||||
if(drawDefaultBackground && subgui == null)
|
||||
@@ -248,14 +229,14 @@ public abstract class GuiNPCInterface extends GuiScreen
|
||||
}
|
||||
for(GuiCustomScroll scroll : scrolls.values()){
|
||||
scroll.updateSubGUI(subGui);
|
||||
scroll.drawScreen(i, j, f, subGui?0:this.mouseWheel);
|
||||
scroll.drawScreen(i, j, f, !subGui && scroll.isMouseOver(i, j)?Mouse.getDWheel():0);
|
||||
}
|
||||
for(GuiScreen gui : extra.values())
|
||||
gui.drawScreen(i, j, f);
|
||||
super.drawScreen(i, j, f);
|
||||
for(GuiCustomScroll scroll : scrolls.values())
|
||||
if(scroll.hoverableText){
|
||||
scroll.drawHover(i, j, f, subGui?0:this.mouseWheel);
|
||||
scroll.drawHover(i, j);
|
||||
}
|
||||
for(GuiNpcButton button : buttons.values()){
|
||||
button.updateSubGUI(subGui);
|
||||
|
||||
Reference in new issue
Block a user