From c8c0db6aa9c389f3f498c984117eca1c16d7e062 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Fri, 7 Jul 2023 20:44:52 +0200
Subject: [PATCH] some GUI fixes

---
 .../compat/jei/JEIPrettyPipesPlugin.java       |  2 +-
 .../prettypipes/misc/ItemTerminalWidget.java   |  2 +-
 .../pipe/containers/AbstractPipeGui.java       |  4 ++--
 .../modifier/FilterModifierModuleGui.java      |  2 +-
 .../modules/stacksize/StackSizeModuleGui.java  |  2 +-
 .../pressurizer/PressurizerGui.java            |  4 ++--
 .../terminal/containers/ItemTerminalGui.java   | 18 +++++++++---------
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/de/ellpeck/prettypipes/compat/jei/JEIPrettyPipesPlugin.java b/src/main/java/de/ellpeck/prettypipes/compat/jei/JEIPrettyPipesPlugin.java
index 9b36946..9039314 100644
--- a/src/main/java/de/ellpeck/prettypipes/compat/jei/JEIPrettyPipesPlugin.java
+++ b/src/main/java/de/ellpeck/prettypipes/compat/jei/JEIPrettyPipesPlugin.java
@@ -90,7 +90,7 @@ public class JEIPrettyPipesPlugin implements IModPlugin {
             return;
         var sync = PlayerPrefs.get().syncJei;
         if (event instanceof ScreenEvent.Render.Post) {
-            if (this.jeiSyncButton.isHoveredOrFocused())
+            if (this.jeiSyncButton.isHovered())
                 event.getGuiGraphics().renderTooltip(terminal.getMinecraft().font, Component.translatable("info." + PrettyPipes.ID + ".sync_jei." + (sync ? "on" : "off")), event.getMouseX(), event.getMouseY());
         } else if (event instanceof ScreenEvent.Render.Pre) {
             this.jeiSyncButton.setMessage(Component.literal((sync ? ChatFormatting.GREEN : ChatFormatting.RED) + "J"));
diff --git a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java
index 1ba853d..5edb653 100644
--- a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java
+++ b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java
@@ -61,7 +61,7 @@ public class ItemTerminalWidget extends AbstractWidget {
     }
 
     public void renderToolTip(GuiGraphics graphics, int mouseX, int mouseY) {
-        if (this.visible && this.isHoveredOrFocused()) {
+        if (this.visible && this.isHovered()) {
             var tooltip = Screen.getTooltipFromItem(this.screen.getMinecraft(), this.stack);
             if (this.stack.getCount() >= 1000) {
                 var comp = tooltip.get(0);
diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java
index 16e2c95..8b7678f 100644
--- a/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java
+++ b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java
@@ -68,8 +68,8 @@ public abstract class AbstractPipeGui<T extends AbstractPipeContainer<?>> extend
 
     @Override
     protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
-        graphics.drawString(this.font, this.playerInventoryTitle.getString(), 8, this.imageHeight - 96 + 2, 4210752);
-        graphics.drawString(this.font, this.title.getString(), 8, 6 + 32, 4210752);
+        graphics.drawString(this.font, this.playerInventoryTitle.getString(), 8, this.imageHeight - 96 + 2, 4210752, false);
+        graphics.drawString(this.font, this.title.getString(), 8, 6 + 32, 4210752, false);
         for (var tab : this.tabs)
             tab.drawForeground(graphics, mouseX, mouseY);
     }
diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java
index dc8c03b..1d8dc34 100644
--- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java
+++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java
@@ -124,7 +124,7 @@ public class FilterModifierModuleGui extends AbstractPipeGui<FilterModifierModul
                 color = 0xFFFFFF;
             if (this.tag.equals(FilterModifierModuleItem.getFilterTag(FilterModifierModuleGui.this.menu.moduleStack)))
                 text = ChatFormatting.BOLD + text;
-            graphics.drawString(FilterModifierModuleGui.this.font, text, this.x, this.y, color);
+            graphics.drawString(FilterModifierModuleGui.this.font, text, this.x, this.y, color, false);
             RenderSystem.setShader(GameRenderer::getPositionTexShader);
             RenderSystem.setShaderTexture(0, AbstractPipeGui.TEXTURE);
         }
diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java
index 5805ce1..38446bb 100644
--- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java
+++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java
@@ -52,7 +52,7 @@ public class StackSizeModuleGui extends AbstractPipeGui<StackSizeModuleContainer
     @Override
     protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
         super.renderLabels(graphics, mouseX, mouseY);
-        graphics.drawString(this.font, I18n.get("info." + PrettyPipes.ID + ".max_stack_size") + ":", 7, 17 + 32, 4210752);
+        graphics.drawString(this.font, I18n.get("info." + PrettyPipes.ID + ".max_stack_size") + ":", 7, 17 + 32, 4210752, false);
 
     }
 }
diff --git a/src/main/java/de/ellpeck/prettypipes/pressurizer/PressurizerGui.java b/src/main/java/de/ellpeck/prettypipes/pressurizer/PressurizerGui.java
index 2439d09..6c7904c 100644
--- a/src/main/java/de/ellpeck/prettypipes/pressurizer/PressurizerGui.java
+++ b/src/main/java/de/ellpeck/prettypipes/pressurizer/PressurizerGui.java
@@ -28,8 +28,8 @@ public class PressurizerGui extends AbstractContainerScreen<PressurizerContainer
 
     @Override
     protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
-        graphics.drawString(this.font, this.playerInventoryTitle.getString(), 8, this.imageHeight - 96 + 2, 4210752);
-        graphics.drawString(this.font, this.title.getString(), 8, 6, 4210752);
+        graphics.drawString(this.font, this.playerInventoryTitle.getString(), 8, this.imageHeight - 96 + 2, 4210752, false);
+        graphics.drawString(this.font, this.title.getString(), 8, 6, 4210752, false);
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java b/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java
index 4481ee6..825ac31 100644
--- a/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java
+++ b/src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java
@@ -158,7 +158,7 @@ public class ItemTerminalGui extends AbstractContainerScreen<ItemTerminalContain
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
         // we have to do the click logic here because JEI is activated when letting go of the mouse button
         // and vanilla buttons are activated when the click starts, so we'll always invoke jei accidentally by default
-        if (button == 0 && this.cancelCraftingButton.visible && this.cancelCraftingButton.isHoveredOrFocused()) {
+        if (button == 0 && this.cancelCraftingButton.visible && this.cancelCraftingButton.isHovered()) {
             if (this.currentlyCrafting != null && !this.currentlyCrafting.isEmpty()) {
                 PacketHandler.sendToServer(new PacketButton(this.menu.tile.getBlockPos(), PacketButton.ButtonResult.CANCEL_CRAFTING));
                 return true;
@@ -276,12 +276,12 @@ public class ItemTerminalGui extends AbstractContainerScreen<ItemTerminalContain
         }
         if (this.sortedItems != null) {
             var prefs = PlayerPrefs.get();
-            if (this.orderButton.isHoveredOrFocused())
+            if (this.orderButton.isHovered())
                 graphics.renderTooltip(this.font, Component.translatable("info." + PrettyPipes.ID + ".order", I18n.get("info." + PrettyPipes.ID + ".order." + prefs.terminalItemOrder.name().toLowerCase(Locale.ROOT))), mouseX, mouseY);
-            if (this.ascendingButton.isHoveredOrFocused())
+            if (this.ascendingButton.isHovered())
                 graphics.renderTooltip(this.font, Component.translatable("info." + PrettyPipes.ID + "." + (prefs.terminalAscending ? "ascending" : "descending")), mouseX, mouseY);
         }
-        if (this.cancelCraftingButton.visible && this.cancelCraftingButton.isHoveredOrFocused()) {
+        if (this.cancelCraftingButton.visible && this.cancelCraftingButton.isHovered()) {
             var tooltip = I18n.get("info." + PrettyPipes.ID + ".cancel_all.desc").split("\n");
             graphics.renderTooltip(this.font, Arrays.stream(tooltip).map(Component::literal).collect(Collectors.toList()), Optional.empty(), mouseX, mouseY);
         }
@@ -293,16 +293,16 @@ public class ItemTerminalGui extends AbstractContainerScreen<ItemTerminalContain
 
     @Override
     protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
-        graphics.drawString(this.font, this.playerInventoryTitle.getString(), 8 + this.getXOffset(), this.imageHeight - 96 + 2, 4210752);
-        graphics.drawString(this.font, this.title.getString(), 8, 6, 4210752);
+        graphics.drawString(this.font, this.playerInventoryTitle.getString(), 8 + this.getXOffset(), this.imageHeight - 96 + 2, 4210752, false);
+        graphics.drawString(this.font, this.title.getString(), 8, 6, 4210752, false);
 
         var amount = String.valueOf(this.requestAmount);
-        graphics.drawString(this.font, amount, (176 + 15 - this.font.width(amount)) / 2 - 7 + this.getXOffset(), 106, 4210752);
+        graphics.drawString(this.font, amount, (176 + 15 - this.font.width(amount)) / 2 - 7 + this.getXOffset(), 106, 4210752, false);
 
         if (this.currentlyCrafting != null && !this.currentlyCrafting.isEmpty()) {
-            graphics.drawString(this.font, I18n.get("info." + PrettyPipes.ID + ".crafting"), this.imageWidth + 4, 4 + 6, 4210752);
+            graphics.drawString(this.font, I18n.get("info." + PrettyPipes.ID + ".crafting"), this.imageWidth + 4, 4 + 6, 4210752, false);
             if (this.currentlyCrafting.size() > 6)
-                graphics.drawString(this.font, ". . .", this.imageWidth + 24, 4 + 51, 4210752);
+                graphics.drawString(this.font, ". . .", this.imageWidth + 24, 4 + 51, 4210752, false);
         }
     }