1 files changed, 21 insertions, 25 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java
index bbe58d36..2a4c38a7 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java
@@ -1,7 +1,6 @@
 package de.hysky.skyblocker.mixin;
 
 import com.mojang.authlib.GameProfile;
-
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.dungeon.partyfinder.PartyFinderScreen;
 import de.hysky.skyblocker.skyblock.item.HotbarSlotLock;
@@ -10,7 +9,6 @@ import de.hysky.skyblocker.skyblock.rift.HealingMelonIndicator;
 import de.hysky.skyblocker.skyblock.searchOverlay.OverlayScreen;
 import de.hysky.skyblocker.skyblock.searchOverlay.SearchOverManager;
 import de.hysky.skyblocker.utils.Utils;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
@@ -52,30 +50,28 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     }
 
     @Inject(method = "openEditSignScreen", at = @At("HEAD"), cancellable = true)
-    public void skyblocker$partyFinderRange(SignBlockEntity sign, boolean front, CallbackInfo callbackInfo) {
-        if (PartyFinderScreen.isInKuudraPartyFinder) return;
-        if (client.currentScreen instanceof PartyFinderScreen partyFinderScreen && !partyFinderScreen.isAborted()) {
-            if (sign.getText(front).getMessage(3, false).getString().toLowerCase().contains("level")) {
-                partyFinderScreen.updateSign(sign, front);
-                callbackInfo.cancel();
-            }
+    public void skyblocker$redirectEditSignScreen(SignBlockEntity sign, boolean front, CallbackInfo callbackInfo) {
+        // Fancy Party Finder
+        if (!PartyFinderScreen.isInKuudraPartyFinder && client.currentScreen instanceof PartyFinderScreen partyFinderScreen && !partyFinderScreen.isAborted() && sign.getText(front).getMessage(3, false).getString().toLowerCase().contains("level")) {
+            partyFinderScreen.updateSign(sign, front);
+            callbackInfo.cancel();
+            return;
         }
-    }
-    @Inject(method = "openEditSignScreen", at = @At("HEAD"), cancellable = true)
-    public void skyblocker$searchOverlay(SignBlockEntity sign, boolean front, CallbackInfo callbackInfo) {
-        if (client == null) return;
-        if (SkyblockerConfigManager.get().general.searchOverlay.enableAuctionHouse && (FabricLoader.getInstance().isDevelopmentEnvironment() || client.currentScreen.getTitle().getString().toLowerCase().contains("auction")) ) {
-            if (sign.getText(front).getMessage(3, false).getString().equalsIgnoreCase("enter query")) {
-                SearchOverManager.updateSign(sign, front,true);
-                client.setScreen(new OverlayScreen(Text.of("")));
-                callbackInfo.cancel();
-            }
-        }
-        else if (SkyblockerConfigManager.get().general.searchOverlay.enableBazaar && (FabricLoader.getInstance().isDevelopmentEnvironment() || client.currentScreen.getTitle().getString().toLowerCase().contains("bazaar")) ) {
-            if (sign.getText(front).getMessage(3, false).getString().equalsIgnoreCase("enter query")) {
-                SearchOverManager.updateSign(sign, front,false);
-                client.setScreen(new OverlayScreen(Text.of("")));
-                callbackInfo.cancel();
+
+        // Search Overlay
+        if (client.currentScreen != null) {
+            if (SkyblockerConfigManager.get().general.searchOverlay.enableAuctionHouse && client.currentScreen.getTitle().getString().toLowerCase().contains("auction")) {
+                if (sign.getText(front).getMessage(3, false).getString().equalsIgnoreCase("enter query")) {
+                    SearchOverManager.updateSign(sign, front, true);
+                    client.setScreen(new OverlayScreen(Text.of("")));
+                    callbackInfo.cancel();
+                }
+            } else if (SkyblockerConfigManager.get().general.searchOverlay.enableBazaar && client.currentScreen.getTitle().getString().toLowerCase().contains("bazaar")) {
+                if (sign.getText(front).getMessage(3, false).getString().equalsIgnoreCase("enter query")) {
+                    SearchOverManager.updateSign(sign, front, false);
+                    client.setScreen(new OverlayScreen(Text.of("")));
+                    callbackInfo.cancel();
+                }
             }
         }
     }