From d35c6302f0602fed563e12e5c4ee911caecc4fc7 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:18:32 -0500 Subject: Refactor --- .../mixin/HandledScreenProviderMixin.java | 47 ++++++++++++++++++++ .../skyblocker/mixin/HandledScreensMixin.java | 50 ---------------------- .../mixin/accessor/SkullBlockEntityAccessor.java | 16 +------ 3 files changed, 49 insertions(+), 64 deletions(-) create mode 100644 src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java delete mode 100644 src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java new file mode 100644 index 00000000..94eb53a5 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java @@ -0,0 +1,47 @@ +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.ingame.HandledScreens; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.screen.GenericContainerScreenHandler; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(HandledScreens.Provider.class) +public interface HandledScreenProviderMixin { + @Inject(method = "open", at = @At("HEAD"), cancellable = true) + default void skyblocker$open(Text name, ScreenHandlerType type, MinecraftClient client, int id, CallbackInfo ci) { + if (!SkyblockerConfigManager.get().general.betterPartyFinder) return; + ClientPlayerEntity player = client.player; + if (player == null) return; + T screenHandler = type.create(id, player.getInventory()); + if (screenHandler instanceof GenericContainerScreenHandler containerScreenHandler && PartyFinderScreen.possibleInventoryNames.contains(name.getString().toLowerCase())) { + 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); + } else { + client.setScreen(new PartyFinderScreen(containerScreenHandler, player.getInventory(), name)); + } + + ci.cancel(); + } + } +} diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java deleted file mode 100644 index 47c25933..00000000 --- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java +++ /dev/null @@ -1,50 +0,0 @@ -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.ingame.HandledScreens; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.screen.GenericContainerScreenHandler; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(HandledScreens.Provider.class) -public interface HandledScreensMixin { - //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 type, MinecraftClient client, int id, CallbackInfo ci) { - if (!SkyblockerConfigManager.get().general.betterPartyFinder) return; - ClientPlayerEntity player = client.player; - if (player == null) return; - 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) { - 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); - } else { - client.setScreen(new PartyFinderScreen(containerScreenHandler, player.getInventory(), name)); - } - - ci.cancel(); - } - - } -} diff --git a/src/main/java/de/hysky/skyblocker/mixin/accessor/SkullBlockEntityAccessor.java b/src/main/java/de/hysky/skyblocker/mixin/accessor/SkullBlockEntityAccessor.java index 2714c4ee..dfe544bc 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/accessor/SkullBlockEntityAccessor.java +++ b/src/main/java/de/hysky/skyblocker/mixin/accessor/SkullBlockEntityAccessor.java @@ -1,14 +1,8 @@ package de.hysky.skyblocker.mixin.accessor; -import com.google.common.cache.LoadingCache; import com.mojang.authlib.GameProfile; import net.minecraft.block.entity.SkullBlockEntity; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.util.UserCache; -import org.jetbrains.annotations.Contract; -import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; import java.util.Optional; @@ -16,14 +10,8 @@ import java.util.concurrent.CompletableFuture; @Mixin(SkullBlockEntity.class) public interface SkullBlockEntityAccessor { - @Contract(pure = true) - @Accessor("userCache") - public static @Nullable LoadingCache>> getUserCache() { - return null; - } - @Invoker - public static CompletableFuture> invokeFetchProfile(String name) { - return new CompletableFuture<>(); + static CompletableFuture> invokeFetchProfile(String name) { + throw new UnsupportedOperationException(); } } -- cgit