From 471edd79b145a80e67877059f024d4b3d8753eac Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Wed, 6 Sep 2023 00:42:01 -0400
Subject: 1.20.2-pre1

---
 .../skyblocker/mixin/ClientPlayNetworkHandlerMixin.java        | 10 +++-------
 .../me/xmrvizzy/skyblocker/mixin/PlayerSkinProviderMixin.java  |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
index f52e2f7f..7efefafd 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -12,26 +12,22 @@ import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
 import org.slf4j.Logger;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public abstract class ClientPlayNetworkHandlerMixin {
-    @Shadow
-    @Final
-    private MinecraftClient client;
 
     @Inject(method = "onPlaySound", at = @At("RETURN"))
     private void skyblocker$onPlaySound(PlaySoundS2CPacket packet) {
         FishingHelper.onSound(packet);
     }
 
-    @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "STORE", ordinal = 0))
+    @SuppressWarnings("resource")
+	@ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "STORE", ordinal = 0))
     private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity, @Local LivingEntity collector) {
-        DungeonSecrets.onItemPickup(itemEntity, collector, collector == client.player);
+        DungeonSecrets.onItemPickup(itemEntity, collector, collector == MinecraftClient.getInstance().player);
         return itemEntity;
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerSkinProviderMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerSkinProviderMixin.java
index a382a58e..2f0921a6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerSkinProviderMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerSkinProviderMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(PlayerSkinProvider.class)
 public class PlayerSkinProviderMixin {
-    @ModifyVariable(method = "loadSkin(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/texture/PlayerSkinProvider$SkinTextureAvailableCallback;Z)V", at = @At("STORE"))
+    /*@ModifyVariable(method = "loadSkin(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/texture/PlayerSkinProvider$SkinTextureAvailableCallback;Z)V", at = @At("STORE"))
     private Runnable skyblocker$removeInvalidBase64LogSpam(Runnable runnable) {
         return Utils.isOnHypixel() ? () -> {
             try {
@@ -16,5 +16,5 @@ public class PlayerSkinProviderMixin {
             } catch (IllegalArgumentException ignored) {
             }
         } : runnable;
-    }
+    }*/
 }
-- 
cgit