From 9c0073ab1e60b1b9df0353baa0c3f97cc33089d1 Mon Sep 17 00:00:00 2001 From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Date: Mon, 20 Mar 2023 21:46:30 -0400 Subject: [PATCH] Prevent Moving On Death See #350 Original feature credit: Co-authored-by: HighCrit <35771251+HighCrit@users.noreply.github.com> --- src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt | 7 +++++++ .../skytils/skytilsmod/features/impl/misc/MiscFeatures.kt | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index a2a3f697d..2a9928ecb 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -1977,6 +1977,13 @@ object Config : Vigilant( ) var preventCursorReset = false + @Property( + type = PropertyType.SWITCH, name = "Prevent Moving on Death", + description = "Unpresses all keys on death to prevent you from moving.", + category = "Miscellaneous", subcategory = "Quality of Life" + ) + var preventMovingOnDeath = false + @Property( type = PropertyType.SWITCH, name = "Power Orb Lock", description = "Prevents placing the power orb if the same or better power orb is within range.", diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt index 17cd64335..5bac9acf8 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt @@ -50,6 +50,7 @@ import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.client.gui.GuiScreen import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.client.renderer.GlStateManager +import net.minecraft.client.settings.KeyBinding import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.effect.EntityLightningBolt import net.minecraft.entity.item.EntityArmorStand @@ -139,6 +140,9 @@ object MiscFeatures { if (!Utils.inSkyblock) return val unformatted = event.message.unformattedText.stripControlCodes().trim() val formatted = event.message.formattedText + if (formatted.startsWith("§r§cYou died") && Skytils.config.preventMovingOnDeath) { + KeyBinding.unPressAllKeys() + } if (unformatted == "The ground begins to shake as an Endstone Protector rises from below!") { golemSpawnTime = System.currentTimeMillis() + 20000 }