equipment in inventory

7 files changed, 177 insertions, 2 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index 05c7fb1e..a52af784 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -192,6 +192,7 @@ public class SkyblockerMod implements ClientModInitializer {
         EggFinder.init();
         TimeTowerReminder.init();
         SkyblockTime.init();
+        SkyblockInventoryScreen.initEquipment();
         TooltipManager.init();
         SlotTextManager.init();
 
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
index a2a0f815..889b253a 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
@@ -68,6 +68,13 @@ public class UIAndVisualsCategory {
                                 newValue -> config.uiAndVisuals.hideStatusEffectOverlay = newValue)
                         .controller(ConfigUtils::createBooleanController)
                         .build())
+                .option(Option.<Boolean>createBuilder()
+                        .name(Text.translatable("skyblocker.config.uiAndVisuals.showEquipmentInInventory"))
+                        .binding(defaults.uiAndVisuals.showEquipmentInInventory,
+                                () -> config.uiAndVisuals.showEquipmentInInventory,
+                                newValue -> config.uiAndVisuals.showEquipmentInInventory = newValue)
+                        .controller(ConfigUtils::createBooleanController)
+                        .build())
 
                 //Chest Value FIXME change dropdown to color controller
                 .group(OptionGroup.createBuilder()
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
index e016988b..80bdb1c9 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
@@ -28,6 +28,9 @@ public class UIAndVisualsConfig {
     public boolean hideStatusEffectOverlay = false;
 
     @SerialEntry
+    public boolean showEquipmentInInventory = true;
+
+    @SerialEntry
     public ChestValue chestValue = new ChestValue();
 
     @SerialEntry
diff --git a/src/main/java/de/hysky/skyblocker/mixins/GenericContainerScreenHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/GenericContainerScreenHandlerMixin.java
index f75af09a..bd066fc9 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/GenericContainerScreenHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/GenericContainerScreenHandlerMixin.java
@@ -2,7 +2,10 @@ package de.hysky.skyblocker.mixins;
 
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.skyblock.dungeon.partyfinder.PartyFinderScreen;
+import de.hysky.skyblocker.skyblock.item.SkyblockInventoryScreen;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.GenericContainerScreenHandler;
 import net.minecraft.screen.ScreenHandler;
@@ -22,8 +25,18 @@ public abstract class GenericContainerScreenHandlerMixin extends ScreenHandler {
     public void setStackInSlot(int slot, int revision, ItemStack stack) {
         super.setStackInSlot(slot, revision, stack);
         SkyblockerMod.getInstance().containerSolverManager.markDirty();
-        if (MinecraftClient.getInstance().currentScreen instanceof PartyFinderScreen screen) {
-            screen.markDirty();
+
+        Screen currentScreen = MinecraftClient.getInstance().currentScreen;
+        switch (currentScreen) {
+            case PartyFinderScreen screen -> screen.markDirty();
+            case GenericContainerScreen screen when screen.getTitle().getString().toLowerCase().contains("equipment") -> {
+                int line = slot/9;
+                if (line > 0 && line < 5 && slot % 9 == 1) {
+                    boolean empty = stack.getName().getString().trim().toLowerCase().startsWith("empty");
+                    SkyblockInventoryScreen.equipment[line - 1] = empty ? ItemStack.EMPTY : stack;
+                }
+            }
+            case null, default -> {}
         }
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/mixins/InventoryScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/InventoryScreenMixin.java
index 0d833c22..191ce921 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/InventoryScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/InventoryScreenMixin.java
@@ -1,11 +1,16 @@
 package de.hysky.skyblocker.mixins;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.itemlist.ItemListWidget;
 import de.hysky.skyblocker.utils.Utils;
+import net.minecraft.client.gui.screen.ButtonTextures;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
 import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.TexturedButtonWidget;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
@@ -15,4 +20,10 @@ public abstract class InventoryScreenMixin {
     private RecipeBookWidget skyblocker$replaceRecipeBook(RecipeBookWidget original) {
         return SkyblockerConfigManager.get().general.itemList.enableItemList && Utils.isOnSkyblock() ? new ItemListWidget() : original;
     }
+
+    @WrapOperation(method = "init", at = @At(value = "NEW", target = "(IIIILnet/minecraft/client/gui/screen/ButtonTextures;Lnet/minecraft/client/gui/widget/ButtonWidget$PressAction;)Lnet/minecraft/client/gui/widget/TexturedButtonWidget;"))
+    private TexturedButtonWidget skyblocker$moveButton(int x, int y, int width, int height, ButtonTextures textures, ButtonWidget.PressAction pressAction, Operation<TexturedButtonWidget> original) {
+        if (!Utils.isOnSkyblock() || !SkyblockerConfigManager.get().uiAndVisuals.showEquipmentInInventory) return original.call(x, y, width, height, textures, pressAction);
+        return new TexturedButtonWidget(x + 21, y, width, height, textures, pressAction);
+    }
 }
diff --git a/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java b/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java
index b04f958f..f91ddc86 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java
@@ -1,7 +1,11 @@
 package de.hysky.skyblocker.mixins;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.item.HotbarSlotLock;
 import de.hysky.skyblocker.skyblock.item.ItemProtection;
+import de.hysky.skyblocker.skyblock.item.SkyblockInventoryScreen;
 import de.hysky.skyblocker.utils.JoinWorldPlaceholderScreen;
 import de.hysky.skyblocker.utils.ReconfiguringPlaceholderScreen;
 import de.hysky.skyblocker.utils.Utils;
@@ -9,8 +13,10 @@ 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.gui.screen.ingame.InventoryScreen;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -54,4 +60,10 @@ public abstract class MinecraftClientMixin {
     private Screen modifyJoinWorld(Screen screen) {
         return Utils.isOnSkyblock() ? new JoinWorldPlaceholderScreen() : screen;
     }
+
+    @WrapOperation(method = "handleInputEvents", at = @At(value = "NEW", target = "(Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/client/gui/screen/ingame/InventoryScreen;"))
+    private InventoryScreen skyblocker$skyblockInventoryScreen(PlayerEntity player, Operation<InventoryScreen> original) {
+        if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.showEquipmentInInventory) return new SkyblockInventoryScreen(player);
+        else return original.call(player);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockInventoryScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockInventoryScreen.java
new file mode 100644
index 00000000..8717dd15
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockInventoryScreen.java
@@ -0,0 +1,128 @@
+package de.hysky.skyblocker.skyblock.item;
+
+import com.mojang.serialization.Codec;
+import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.mixins.accessors.SlotAccessor;
+import de.hysky.skyblocker.utils.ItemUtils;
+import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.SimpleInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.nbt.visitor.StringNbtWriter;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.util.Identifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Opened here {@code de.hysky.skyblocker.mixins.MinecraftClientMixin#skyblocker$skyblockInventoryScreen}
+ * <br>
+ * Book button is moved here {@code de.hysky.skyblocker.mixins.InventoryScreenMixin#skyblocker$moveButton}
+ */
+public class SkyblockInventoryScreen extends InventoryScreen {
+    private static final Logger LOGGER = LoggerFactory.getLogger("Equipment");
+
+    public static final ItemStack[] equipment = new ItemStack[]{ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY};
+    private static final Codec<ItemStack[]> CODEC = ItemUtils.EMPTY_ALLOWING_ITEMSTACK_CODEC.listOf(4,4)
+            .xmap(itemStacks -> itemStacks.toArray(ItemStack[]::new), List::of).fieldOf("items").codec();
+
+    private static final Identifier SLOT_TEXTURE = new Identifier("container/slot");
+    private static final Identifier EMPTY_SLOT = new Identifier(SkyblockerMod.NAMESPACE, "equipment/empty_icon");
+
+    public static void initEquipment() {
+        ClientLifecycleEvents.CLIENT_STARTED.register(client1 -> {
+            Path resolve = SkyblockerMod.CONFIG_DIR.resolve("equipment.nbt");
+            try (BufferedReader reader = Files.newBufferedReader(resolve)) {
+                ItemStack[] array = CODEC.parse(
+                                NbtOps.INSTANCE, StringNbtReader.parse(reader.lines().collect(Collectors.joining())))
+                        .getOrThrow();
+                System.arraycopy(array, 0, equipment, 0, Math.min(array.length, 4));
+            } catch (Exception e) {
+                LOGGER.error("[Skyblocker] Failed to load Equipment data", e);
+            }
+        });
+
+        ClientLifecycleEvents.CLIENT_STOPPING.register(client1 -> {
+            Path resolve = SkyblockerMod.CONFIG_DIR.resolve("equipment.nbt");
+            try (BufferedWriter writer = Files.newBufferedWriter(resolve)) {
+                writer.write(new StringNbtWriter().apply(CODEC.encodeStart(NbtOps.INSTANCE, equipment).getOrThrow()));
+            } catch (Exception e) {
+                LOGGER.error("[Skyblocker] Failed to save Equipment data", e);
+            }
+        });
+    }
+
+    public SkyblockInventoryScreen(PlayerEntity player) {
+        super(player);
+        SimpleInventory inventory = new SimpleInventory(equipment);
+
+        Slot slot = handler.slots.get(45);
+        ((SlotAccessor) slot).setX(slot.x + 21);
+        for (int i = 0; i < 4; i++) {
+            handler.slots.add(new EquipmentSlot(inventory, i, 77, 8 + i * 18));
+        }
+    }
+
+    @Override
+    protected void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType) {
+        if (slot instanceof EquipmentSlot && handler.getCursorStack().isEmpty()) {
+            MessageScheduler.INSTANCE.sendMessageAfterCooldown("/equipment");
+        }
+        super.onMouseClick(slot, slotId, button, actionType);
+    }
+
+    @Override
+    public void removed() {
+        super.removed();
+        // move it back, the handler is the same for the entire session
+        Slot slot = handler.slots.get(45);
+        ((SlotAccessor) slot).setX(slot.x - 21);
+    }
+
+    @Override
+    protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) {
+        super.drawBackground(context, delta, mouseX, mouseY);
+        for (int i = 0; i < 4; i++) {
+            context.drawGuiTexture(SLOT_TEXTURE, x + 76 + (i == 3 ? 21 : 0), y + 7 + i * 18, 18, 18);
+        }
+    }
+
+    @Override
+    protected void drawSlot(DrawContext context, Slot slot) {
+        super.drawSlot(context, slot);
+        if (slot instanceof EquipmentSlot && !slot.hasStack()) {
+            context.drawGuiTexture(EMPTY_SLOT, slot.x, slot.y, 16, 16);
+        }
+    }
+
+    private static class EquipmentSlot extends Slot {
+
+        public EquipmentSlot(Inventory inventory, int index, int x, int y) {
+            super(inventory, index, x, y);
+        }
+
+        @Override
+        public boolean canTakeItems(PlayerEntity playerEntity) {
+            return false;
+        }
+
+        @Override
+        public boolean canInsert(ItemStack stack) {
+            return false;
+        }
+    }
+}