Compare commits

...
1 Commits
Author SHA1 Message Date
dnorberg 143da0a940 Keep notebook rename keys out of inventory shortcuts
Build / build (push) Canceled after 0s
2026-09-24 04:27:51 -04:00
2 changed files with 13 additions and 3 deletions

No files matched your search

+1 -1
View File
@@ -35,7 +35,7 @@ mod_name=Rivencraft
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=LGPL-3.0-or-later mod_license=LGPL-3.0-or-later
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md. # The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
mod_version=0.3.3.3 mod_version=0.3.3.4
immersive_portals_version=6.0.7 immersive_portals_version=6.0.7
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources. # This should match the base package used for the mod sources.
@@ -163,8 +163,18 @@ public final class NotebookScreen extends AbstractContainerScreen<NotebookMenu>
@Override @Override
public boolean keyPressed(int keyCode, int scanCode, int modifiers) { public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
if (renaming && textInput.isFocused() && (keyCode == 257 || keyCode == 335)) { if (textInput.isFocused()) {
finishRename(); if (renaming && (keyCode == 257 || keyCode == 335)) {
finishRename();
} else if (keyCode == 256) {
if (renaming) finishRename();
setFocused(null);
textInput.setFocused(false);
} else {
textInput.keyPressed(keyCode, scanCode, modifiers);
}
// EditBox does not consume ordinary letter key presses; the matching charTyped
// event handles text input. Do not pass them to the container's inventory keys.
return true; return true;
} }
if (!textInput.isFocused() && keyCode == 82 && selectedSlot >= 0) { if (!textInput.isFocused() && keyCode == 82 && selectedSlot >= 0) {