From 83e284e570b72f90415961a0b59fe82130a41293 Mon Sep 17 00:00:00 2001 From: telontelvarost Date: Wed, 3 Apr 2024 20:35:24 -0400 Subject: [PATCH 1/3] UDOC-0 - Fix bug with swapping items to the hotbar when swapping from an inventory like a furnace --- CHANGELOG.md | 2 +- gradle.properties | 2 +- .../mixin/client/inventory/ContainerScreenMixin.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc97a9b..102c090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Fix skin rendering by @forkiesassds in https://github.com/js6pak/mojangfix/pull/16 \ No newline at end of file +- Fix container offset when swapping items to hotbar slots \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 364fe61..91c9ece 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.14.24-babric.1 # Mod Properties - mod_version = 0.5.3 + mod_version = 0.5.4 maven_group = pl.js6pak archives_base_name = mojangfix diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java index f81e067..8243247 100644 --- a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java +++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java @@ -103,10 +103,12 @@ private void onKeyPressed(char character, int keyCode, CallbackInfo ci) { this.minecraft.interactionManager.clickSlot(this.container.syncId, slot.id, 0, false, this.minecraft.player); } - if (keyCode >= Keyboard.KEY_1 && keyCode <= Keyboard.KEY_9) { + 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, 35 + keyCode - 1, 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); } } From e757a9ac5e4cccd811410ff2446fc5992a313ecf Mon Sep 17 00:00:00 2001 From: telontelvarost Date: Wed, 3 Apr 2024 20:38:34 -0400 Subject: [PATCH 2/3] UDOC-0 - Update copyright info --- .../mojangfix/mixin/client/inventory/ContainerScreenMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java index 8243247..7a03211 100644 --- a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java +++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 js6pak + * Copyright (C) 2022-2024 js6pak * * This file is part of MojangFix. * From 2fa3326649ef5be6fb611066be1ebfa095fda010 Mon Sep 17 00:00:00 2001 From: telontelvarost Date: Wed, 3 Apr 2024 20:42:50 -0400 Subject: [PATCH 3/3] UDOC-0 - Update copyright info for build pipeline --- .../mixin/client/controls/ControlsOptionsScreenMixin.java | 2 +- .../mojangfix/mixin/client/inventory/PlayerEntityMixin.java | 2 +- .../mojangfix/mixin/client/skin/BipedEntityModelMixin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java index 7d07de1..abde05d 100644 --- a/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java +++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 js6pak + * Copyright (C) 2022-2024 js6pak * * This file is part of MojangFix. * diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java index 692ace8..18a3dcd 100644 --- a/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java +++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 js6pak + * Copyright (C) 2022-2024 js6pak * * This file is part of MojangFix. * diff --git a/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java b/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java index 7c14c88..0750d17 100644 --- a/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java +++ b/src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 js6pak + * Copyright (C) 2022-2024 js6pak * * This file is part of MojangFix. *