mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-14 01:14:21 +00:00
Fix double layers tooltip with NEI (#41)
* Fix double layers tooltip with nei * Remove wildcard imports
This commit is contained in:
1 parent
3dc2806b36
commit
190693ad68
2 files changed
+7
-2
No files matched your search
@@ -119,10 +119,10 @@ public class GuiCraftGUI extends GuiContainer {
|
||||
window.getTooltip(tooltip);
|
||||
}
|
||||
|
||||
NEIHook.renderToolTips(mouseX, mouseY);
|
||||
|
||||
if (tooltip.exists()) {
|
||||
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
|
||||
} else {
|
||||
NEIHook.renderToolTips(mouseX, mouseY);
|
||||
}
|
||||
zLevel = 0.0f;
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
|
||||
@@ -29,6 +29,7 @@ import binnie.core.craftgui.minecraft.control.ControlHelp;
|
||||
import binnie.core.craftgui.minecraft.control.ControlInfo;
|
||||
import binnie.core.craftgui.minecraft.control.ControlPowerSystem;
|
||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||
import binnie.core.craftgui.minecraft.control.ControlSlotBase;
|
||||
import binnie.core.craftgui.minecraft.control.ControlUser;
|
||||
import binnie.core.craftgui.minecraft.control.EnumHighlighting;
|
||||
import binnie.core.craftgui.renderer.Renderer;
|
||||
@@ -40,6 +41,7 @@ import binnie.core.machines.Machine;
|
||||
import binnie.core.machines.inventory.IInventoryMachine;
|
||||
import binnie.core.machines.network.INetwork;
|
||||
import binnie.core.machines.power.PowerSystem;
|
||||
import binnie.core.nei.NEIHook;
|
||||
import binnie.core.network.packet.MessageCraftGUI;
|
||||
import binnie.core.resource.BinnieResource;
|
||||
import binnie.core.resource.ResourceType;
|
||||
@@ -118,6 +120,9 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
|
||||
if (!widget.calculateIsMouseOver()) {
|
||||
continue;
|
||||
}
|
||||
if (NEIHook.enabled && widget instanceof ControlSlotBase) {
|
||||
return;
|
||||
}
|
||||
if (widget instanceof ITooltip) {
|
||||
((ITooltip) widget).getTooltip(tooltip);
|
||||
if (tooltip.exists()) {
|
||||
|
||||
Reference in new issue
Block a user