diff options
| author | Alex <8379108+Alex33856@users.noreply.github.com> | 2025-06-14 10:18:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-14 22:18:10 +0800 |
| commit | 5dc6d985e436bc46ce7d6563189f27ca1c7ef52c (patch) | |
| tree | c867aff26e60cf01d69617f89e7a1f471c384ec9 /src | |
| parent | 2d63e6088aa588556b588070e826ce6c0ec1492d (diff) | |
| download | Skyblocker-5dc6d985e436bc46ce7d6563189f27ca1c7ef52c.tar.gz Skyblocker-5dc6d985e436bc46ce7d6563189f27ca1c7ef52c.tar.bz2 Skyblocker-5dc6d985e436bc46ce7d6563189f27ca1c7ef52c.zip | |
Allow numpad enter key to close signs (#1333)
* Allow numpad enter key to close signs
* Refactor enter key check
---------
Co-authored-by: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java index 4248a3e5..c68d8f3e 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java @@ -1,6 +1,7 @@ package de.hysky.skyblocker.mixins; +import com.llamalad7.mixinextras.sugar.Local; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.calculators.SignCalculator; import de.hysky.skyblocker.skyblock.speedPreset.SpeedPresets; @@ -8,6 +9,7 @@ import de.hysky.skyblocker.utils.Utils; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen; +import net.minecraft.client.util.InputUtil; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import org.spongepowered.asm.mixin.Final; @@ -17,8 +19,6 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.llamalad7.mixinextras.sugar.Local; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(AbstractSignEditScreen.class) @@ -55,14 +55,9 @@ public abstract class SignEditScreenMixin extends Screen { @Inject(method = "keyPressed", at = @At("HEAD")) private void skyblocker$keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) { - // enter key - if (keyCode != 257 || !Utils.isOnSkyblock() || !isInputSign()) { - return; - } - - if (SkyblockerConfigManager.get().uiAndVisuals.inputCalculator.closeSignsWithEnter) { - this.close(); - } + if (SkyblockerConfigManager.get().uiAndVisuals.inputCalculator.closeSignsWithEnter + && Utils.isOnSkyblock() && isInputSign() + && (keyCode == InputUtil.GLFW_KEY_ENTER || keyCode == InputUtil.GLFW_KEY_KP_ENTER)) this.close(); } @Inject(method = "finishEditing", at = @At("HEAD")) |