mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-01 01:47:02 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix toolbox regression

Browse source 
- Fix toolbox menu closing regression
This commit is contained in:
PepperBell 2021-11-28 18:50:27 -08:00
parent b0ec966b98
commit 68bf1f399a
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
View file

@ -351,14 +351,6 @@ public class RadialToolboxMenu extends AbstractSimiScreen {
@Override @Override
public boolean keyPressed(int code, int scanCode, int modifiers) { public boolean keyPressed(int code, int scanCode, int modifiers) {
InputConstants.Key mouseKey = InputConstants.getKey(code, scanCode);
if (AllKeys.TOOLBELT.getKeybind()
.isActiveAndMatches(mouseKey)) {
onClose();
ToolboxHandlerClient.COOLDOWN = 2;
return true;
}
KeyMapping[] hotbarBinds = minecraft.options.keyHotbarSlots; KeyMapping[] hotbarBinds = minecraft.options.keyHotbarSlots;
for (int i = 0; i < hotbarBinds.length && i < 8; i++) { for (int i = 0; i < hotbarBinds.length && i < 8; i++) {
if (hotbarBinds[i].matches(code, scanCode)) { if (hotbarBinds[i].matches(code, scanCode)) {
@ -385,6 +377,17 @@ public class RadialToolboxMenu extends AbstractSimiScreen {
return super.keyPressed(code, scanCode, modifiers); return super.keyPressed(code, scanCode, modifiers);
} }
@Override
public boolean keyReleased(int code, int scanCode, int modifiers) {
InputConstants.Key mouseKey = InputConstants.getKey(code, scanCode);
if (AllKeys.TOOLBELT.getKeybind()
.isActiveAndMatches(mouseKey)) {
onClose();
return true;
}
return super.keyReleased(code, scanCode, modifiers);
}
public static enum State { public static enum State {
SELECT_BOX, SELECT_ITEM, SELECT_ITEM_UNEQUIP, DETACH SELECT_BOX, SELECT_ITEM, SELECT_ITEM_UNEQUIP, DETACH
} }