From d24bac4d728d8ea9264e08934fb863771bcca5e2 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Fri, 26 Apr 2024 20:00:18 -0400
Subject: Pluralize the mixin and accessor packages

---
 .../skyblocker/mixin/MinecraftClientMixin.java     | 60 ----------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java

(limited to 'src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java')

diff --git a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java b/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java
deleted file mode 100644
index a9f2ae5e..00000000
--- a/src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package de.hysky.skyblocker.mixin;
-
-import de.hysky.skyblocker.skyblock.item.HotbarSlotLock;
-import de.hysky.skyblocker.skyblock.item.ItemProtection;
-import de.hysky.skyblocker.utils.JoinWorldPlaceholderScreen;
-import de.hysky.skyblocker.utils.ReconfiguringPlaceholderScreen;
-import de.hysky.skyblocker.utils.Utils;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
-import net.minecraft.client.gui.screen.ReconfiguringScreen;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.network.ClientPlayerEntity;
-import org.jetbrains.annotations.Nullable;
-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.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(MinecraftClient.class)
-public abstract class MinecraftClientMixin {
-
-    @Shadow
-    @Nullable
-    public abstract ClientPlayNetworkHandler getNetworkHandler();
-
-    @Shadow
-    @Nullable
-    public ClientPlayerEntity player;
-
-    @Inject(method = "handleInputEvents", at = @At("HEAD"))
-    public void skyblocker$handleInputEvents(CallbackInfo ci) {
-        if (Utils.isOnSkyblock()) {
-            HotbarSlotLock.handleInputEvents(player);
-            ItemProtection.handleHotbarKeyPressed(player);
-        }
-    }
-
-    //Remove Downloading Terrain Screen and Reconfiguring Screen
-    @ModifyVariable(at = @At("HEAD"), method = "setScreen", ordinal = 0, argsOnly = true)
-    public Screen modifySetScreen(Screen screen) {
-        if (Utils.isOnHypixel()) {
-            return switch (screen) {
-                case DownloadingTerrainScreen _s -> null;
-                case ReconfiguringScreen _s when this.getNetworkHandler() != null -> new ReconfiguringPlaceholderScreen(this.getNetworkHandler().getConnection());
-
-                case null, default -> screen;
-            };
-        }
-        return screen;
-    }
-
-    @ModifyArg(method = "joinWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;reset(Lnet/minecraft/client/gui/screen/Screen;)V"), index = 0)
-    private Screen modifyJoinWorld(Screen screen) {
-        return Utils.isOnSkyblock() ? new JoinWorldPlaceholderScreen() : screen;
-    }
-}
\ No newline at end of file
-- 
cgit