UDOC-0 - Fix container offset when swapping items to hotbar slots

telvarost · Apr 4, 2024 · 7500a7b · 7500a7b
1 parent 3a2386a
commit 7500a7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=b1.7.3+build.8
 loader_version=0.14.24-babric.1
 
 # Mod Properties
-mod_version = 1.3.1
+mod_version = 1.3.2
 maven_group = pl.telvarost
 archives_base_name = mojangfixstationapi
 

diff --git a/...in/java/pl/telvarost/mojangfixstationapi/mixin/client/inventory/ContainerScreenMixin.java b/...in/java/pl/telvarost/mojangfixstationapi/mixin/client/inventory/ContainerScreenMixin.java
@@ -104,10 +104,14 @@ private void onKeyPressed(char character, int keyCode, CallbackInfo ci) {
         }
 
         if (keyCode >= Keyboard.KEY_1 && keyCode <= Keyboard.KEY_9) {
-            if (this.minecraft.player.inventory.getCursorStack() == null)
+            if (  (null != this.container.slots)
+               && (10 <= this.container.slots.size())
+            ) {
+                if (this.minecraft.player.inventory.getCursorStack() == null)
+                    this.minecraft.interactionManager.clickSlot(this.container.syncId, slot.id, 0, false, this.minecraft.player);
+                this.minecraft.interactionManager.clickSlot(this.container.syncId, (this.container.slots.size() - 10) + keyCode - 1, 0, false, this.minecraft.player);
                 this.minecraft.interactionManager.clickSlot(this.container.syncId, slot.id, 0, false, this.minecraft.player);
-            this.minecraft.interactionManager.clickSlot(this.container.syncId, 35 + keyCode - 1, 0, false, this.minecraft.player);
-            this.minecraft.interactionManager.clickSlot(this.container.syncId, slot.id, 0, false, this.minecraft.player);
+            }
         }
     }
 }