diff options
author | Empa <42304516+ItsEmpa@users.noreply.github.com> | 2024-04-08 21:11:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-08 21:11:08 +0200 |
commit | 4d2c73dc271c1255c86ca9d811468e8b36d48640 (patch) | |
tree | 425bfb580aafac65232286900cc77718e0acf083 /src/main/java/at/hannibal2 | |
parent | fc65c99130a46bb7234f2f593362a8824bc620d1 (diff) | |
download | skyhanni-4d2c73dc271c1255c86ca9d811468e8b36d48640.tar.gz skyhanni-4d2c73dc271c1255c86ca9d811468e8b36d48640.tar.bz2 skyhanni-4d2c73dc271c1255c86ca9d811468e8b36d48640.zip |
Fix: Duplicate Custom Keybinds (#1387)
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt | 17 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt | 13 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt index c9e4e30ac..d89437a5b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt @@ -3,14 +3,18 @@ package at.hannibal2.skyhanni.features.garden.farming import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.mixins.transformers.AccessorKeyBinding +import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld +import at.hannibal2.skyhanni.utils.SimpleTimeMark import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiEditSign import net.minecraft.client.settings.KeyBinding import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import org.lwjgl.input.Keyboard import org.spongepowered.asm.mixin.injection.callback.CallbackInfo import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable import java.util.IdentityHashMap +import kotlin.time.Duration.Companion.seconds object GardenCustomKeybinds { @@ -19,6 +23,7 @@ object GardenCustomKeybinds { private val map: MutableMap<KeyBinding, () -> Int> = IdentityHashMap() private var lastWindowOpenTime = 0L + private var lastDuplicateKeybindsWarnTime = SimpleTimeMark.farPast() init { map[mcSettings.keyBindAttack] = { config.attack } @@ -47,6 +52,18 @@ object GardenCustomKeybinds { // TODO remove workaround if (System.currentTimeMillis() < lastWindowOpenTime + 300) return false + val areDuplicates = map.values + .map { it() } + .filter { it != Keyboard.KEY_NONE } + .let { values -> values.size != values.toSet().size } + if (areDuplicates) { + if (lastDuplicateKeybindsWarnTime.passedSince() > 30.seconds) { + ChatUtils.clickableUserError("Duplicate Custom Keybinds aren't allowed!", "sh custom keybinds") + lastDuplicateKeybindsWarnTime = SimpleTimeMark.now() + } + return false + } + return true } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt index 3a88fd51f..d2dd5c9b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt @@ -53,6 +53,19 @@ object ChatUtils { } /** + * Sends a message to the user that they did something incorrectly. + * Runs a command when clicked to fix the issue. + * + * @param message The message to be sent + * @param command The command to be executed when the message is clicked + * + * @see USER_ERROR_PREFIX + */ + fun clickableUserError(message: String, command: String) { + internalChat(createClickableChat(USER_ERROR_PREFIX + message, command)) + } + + /** * Sends a message to the user that an error occurred caused by something in the code. * This should be used for errors that are not caused by the user. * |