diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/test')
5 files changed, 20 insertions, 15 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/test/ParkourWaypointSaver.kt b/src/main/java/at/hannibal2/skyhanni/test/ParkourWaypointSaver.kt index e74a6acff..65e2e6275 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/ParkourWaypointSaver.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/ParkourWaypointSaver.kt @@ -29,15 +29,18 @@ class ParkourWaypointSaver { if (NEUItems.neuHasFocus()) return if (timeLastSaved.passedSince() < 250.milliseconds) return - if (config.deleteKey == event.keyCode) { - locations = locations.dropLast(1).toMutableList() - update() - } - if (config.saveKey == event.keyCode) { - val newLocation = LorenzVec.getBlockBelowPlayer() - if (locations.isNotEmpty() && newLocation == locations.last()) return - locations.add(newLocation) - update() + when (event.keyCode) { + config.deleteKey -> { + locations = locations.dropLast(1).toMutableList() + update() + } + + config.saveKey -> { + val newLocation = LorenzVec.getBlockBelowPlayer() + if (locations.isNotEmpty() && newLocation == locations.last()) return + locations.add(newLocation) + update() + } } } diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt index 3a0660c2d..6e2d2d1ab 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt @@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull import at.hannibal2.skyhanni.utils.ItemUtils.name +import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LorenzDebug import at.hannibal2.skyhanni.utils.LorenzLogger @@ -267,7 +268,7 @@ class SkyHanniDebugsAndTests { @SubscribeEvent fun onKeybind(event: GuiScreenEvent.KeyboardInputEvent.Post) { - if (!OSUtils.isKeyHeld(SkyHanniMod.feature.dev.copyInternalName)) return + if (!SkyHanniMod.feature.dev.copyInternalName.isKeyHeld()) return val gui = event.gui as? GuiContainer ?: return val focussedSlot = gui.slotUnderMouse ?: return val stack = focussedSlot.stack ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestExportTools.kt b/src/main/java/at/hannibal2/skyhanni/test/TestExportTools.kt index 77547770a..426562e6f 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/TestExportTools.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/TestExportTools.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.test import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.utils.ItemStackTypeAdapterFactory import at.hannibal2.skyhanni.utils.KSerializable +import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld import at.hannibal2.skyhanni.utils.KotlinTypeAdapterFactory import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NBTTypeAdapter @@ -47,7 +48,7 @@ object TestExportTools { @SubscribeEvent fun onKeybind(event: GuiScreenEvent.KeyboardInputEvent.Post) { - if (!OSUtils.isKeyHeld(SkyHanniMod.feature.dev.copyNBTDataCompressed)) return + if (!SkyHanniMod.feature.dev.copyNBTDataCompressed.isKeyHeld()) return val gui = event.gui as? GuiContainer ?: return val focussedSlot = gui.slotUnderMouse ?: return val stack = focussedSlot.stack ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestShowSlotNumber.kt b/src/main/java/at/hannibal2/skyhanni/test/TestShowSlotNumber.kt index 115cef414..9b11abd60 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/TestShowSlotNumber.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/TestShowSlotNumber.kt @@ -2,14 +2,14 @@ package at.hannibal2.skyhanni.test import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.RenderInventoryItemTipEvent -import at.hannibal2.skyhanni.utils.OSUtils +import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class TestShowSlotNumber { @SubscribeEvent fun onRenderItemTip(event: RenderInventoryItemTipEvent) { - if (OSUtils.isKeyHeld(SkyHanniMod.feature.dev.showSlotNumberKey)) { + if (SkyHanniMod.feature.dev.showSlotNumberKey.isKeyHeld()) { val slotIndex = event.slot.slotIndex event.stackTip = "$slotIndex" } diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt index 6c2ef3a37..8c713558f 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.test.command import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.utils.KeyboardUtils +import at.hannibal2.skyhanni.utils.KeyboardManager import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.OSUtils import at.hannibal2.skyhanni.utils.StringUtils.removeColor @@ -30,7 +30,7 @@ object CopyErrorCommand { } val id = array[0] - val fullErrorMessage = KeyboardUtils.isControlKeyDown() + val fullErrorMessage = KeyboardManager.isControlKeyDown() val errorMessage = if (fullErrorMessage) { fullErrorMessages[id] } else { |