From aa246613ad1f44f02c1aaf80b9e779a998145a94 Mon Sep 17 00:00:00 2001
From: viciscat <51047087+viciscat@users.noreply.github.com>
Date: Tue, 14 May 2024 03:31:17 +0200
Subject: Fix quite important AH bug (#689)

* fix the bug

* press ESC to go back to Auctions browser from the auction view

* hurray for formatting

* Apply suggestions from code review

---------

Co-authored-by: Kevin <92656833+kevinthegreat1@users.noreply.github.com>
---
 .../skyblock/auction/AuctionViewScreen.java         | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java
index af931eb1..f3db2a25 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionViewScreen.java
@@ -5,6 +5,7 @@ import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.render.gui.AbstractCustomHypixelGUI;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.PopupScreen;
+import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.DirectionalLayoutWidget;
 import net.minecraft.client.gui.widget.SimplePositioningWidget;
@@ -21,7 +22,9 @@ import net.minecraft.text.TextColor;
 import net.minecraft.util.Colors;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
+import org.lwjgl.glfw.GLFW;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -55,6 +58,15 @@ public class AuctionViewScreen extends AbstractCustomHypixelGUI<AuctionHouseScre
         titleY = 4;
     }
 
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
+            clickSlot(BACK_BUTTON_SLOT);
+            return true;
+        }
+        return super.keyPressed(keyCode, scanCode, modifiers);
+    }
+
     @Override
     protected void init() {
         super.init();
@@ -78,10 +90,13 @@ public class AuctionViewScreen extends AbstractCustomHypixelGUI<AuctionHouseScre
         verticalLayout.forEachChild(this::addDrawableChild);
         updateLayout();
 
-        addDrawableChild(new ButtonWidget.Builder(Text.literal("<"), button -> this.clickSlot(BACK_BUTTON_SLOT))
+        ButtonWidget backButton = new ButtonWidget.Builder(Text.literal("<"), button -> this.clickSlot(BACK_BUTTON_SLOT))
                 .position(x + backgroundWidth - 16, y + 4)
                 .size(12, 12)
-                .build());
+                .tooltip(Tooltip.of(Text.literal("or press ESC!")))
+                .build();
+        backButton.setTooltipDelay(Duration.ofSeconds(1));
+        addDrawableChild(backButton);
 
 
     }
@@ -189,7 +204,7 @@ public class AuctionViewScreen extends AbstractCustomHypixelGUI<AuctionHouseScre
 
     @Override
     public void onSlotChange(AuctionHouseScreenHandler handler, int slotId, ItemStack stack) {
-        if (stack.isOf(Items.BLACK_STAINED_GLASS_PANE) || slotId == 13) return;
+        if (stack.isOf(Items.BLACK_STAINED_GLASS_PANE) || slotId == 13 || slotId >= handler.getRows() * 9) return;
         assert client != null;
         if (stack.isOf(Items.RED_TERRACOTTA)) { // Red terracotta shows up when you can cancel it
             changeState(BuyState.CANCELLABLE_AUCTION);
-- 
cgit