Retain a reference to the player through the inventory window

Protonull · Oct 1, 2024 · 828baec · 828baec
1 parent ff06871
commit 828baec
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 17 deletions.
diff --git a/src/main/java/uk/protonull/civ/chesttracker/gui/screens/ContainerLocationDeciderScreen.java b/src/main/java/uk/protonull/civ/chesttracker/gui/screens/ContainerLocationDeciderScreen.java
@@ -6,6 +6,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.debug.DebugRenderer;
 import net.minecraft.core.BlockPos;
@@ -31,23 +32,25 @@ public class ContainerLocationDeciderScreen extends Screen {
     private static final int MIN_DISTANCE = 1;
     private static final int MAX_DISTANCE = 5;
 
-    private final Screen parent;
+    private final AbstractContainerScreen<?> parent;
     private final Consumer<BlockPos> setInventoryLocation;
     private final Vec3 playerEyePosition;
     private final Vec3 playerLookDirection;
 
     private int distance = 1;
 
     public ContainerLocationDeciderScreen(
-        final @NotNull Screen parent,
-        final @NotNull Consumer<@NotNull BlockPos> setInventoryLocation,
-        final @NotNull LocalPlayer player
+        final @NotNull AbstractContainerScreen<?> parent,
+        final @NotNull Consumer<@NotNull BlockPos> setInventoryLocation
     ) {
         super(Component.empty());
         this.parent = Objects.requireNonNull(parent);
         this.setInventoryLocation = Objects.requireNonNull(setInventoryLocation);
-        this.playerEyePosition = player.getEyePosition();
-        this.playerLookDirection = player.getLookAngle().normalize();
+        {
+            final LocalPlayer player = Shortcuts.getPlayerFromInventoryWindow(parent);
+            this.playerEyePosition = player.getEyePosition();
+            this.playerLookDirection = player.getLookAngle().normalize();
+        }
         calculateNewDeciderLocation();
     }
 

diff --git a/src/main/java/uk/protonull/civ/chesttracker/mixing/InventoryWindow.java b/src/main/java/uk/protonull/civ/chesttracker/mixing/InventoryWindow.java
@@ -0,0 +1,8 @@
+package uk.protonull.civ.chesttracker.mixing;
+
+import net.minecraft.client.player.LocalPlayer;
+import org.jetbrains.annotations.NotNull;
+
+public interface InventoryWindow {
+    @NotNull LocalPlayer civchesttracker$getPlayer();
+}
diff --git a/src/main/java/uk/protonull/civ/chesttracker/mixins/InventoryContextButtonsMixin.java b/src/main/java/uk/protonull/civ/chesttracker/mixins/InventoryContextButtonsMixin.java
@@ -92,10 +92,7 @@ private void addExtraButtons(
             return;
         }
         // TODO: Lol
-        final LocalPlayer player = Minecraft.getInstance().player;
-        if (player == null) {
-            return;
-        }
+        final LocalPlayer player = Shortcuts.getPlayerFromInventoryWindow(parent);
         final ResourceLocation dimensionKey = player.clientLevel.dimension().location();
         final MemoryKeyImpl dimensionStorage = Shortcuts.getStorageForDimension(serverStorage, dimensionKey);
         if (dimensionStorage == null) {
@@ -105,8 +102,7 @@ private void addExtraButtons(
         this.secondaryButtons.add(new TrackContainerButton(() -> {
             Minecraft.getInstance().setScreen(new ContainerLocationDeciderScreen(
                 parent,
-                (blockPos) -> setRestoreLocation(parent, MemoryLocation.inWorld(dimensionKey, blockPos)),
-                player
+                (blockPos) -> setRestoreLocation(parent, MemoryLocation.inWorld(dimensionKey, blockPos))
             ));
         }));
     }

diff --git a/src/main/java/uk/protonull/civ/chesttracker/mixins/SetBlockPositionBasedOnMemoryMixin.java b/src/main/java/uk/protonull/civ/chesttracker/mixins/SetBlockPositionBasedOnMemoryMixin.java
@@ -2,7 +2,6 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import java.util.Optional;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.NotNull;
@@ -40,10 +39,7 @@ public abstract class SetBlockPositionBasedOnMemoryMixin {
         if (serverStorage == null) {
             return Optional.empty();
         }
-        final LocalPlayer player = Minecraft.getInstance().player;
-        if (player == null) {
-            return Optional.empty();
-        }
+        final LocalPlayer player = Shortcuts.getPlayerFromInventoryWindow(context.getScreen());
         final MemoryKeyImpl dimensionStorage = Shortcuts.getStorageForDimension(
             serverStorage,
             player.clientLevel.dimension().location()

diff --git a/...va/uk/protonull/civ/chesttracker/mixins/retention/RetainPlayerOnInventoryWindowMixin.java b/...va/uk/protonull/civ/chesttracker/mixins/retention/RetainPlayerOnInventoryWindowMixin.java
@@ -0,0 +1,37 @@
+package uk.protonull.civ.chesttracker.mixins.retention;
+
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import org.jetbrains.annotations.NotNull;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import uk.protonull.civ.chesttracker.mixing.InventoryWindow;
+
+@Mixin(AbstractContainerScreen.class)
+public abstract class RetainPlayerOnInventoryWindowMixin implements InventoryWindow {
+    @Unique
+    private LocalPlayer player;
+
+    @Redirect(
+        method = "<init>",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/entity/player/Inventory;getDisplayName()Lnet/minecraft/network/chat/Component;"
+        )
+    )
+    protected @NotNull Component civchesttracker$interceptPlayerInstance(
+        final @NotNull Inventory playerInventory
+    ) {
+        this.player = (LocalPlayer) playerInventory.player;
+        return playerInventory.getDisplayName();
+    }
+
+    @Override
+    public @NotNull LocalPlayer civchesttracker$getPlayer() {
+        return this.player;
+    }
+}
diff --git a/src/main/java/uk/protonull/civ/chesttracker/utilities/Shortcuts.java b/src/main/java/uk/protonull/civ/chesttracker/utilities/Shortcuts.java
@@ -2,6 +2,8 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
@@ -11,6 +13,7 @@
 import red.jackf.chesttracker.impl.memory.MemoryBankAccessImpl;
 import red.jackf.chesttracker.impl.memory.MemoryBankImpl;
 import red.jackf.chesttracker.impl.memory.MemoryKeyImpl;
+import uk.protonull.civ.chesttracker.mixing.InventoryWindow;
 import uk.protonull.civ.chesttracker.mixins.MemoryAccessor;
 
 public final class Shortcuts {
@@ -48,6 +51,12 @@ public static void forciblyRefreshScreen(
         );
     }
 
+    public static @NotNull LocalPlayer getPlayerFromInventoryWindow(
+        final @NotNull AbstractContainerScreen<?> screen
+    ) {
+        return ((InventoryWindow) screen).civchesttracker$getPlayer();
+    }
+
     public static @NotNull BlockPos asBlockPos(
         final @NotNull Vec3 vec3
     ) {

diff --git a/src/main/resources/civchesttracker.mixins.json b/src/main/resources/civchesttracker.mixins.json
@@ -13,6 +13,8 @@
         "illegal.NukeConnectedBlocksGrabberMixin",
         "illegal.NukeInteractionTrackerImplMixin",
 
+        "retention.RetainPlayerOnInventoryWindowMixin",
+
         "InventoryContextButtonsMixin",
         "MemoryAccessor",
         "MemoryMixin",