Fix Fancy PF crash

4 files changed, 3 insertions, 34 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/accessor/MinecraftClientAccessor.java b/src/main/java/de/hysky/skyblocker/mixin/accessor/MinecraftClientAccessor.java
deleted file mode 100644
index f48037df..00000000
--- a/src/main/java/de/hysky/skyblocker/mixin/accessor/MinecraftClientAccessor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.hysky.skyblocker.mixin.accessor;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-
-import net.minecraft.client.MinecraftClient;
-
-@Mixin(MinecraftClient.class)
-public interface MinecraftClientAccessor {
-
-	@Accessor
-	public YggdrasilAuthenticationService getAuthenticationService();
-}
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 875d24d3..c445104e 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/accessor/SkullBlockEntityAccessor.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/accessor/SkullBlockEntityAccessor.java
@@ -2,7 +2,6 @@ package de.hysky.skyblocker.mixin.accessor;
 
 import com.mojang.authlib.GameProfile;
 import net.minecraft.block.entity.SkullBlockEntity;
-import net.minecraft.util.ApiServices;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -13,7 +12,7 @@ import java.util.concurrent.CompletableFuture;
 @Mixin(SkullBlockEntity.class)
 public interface SkullBlockEntityAccessor {
     @Invoker
-    static CompletableFuture<Optional<GameProfile>> invokeFetchProfileByName(String name, ApiServices apiServices) {
+    static CompletableFuture<Optional<GameProfile>> invokeFetchProfileByName(String name) {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
index dd550b4f..f86d3057 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
@@ -146,7 +146,7 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> {
                 if (matcher.find()) classLevel = Integer.parseInt(matcher.group(1));
                 Player player = new Player(playerName, className, classLevel);
 
-                SkullBlockEntityAccessor.invokeFetchProfileByName(playerNameTrim, Utils.getApiServices()).thenAccept(
+                SkullBlockEntityAccessor.invokeFetchProfileByName(playerNameTrim).thenAccept(
                         gameProfile -> gameProfile.ifPresent(profile -> player.skinTexture = (client.getSkinProvider().getSkinTextures(profile).texture())));
 
                 if (playerNameTrim.equals(partyHost)) {
@@ -171,7 +171,7 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> {
             partyLeader = new Player(Text.literal("Error"), "Error", -1);
         }
 
-        SkullBlockEntityAccessor.invokeFetchProfileByName(partyLeader.name.getString(), Utils.getApiServices()).thenAccept(
+        SkullBlockEntityAccessor.invokeFetchProfileByName(partyLeader.name.getString()).thenAccept(
                 gameProfile -> gameProfile.ifPresent(profile -> partyLeaderSkin = client.getSkinProvider().getSkinTextures(profile).texture()));
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index dcd39de7..89495fcb 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -3,7 +3,6 @@ package de.hysky.skyblocker.utils;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import de.hysky.skyblocker.events.SkyblockEvents;
-import de.hysky.skyblocker.mixin.accessor.MinecraftClientAccessor;
 import de.hysky.skyblocker.skyblock.item.MuseumItemCache;
 import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
 import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
@@ -20,7 +19,6 @@ import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.scoreboard.*;
 import net.minecraft.text.Text;
-import net.minecraft.util.ApiServices;
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -76,7 +74,6 @@ public class Utils {
     private static boolean canSendLocRaw = false;
 
     private static String mayor = "";
-    private static ApiServices apiServices;
 
     /**
      * @implNote The parent text will always be empty, the actual text content is inside the text's siblings.
@@ -468,16 +465,4 @@ public class Utils {
         });
 
     }
-
-    public static ApiServices getApiServices() {
-        if (apiServices == null) {
-        	MinecraftClient client = MinecraftClient.getInstance();
-            ApiServices apiServicesInstance = ApiServices.create(((MinecraftClientAccessor) client).getAuthenticationService(), client.runDirectory);
-            apiServices = apiServicesInstance;
-            
-            return apiServicesInstance;
-        } else {
-            return apiServices;
-        }
-    }
 }