Skip to content

Fix index out of bounds exception when swapping items to the hotbar #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
telvarost wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix index out of bounds exception when swapping items to the hotbar #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83e284e
UDOC-0 - Fix bug with swapping items to the hotbar when swapping from…
telvarost Apr 4, 2024
e757a9a
UDOC-0 - Update copyright info
telvarost Apr 4, 2024
2fa3326
UDOC-0 - Update copyright info for build pipeline
telvarost Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- Fix skin rendering by @forkiesassds in https://github.com/js6pak/mojangfix/pull/16
- Fix container offset when swapping items to hotbar slots
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion src/main/java/pl/js6pak/mojangfix/mixin/client/controls/ControlsOptionsScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 js6pak
* Copyright (C) 2022-2024 js6pak
*
* This file is part of MojangFix.
*
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/ContainerScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 js6pak
* Copyright (C) 2022-2024 js6pak
*
* This file is part of MojangFix.
*
Expand Down Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/pl/js6pak/mojangfix/mixin/client/inventory/PlayerEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 js6pak
* Copyright (C) 2022-2024 js6pak
*
* This file is part of MojangFix.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/pl/js6pak/mojangfix/mixin/client/skin/BipedEntityModelMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 js6pak
* Copyright (C) 2022-2024 js6pak
*
* This file is part of MojangFix.
*
Expand Down