Refactor

2 files changed, 5 insertions, 20 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java
index 47c25933..94eb53a5 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreensMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenProviderMixin.java
@@ -16,16 +16,14 @@ 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> {
-    //value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;setScreen(Lnet/minecraft/client/gui/screen/Screen;)V"), cancellable = true
+public interface HandledScreenProviderMixin<T extends ScreenHandler> {
     @Inject(method = "open", at = @At("HEAD"), cancellable = true)
     default void skyblocker$open(Text name, ScreenHandlerType<T> 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 (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;
@@ -36,7 +34,7 @@ public interface HandledScreensMixin<T extends ScreenHandler> {
                 }
             }
             if (PartyFinderScreen.isInKuudraPartyFinder) return;
-            client.player.currentScreenHandler = (containerScreenHandler);
+            client.player.currentScreenHandler = containerScreenHandler;
             if (client.currentScreen instanceof PartyFinderScreen screen) {
                 screen.updateHandler(containerScreenHandler, name);
             } else {
@@ -45,6 +43,5 @@ public interface HandledScreensMixin<T extends ScreenHandler> {
 
             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<String, CompletableFuture<Optional<GameProfile>>> getUserCache() {
-        return null;
-    }
-
     @Invoker
-    public static CompletableFuture<Optional<GameProfile>> invokeFetchProfile(String name) {
-        return new CompletableFuture<>();
+    static CompletableFuture<Optional<GameProfile>> invokeFetchProfile(String name) {
+        throw new UnsupportedOperationException();
     }
 }