Refactor vault screens

This has had the unfortunate consequence of bringing back the old vault bug... :IIIIII

Author: triphora

src/main/java/dev/frydae/emcutils/EmpireMinecraftUtilities.java

@@ -26,9 +26,8 @@
 package dev.frydae.emcutils;
 
 import dev.frydae.emcutils.features.UsableItems;
-import dev.frydae.emcutils.features.VaultButtons;
+import dev.frydae.emcutils.features.VaultScreen;
 import dev.frydae.emcutils.features.VoxelMapIntegration;
-import dev.frydae.emcutils.features.vaultButtons.VaultScreen;
 import dev.frydae.emcutils.listeners.ChatListener;
 import dev.frydae.emcutils.listeners.CommandListener;
 import dev.frydae.emcutils.listeners.ServerListener;
@@ -78,7 +77,7 @@ public void onInitializeClient() {
 
     Util.runResidenceCollector();
 
-    HandledScreens.register(VaultButtons.GENERIC_9X7, VaultScreen::new);
+    HandledScreens.register(VaultScreen.GENERIC_9X7, VaultScreen::new);
 
     Util.getOnJoinCommandQueue();
     if (FabricLoader.getInstance().isModLoaded("voxelmap")) Util.hasVoxelMap();

src/main/java/dev/frydae/emcutils/features/VaultButtons.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package dev.frydae.emcutils.features.vaultButtons;
+package dev.frydae.emcutils.features;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
@@ -41,6 +41,8 @@
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtHelper;
+import net.minecraft.screen.GenericContainerScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Style;
@@ -51,13 +53,14 @@
 import org.apache.commons.lang3.math.NumberUtils;
 
 @SuppressWarnings("SpellCheckingInspection")
-public class VaultScreen extends HandledScreen<VaultScreenHandler> implements ScreenHandlerProvider<VaultScreenHandler> {
+public class VaultScreen extends HandledScreen<GenericContainerScreenHandler> implements ScreenHandlerProvider<GenericContainerScreenHandler> {
+  public static final ScreenHandlerType<GenericContainerScreenHandler> GENERIC_9X7 = ScreenHandlerType.register("generic_9x7", CreateGeneric9x7::createGeneric9x7);
   private static final Identifier TEXTURE = new Identifier(EmpireMinecraftUtilities.MODID, Config.returnVaultScreenOption());
   private final int vaultPage;
   private final int[] slotOffsets = {8, 26, 44, 62, 80, 98, 116, 134, 152};
   private boolean shouldCallClose = true;
 
-  public VaultScreen(VaultScreenHandler handler, PlayerInventory inventory, Text title) {
+  public VaultScreen(GenericContainerScreenHandler handler, PlayerInventory inventory, Text title) {
     super(handler, inventory, title);
     super.init(MinecraftClient.getInstance(), MinecraftClient.getInstance().getWindow().getScaledWidth(), MinecraftClient.getInstance().getWindow().getScaledHeight());
     this.passEvents = false;
@@ -72,6 +75,12 @@ public VaultScreen(VaultScreenHandler handler, PlayerInventory inventory, Text t
     }
   }
 
+  private static final class CreateGeneric9x7 {
+    static GenericContainerScreenHandler createGeneric9x7(int syncId, PlayerInventory playerInventory) {
+      return new GenericContainerScreenHandler(GENERIC_9X7, syncId, playerInventory, 6);
+    }
+  }
+
   /**
    * @param amount the amount of pages to go back
    * @return an {@link ItemStack player head} with a left arrow

src/main/java/dev/frydae/emcutils/features/vaultButtons/VaultScreen.java renamed to src/main/java/dev/frydae/emcutils/features/VaultScreen.java

@@ -26,15 +26,17 @@
 package dev.frydae.emcutils.mixins;
 
 import dev.frydae.emcutils.EmpireMinecraftUtilities;
-import dev.frydae.emcutils.interfaces.ChatCallback;
 import dev.frydae.emcutils.features.ChatChannels;
-import dev.frydae.emcutils.features.VaultButtons;
+import dev.frydae.emcutils.features.VaultScreen;
+import dev.frydae.emcutils.interfaces.ChatCallback;
 import dev.frydae.emcutils.utils.Util;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ingame.HandledScreens;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
 import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
 import net.minecraft.network.packet.s2c.play.OpenScreenS2CPacket;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.ActionResult;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -71,6 +73,11 @@ public void onGameJoin(GameJoinS2CPacket packet, CallbackInfo info) {
 
   @Inject(at = @At("HEAD"), method = "onOpenScreen", cancellable = true)
   public void onOpenScreen(OpenScreenS2CPacket packet, CallbackInfo ci) {
-    VaultButtons.handleScreenOpen(packet, ci);
+    if (Util.isOnEMC) {
+      if (!packet.getName().getString().startsWith("Page: ")) return;
+      if (packet.getScreenHandlerType() != ScreenHandlerType.GENERIC_9X6) return;
+      HandledScreens.open(VaultScreen.GENERIC_9X7, MinecraftClient.getInstance(), packet.getSyncId(), packet.getName());
+      ci.cancel();
+    }
   }
 }

src/main/java/dev/frydae/emcutils/features/vaultButtons/VaultScreenHandler.java

@@ -25,7 +25,7 @@
 
 package dev.frydae.emcutils.mixins;
 
-import dev.frydae.emcutils.features.vaultButtons.VaultScreen;
+import dev.frydae.emcutils.features.VaultScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.option.KeyBinding;

src/main/java/dev/frydae/emcutils/mixins/ClientPlayNetworkHandlerMixin.java

@@ -26,7 +26,7 @@
 package dev.frydae.emcutils.mixins.easierChests;
 
 import de.guntram.mcmod.easierchests.ExtendedGuiChest;
-import dev.frydae.emcutils.features.VaultButtons;
+import dev.frydae.emcutils.features.VaultScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.HandledScreens;
 import net.minecraft.screen.GenericContainerScreenHandler;
@@ -43,8 +43,7 @@
 public abstract class HandledScreensMixin {
   @Inject(method = "open", at = @At("HEAD"), cancellable = true)
   private static void checkVaultScreen(ScreenHandlerType type, MinecraftClient client, int any, Text component, CallbackInfo ci) {
-    if (type == VaultButtons.GENERIC_9X7) {
-      assert client.player != null;
+    if (type == VaultScreen.GENERIC_9X7) {
       GenericContainerScreenHandler container = (GenericContainerScreenHandler) type.create(any, client.player.getInventory());
       ExtendedGuiChest screen = new ExtendedGuiChest(container, client.player.getInventory(), component, container.getRows());
       client.player.currentScreenHandler = container;

src/main/java/dev/frydae/emcutils/mixins/MinecraftClientMixin.java

@@ -6,4 +6,5 @@ accessible	class	net/minecraft/client/gui/screen/ingame/HandledScreens$Provider
 extendable	method	net/minecraft/screen/ScreenHandlerType <init> (Lnet/minecraft/screen/ScreenHandlerType$Factory;)V
 accessible	method	net/minecraft/screen/ScreenHandlerType register (Ljava/lang/String;Lnet/minecraft/screen/ScreenHandlerType$Factory;)Lnet/minecraft/screen/ScreenHandlerType;
 accessible	method	net/minecraft/client/gui/screen/ingame/HandledScreens register (Lnet/minecraft/screen/ScreenHandlerType;Lnet/minecraft/client/gui/screen/ingame/HandledScreens$Provider;)V
-accessible	method	net/minecraft/client/gui/screen/ingame/HandledScreen drawItem (Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V
+accessible	method	net/minecraft/client/gui/screen/ingame/HandledScreen drawItem (Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V
+accessible	method	net/minecraft/screen/GenericContainerScreenHandler <init> (Lnet/minecraft/screen/ScreenHandlerType;ILnet/minecraft/entity/player/PlayerInventory;I)V

src/main/java/dev/frydae/emcutils/mixins/easierChests/HandledScreensMixin.java

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "emcutils",
-  "version": "2.3.1",
+  "version": "2.3.1-alpha.build.10",
   "name": "Empire Minecraft Utilities",
   "description": "A collection of various utilities for the Empire Minecraft server.",
   "authors": [