diff options
author | vicisacat <victor.branchu@gmail.com> | 2024-01-14 13:35:25 +0100 |
---|---|---|
committer | vicisacat <victor.branchu@gmail.com> | 2024-01-14 13:35:25 +0100 |
commit | 55e0d598a23d2155b36dab57f39e82451080d880 (patch) | |
tree | 9d3665842ac687634613391c326957e38bf16f31 | |
parent | 48a61ba65eece0f34cd4f5d4a67ae14ea5de1e0d (diff) | |
download | Skyblocker-55e0d598a23d2155b36dab57f39e82451080d880.tar.gz Skyblocker-55e0d598a23d2155b36dab57f39e82451080d880.tar.bz2 Skyblocker-55e0d598a23d2155b36dab57f39e82451080d880.zip |
Fix Party Finder GUI opening in group builder
Remove useless generic type
-rw-r--r-- | src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java index 9ff92a20..cd40af2b 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java @@ -4,7 +4,6 @@ package de.hysky.skyblocker.mixin; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.dungeon.partyfinder.PartyFinderScreen; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreens; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.screen.GenericContainerScreenHandler; @@ -17,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(HandledScreens.Provider.class) -public interface HandledScreensMixin<T extends ScreenHandler, U extends Screen> { +public interface HandledScreensMixin<T extends ScreenHandler> { //value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;setScreen(Lnet/minecraft/client/gui/screen/Screen;)V"), cancellable = true @Inject(method = "open", at = @At("HEAD"), cancellable = true) default void skyblocker$open(Text name, ScreenHandlerType<T> type, MinecraftClient client, int id, CallbackInfo ci) { @@ -27,6 +26,7 @@ public interface HandledScreensMixin<T extends ScreenHandler, U extends Screen> 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; client.player.currentScreenHandler = (containerScreenHandler); if (client.currentScreen instanceof PartyFinderScreen screen) { screen.updateHandler(containerScreenHandler, name); |