Remove armor storage as it seems to have been patched

closes #4911
closes #5058

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayerInteractionManagerMixin.java

@@ -11,7 +11,6 @@
 import meteordevelopment.meteorclient.events.entity.player.*;
 import meteordevelopment.meteorclient.mixininterface.IClientPlayerInteractionManager;
 import meteordevelopment.meteorclient.systems.modules.Modules;
-import meteordevelopment.meteorclient.systems.modules.misc.InventoryTweaks;
 import meteordevelopment.meteorclient.systems.modules.player.BreakDelay;
 import meteordevelopment.meteorclient.systems.modules.player.SpeedMine;
 import meteordevelopment.meteorclient.utils.world.BlockUtils;
@@ -23,8 +22,6 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
-import net.minecraft.screen.PlayerScreenHandler;
-import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -49,9 +46,6 @@ public abstract class ClientPlayerInteractionManagerMixin implements IClientPlay
 
     @Shadow protected abstract void syncSelectedSlot();
 
-    @Shadow
-    public abstract void clickSlot(int syncId, int slotId, int button, SlotActionType actionType, PlayerEntity player);
-
     @Shadow
     @Final
     private ClientPlayNetworkHandler networkHandler;
@@ -70,33 +64,6 @@ else if (slotId == -999) {
         }
     }
 
-    @Inject(method = "clickSlot", at = @At("HEAD"), cancellable = true)
-    public void onClickArmorSlot(int syncId, int slotId, int button, SlotActionType actionType, PlayerEntity player, CallbackInfo ci) {
-        if (!Modules.get().get(InventoryTweaks.class).armorStorage()) return;
-
-        ScreenHandler screenHandler = player.currentScreenHandler;
-
-        if (screenHandler instanceof PlayerScreenHandler) {
-            if (slotId >= 5 && slotId <= 8) {
-                int armorSlot = (8 - slotId) + 36;
-                if (actionType == SlotActionType.PICKUP && !screenHandler.getCursorStack().isEmpty()) {
-                    clickSlot(syncId, 17, armorSlot, SlotActionType.SWAP, player); //armor slot <-> inv slot
-                    clickSlot(syncId, 17, button, SlotActionType.PICKUP, player); //inv slot <-> cursor slot
-                    clickSlot(syncId, 17, armorSlot, SlotActionType.SWAP, player); //armor slot <-> inv slot
-                    ci.cancel();
-                } else if (actionType == SlotActionType.SWAP) {
-                    if (button >= 10) {
-                        clickSlot(syncId, 45, armorSlot, SlotActionType.SWAP, player);
-                        ci.cancel();
-                    } else {
-                        clickSlot(syncId, 36 + button, armorSlot, SlotActionType.SWAP, player); //invert swap
-                        ci.cancel();
-                    }
-                }
-            }
-        }
-    }
-
     @Inject(method = "attackBlock", at = @At("HEAD"), cancellable = true)
     private void onAttackBlock(BlockPos blockPos, Direction direction, CallbackInfoReturnable<Boolean> info) {
         if (MeteorClient.EVENT_BUS.post(StartBreakingBlockEvent.get(blockPos, direction)).isCancelled()) info.cancel();

src/main/java/meteordevelopment/meteorclient/mixin/PlayerArmorSlotMixin.java

@@ -69,13 +69,6 @@ public class InventoryTweaks extends Module {
         .build()
     );
 
-    private final Setting<Boolean> armorStorage = sgGeneral.add(new BoolSetting.Builder()
-        .name("armor-storage")
-        .description("Allows you to put normal items in your armor slots.")
-        .defaultValue(true)
-        .build()
-    );
-
     // Sorting
 
     private final Setting<Boolean> sortingEnabled = sgSorting.add(new BoolSetting.Builder()
@@ -414,10 +407,6 @@ public boolean mouseDragItemMove() {
         return isActive() && mouseDragItemMove.get();
     }
 
-    public boolean armorStorage() {
-        return isActive() && armorStorage.get();
-    }
-
     public boolean canSteal(ScreenHandler handler) {
         try {
             return (stealScreens.get().contains(handler.getType()));

src/main/java/meteordevelopment/meteorclient/systems/modules/misc/InventoryTweaks.java

@@ -135,7 +135,6 @@
     "MutableTextMixin",
     "PacketByteBufMixin",
     "ParticleManagerMixin",
-    "PlayerArmorSlotMixin",
     "PlayerEntityAccessor",
     "PlayerEntityMixin",
     "PlayerEntityRendererMixin",