Fix Recipe Book Crash

3 files changed, 29 insertions, 25 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
index 1a3ebe2c..ce567b67 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
@@ -1,6 +1,7 @@
 package me.xmrvizzy.skyblocker.skyblock.itemlist;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import me.xmrvizzy.skyblocker.mixin.RecipeBookWidgetAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -13,7 +14,6 @@ import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.AbstractRecipeScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.Formatting;
 
 @Environment(value= EnvType.CLIENT)
@@ -76,14 +76,16 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (this.isOpen() && !this.client.player.isSpectator()) {
-            if (this.searchField.mouseClicked(mouseX, mouseY, button)) {
-                this.results.closeRecipeView();
-                return true;
-            }
-            if (this.results.mouseClicked(mouseX, mouseY, button)) return true;
-        }
-        return false;
-    }
-}
+	public boolean mouseClicked(double mouseX, double mouseY, int button) {
+		if (!this.isOpen() || this.client.player.isSpectator()) {
+			return false;
+		}
+		if (this.searchField != null && this.searchField.mouseClicked(mouseX, mouseY, button)) {
+			this.results.closeRecipeView();
+			return true;
+		}
+		if (this.results.mouseClicked(mouseX, mouseY, button))
+			return true;
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
index 6760c919..6d0d89e1 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
@@ -1,6 +1,9 @@
 package me.xmrvizzy.skyblocker.skyblock.itemlist;
 
+import java.util.List;
+
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
@@ -11,8 +14,6 @@ import net.minecraft.item.Items;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-import java.util.List;
-
 public class ResultButtonWidget extends ClickableWidget {
     private static final Identifier BACKGROUND_TEXTURE = new Identifier("textures/gui/recipe_book.png");
 
@@ -46,7 +47,6 @@ public class ResultButtonWidget extends ClickableWidget {
         client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.getX() + 4, this.getY() + 4);
     }
 
-    @Override
     public void renderTooltip(MatrixStack matrices, int mouseX, int mouseY) {
         MinecraftClient client = MinecraftClient.getInstance();
         List<Text> tooltip = client.currentScreen.getTooltipFromItem(this.itemStack);
@@ -54,8 +54,9 @@ public class ResultButtonWidget extends ClickableWidget {
         client.currentScreen.renderTooltip(matrices, tooltip, mouseX, mouseY);
     }
 
-    @Override
-    public void appendNarrations(NarrationMessageBuilder builder) {
-
-    }
+	@Override
+	protected void appendClickableNarrations(NarrationMessageBuilder builder) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
index d977a400..d976b86b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -1,6 +1,7 @@
 package me.xmrvizzy.skyblocker.skyblock.quicknav;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import me.xmrvizzy.skyblocker.mixin.HandledScreenAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -11,7 +12,6 @@ import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
@@ -20,11 +20,6 @@ public class QuickNavButton extends ClickableWidget {
     private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
     private static final Identifier BUTTON_TEXTURE = new Identifier("textures/gui/container/creative_inventory/tabs.png");
 
-    @Override
-    public void appendNarrations(NarrationMessageBuilder builder) {
-
-    }
-
     private int index;
     private boolean toggled;
     private int u;
@@ -101,4 +96,10 @@ public class QuickNavButton extends ClickableWidget {
         }
         RenderSystem.enableDepthTest();
     }
+
+	@Override
+	protected void appendClickableNarrations(NarrationMessageBuilder builder) {
+		// TODO Auto-generated method stub
+		
+	}
 }