refactor: merge 1.21.5 changes back into 1.21.7

1 files changed, 31 insertions, 0 deletions

diff --git a/src/main/java/moe/nea/firmament/mixins/MixinPlayerScreenHandler.java b/src/main/java/moe/nea/firmament/mixins/MixinPlayerScreenHandler.java
new file mode 100644
index 0000000..12455f4
--- /dev/null
+++ b/src/main/java/moe/nea/firmament/mixins/MixinPlayerScreenHandler.java
@@ -0,0 +1,31 @@
+package moe.nea.firmament.mixins;
+
+import moe.nea.firmament.features.fixes.Fixes;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.screen.PlayerScreenHandler;
+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.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerScreenHandler.class)
+public class MixinPlayerScreenHandler {
+
+	@Unique
+	private static final int OFF_HAND_SLOT = 40;
+
+	@Inject(method = "<init>", at = @At("TAIL"))
+	private void moveOffHandSlot(PlayerInventory inventory, boolean onServer, PlayerEntity owner, CallbackInfo ci) {
+		if (Fixes.TConfig.INSTANCE.getHideOffHand()) {
+			PlayerScreenHandler self = (PlayerScreenHandler) (Object) this;
+			self.slots.stream()
+				.filter(slot -> slot.getIndex() == OFF_HAND_SLOT)
+				.forEach(slot -> {
+					slot.x = -1000;
+					slot.y = -1000;
+				});
+		}
+	}
+}