From fba1cae444847a5d532fb8b2f0cdff56bac2e2e5 Mon Sep 17 00:00:00 2001 From: vicisacat Date: Sun, 14 Jan 2024 13:51:20 +0100 Subject: Possible fix for kuudra, should work even with abiphone also comment out that one line that creates an unused list --- .../de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java | 1 + .../java/de/hysky/skyblocker/mixin/HandledScreensMixin.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/mixin') diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java index 68440874..dd207dc0 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java @@ -43,6 +43,7 @@ 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); diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java index cd40af2b..47c25933 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java @@ -26,7 +26,16 @@ public interface HandledScreensMixin { T screenHandler = type.create(id, player.getInventory()); if ((screenHandler instanceof GenericContainerScreenHandler containerScreenHandler) && PartyFinderScreen.possibleInventoryNames.contains(name.getString().toLowerCase())) { //player.sendMessage(Text.of("LESSGOOOOO " + containerScreenHandler.getRows())); - if (client.currentScreen != null && client.currentScreen.getTitle().getString().toLowerCase().contains("group builder")) return; + if (client.currentScreen != null) { + String lowerCase = client.currentScreen.getTitle().getString().toLowerCase(); + if (lowerCase.contains("group builder")) return; + if (lowerCase.contains("select tier")) { + PartyFinderScreen.isInKuudraPartyFinder = true; + } else if (lowerCase.contains("catacombs")) { + PartyFinderScreen.isInKuudraPartyFinder = false; + } + } + if (PartyFinderScreen.isInKuudraPartyFinder) return; client.player.currentScreenHandler = (containerScreenHandler); if (client.currentScreen instanceof PartyFinderScreen screen) { screen.updateHandler(containerScreenHandler, name); -- cgit