feat: Add /dh command

6 files changed, 162 insertions, 84 deletions

diff --git a/src/main/java/moe/nea/firmament/mixins/FirmKeybindsInVanillaControlsPatch.java b/src/main/java/moe/nea/firmament/mixins/FirmKeybindsInVanillaControlsPatch.java
index b386604..699d5b7 100644
--- a/src/main/java/moe/nea/firmament/mixins/FirmKeybindsInVanillaControlsPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/FirmKeybindsInVanillaControlsPatch.java
@@ -51,7 +51,7 @@ public class FirmKeybindsInVanillaControlsPatch {
         var config = FirmamentKeyBindings.INSTANCE.getKeyBindings().get(binding);
         if (config == null) return;
         resetButton.active = false;
-        editButton.setMessage(Text.translatable("firmament.keybinding.external", config.value.format()));
+        editButton.setMessage(Text.translatable("firmament.keybinding.external", config.getValue().format()));
         ci.cancel();
     }
 
diff --git a/src/main/java/moe/nea/firmament/mixins/SaveOriginalCommandTreePacket.java b/src/main/java/moe/nea/firmament/mixins/SaveOriginalCommandTreePacket.java
new file mode 100644
index 0000000..2f2f188
--- /dev/null
+++ b/src/main/java/moe/nea/firmament/mixins/SaveOriginalCommandTreePacket.java
@@ -0,0 +1,17 @@
+package moe.nea.firmament.mixins;
+
+import moe.nea.firmament.features.chat.QuickCommands;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ClientPlayNetworkHandler.class)
+public class SaveOriginalCommandTreePacket {
+	@Inject(method = "onCommandTree", at = @At(value = "RETURN"))
+	private void saveUnmodifiedCommandTree(CommandTreeS2CPacket packet, CallbackInfo ci) {
+		QuickCommands.INSTANCE.setLastReceivedTreePacket(packet);
+	}
+}
diff --git a/src/main/kotlin/features/chat/QuickCommands.kt b/src/main/kotlin/features/chat/QuickCommands.kt
index 5944b92..7963171 100644
--- a/src/main/kotlin/features/chat/QuickCommands.kt
+++ b/src/main/kotlin/features/chat/QuickCommands.kt
@@ -1,8 +1,12 @@
-
-
 package moe.nea.firmament.features.chat
 
+import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.context.CommandContext
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+import net.fabricmc.fabric.impl.command.client.ClientCommandInternals
+import net.minecraft.command.CommandRegistryAccess
+import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket
 import net.minecraft.text.Text
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.commands.DefaultSource
@@ -12,89 +16,139 @@ import moe.nea.firmament.commands.thenArgument
 import moe.nea.firmament.commands.thenExecute
 import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.features.FirmamentFeature
+import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.gui.config.ManagedOption
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
+import moe.nea.firmament.util.grey
+import moe.nea.firmament.util.tr
 
 object QuickCommands : FirmamentFeature {
-    override val identifier: String
-        get() = "quick-commands"
+	override val identifier: String
+		get() = "quick-commands"
+
+	object TConfig : ManagedConfig("quick-commands", Category.CHAT) {
+		val enableJoin by toggle("join") { true }
+		val enableDh by toggle("dh") { true }
+		override fun onChange(option: ManagedOption<*>) {
+			reloadCommands()
+		}
+	}
+
+	fun reloadCommands() {
+		val lastPacket = lastReceivedTreePacket ?: return
+		val network = MC.networkHandler ?: return
+		val fallback = ClientCommandInternals.getActiveDispatcher()
+		try {
+			val dispatcher = CommandDispatcher<FabricClientCommandSource>()
+			ClientCommandInternals.setActiveDispatcher(dispatcher)
+			ClientCommandRegistrationCallback.EVENT.invoker()
+				.register(dispatcher, CommandRegistryAccess.of(network.combinedDynamicRegistries,
+				                                               network.enabledFeatures))
+			ClientCommandInternals.finalizeInit()
+			network.onCommandTree(lastPacket)
+		} catch (ex: Exception) {
+			ClientCommandInternals.setActiveDispatcher(fallback)
+			throw ex
+		}
+	}
+
+
+	fun removePartialPrefix(text: String, prefix: String): String? {
+		var lf: String? = null
+		for (i in 1..prefix.length) {
+			if (text.startsWith(prefix.substring(0, i))) {
+				lf = text.substring(i)
+			}
+		}
+		return lf
+	}
+
+	var lastReceivedTreePacket: CommandTreeS2CPacket? = null
 
-    fun removePartialPrefix(text: String, prefix: String): String? {
-        var lf: String? = null
-        for (i in 1..prefix.length) {
-            if (text.startsWith(prefix.substring(0, i))) {
-                lf = text.substring(i)
-            }
-        }
-        return lf
-    }
+	val kuudraLevelNames = listOf("NORMAL", "HOT", "BURNING", "FIERY", "INFERNAL")
+	val dungeonLevelNames = listOf("ONE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN")
 
-    val kuudraLevelNames = listOf("NORMAL", "HOT", "BURNING", "FIERY", "INFERNAL")
-    val dungeonLevelNames = listOf("ONE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN")
+	@Subscribe
+	fun registerDh(event: CommandEvent) {
+		if (!TConfig.enableDh) return
+		event.register("dh") {
+			thenExecute {
+				MC.sendCommand("warp dhub")
+			}
+		}
+		event.register("dn") {
+			thenExecute {
+				MC.sendChat(tr("firmament.quickwarp.deez-nutz", "Warping to... Deez Nuts!").grey())
+				MC.sendCommand("warp dhub")
+			}
+		}
+	}
 
-    @Subscribe
-    fun onCommands(it: CommandEvent) {
-        it.register("join") {
-            thenArgument("what", RestArgumentType) { what ->
-                thenExecute {
-                    val what = this[what]
-                    if (!SBData.isOnSkyblock) {
-                        MC.sendCommand("join $what")
-                        return@thenExecute
-                    }
-                    val joinName = getNameForFloor(what.replace(" ", "").lowercase())
-                    if (joinName == null) {
-                        source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown", what))
-                    } else {
-                        source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.success",
-                                                                         joinName))
-                        MC.sendCommand("joininstance $joinName")
-                    }
-                }
-            }
-            thenExecute {
-                source.sendFeedback(Text.translatable("firmament.quick-commands.join.explain"))
-            }
-        }
-    }
+	@Subscribe
+	fun registerJoin(it: CommandEvent) {
+		if (!TConfig.enableJoin) return
+		it.register("join") {
+			thenArgument("what", RestArgumentType) { what ->
+				thenExecute {
+					val what = this[what]
+					if (!SBData.isOnSkyblock) {
+						MC.sendCommand("join $what")
+						return@thenExecute
+					}
+					val joinName = getNameForFloor(what.replace(" ", "").lowercase())
+					if (joinName == null) {
+						source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown", what))
+					} else {
+						source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.success",
+						                                                 joinName))
+						MC.sendCommand("joininstance $joinName")
+					}
+				}
+			}
+			thenExecute {
+				source.sendFeedback(Text.translatable("firmament.quick-commands.join.explain"))
+			}
+		}
+	}
 
-    fun CommandContext<DefaultSource>.getNameForFloor(w: String): String? {
-        val kuudraLevel = removePartialPrefix(w, "kuudratier") ?: removePartialPrefix(w, "tier")
-        if (kuudraLevel != null) {
-            val l = kuudraLevel.toIntOrNull()?.let { it - 1 } ?: kuudraLevelNames.indexOfFirst {
-                it.startsWith(
-                    kuudraLevel,
-                    true
-                )
-            }
-            if (l !in kuudraLevelNames.indices) {
-                source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-kuudra",
-                                                                 kuudraLevel))
-                return null
-            }
-            return "KUUDRA_${kuudraLevelNames[l]}"
-        }
-        val masterLevel = removePartialPrefix(w, "master")
-        val normalLevel =
-            removePartialPrefix(w, "floor") ?: removePartialPrefix(w, "catacombs") ?: removePartialPrefix(w, "dungeons")
-        val dungeonLevel = masterLevel ?: normalLevel
-        if (dungeonLevel != null) {
-            val l = dungeonLevel.toIntOrNull()?.let { it - 1 } ?: dungeonLevelNames.indexOfFirst {
-                it.startsWith(
-                    dungeonLevel,
-                    true
-                )
-            }
-            if (masterLevel == null && (l == -1 || null != removePartialPrefix(w, "entrance"))) {
-                return "CATACOMBS_ENTRANCE"
-            }
-            if (l !in dungeonLevelNames.indices) {
-                source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-catacombs",
-                                                                 kuudraLevel))
-                return null
-            }
-            return "${if (masterLevel != null) "MASTER_" else ""}CATACOMBS_FLOOR_${dungeonLevelNames[l]}"
-        }
-        return null
-    }
+	fun CommandContext<DefaultSource>.getNameForFloor(w: String): String? {
+		val kuudraLevel = removePartialPrefix(w, "kuudratier") ?: removePartialPrefix(w, "tier")
+		if (kuudraLevel != null) {
+			val l = kuudraLevel.toIntOrNull()?.let { it - 1 } ?: kuudraLevelNames.indexOfFirst {
+				it.startsWith(
+					kuudraLevel,
+					true
+				)
+			}
+			if (l !in kuudraLevelNames.indices) {
+				source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-kuudra",
+				                                                 kuudraLevel))
+				return null
+			}
+			return "KUUDRA_${kuudraLevelNames[l]}"
+		}
+		val masterLevel = removePartialPrefix(w, "master")
+		val normalLevel =
+			removePartialPrefix(w, "floor") ?: removePartialPrefix(w, "catacombs") ?: removePartialPrefix(w, "dungeons")
+		val dungeonLevel = masterLevel ?: normalLevel
+		if (dungeonLevel != null) {
+			val l = dungeonLevel.toIntOrNull()?.let { it - 1 } ?: dungeonLevelNames.indexOfFirst {
+				it.startsWith(
+					dungeonLevel,
+					true
+				)
+			}
+			if (masterLevel == null && (l == -1 || null != removePartialPrefix(w, "entrance"))) {
+				return "CATACOMBS_ENTRANCE"
+			}
+			if (l !in dungeonLevelNames.indices) {
+				source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-catacombs",
+				                                                 kuudraLevel))
+				return null
+			}
+			return "${if (masterLevel != null) "MASTER_" else ""}CATACOMBS_FLOOR_${dungeonLevelNames[l]}"
+		}
+		return null
+	}
 }
diff --git a/src/main/kotlin/gui/config/ManagedConfig.kt b/src/main/kotlin/gui/config/ManagedConfig.kt
index 641b673..7ddda9e 100644
--- a/src/main/kotlin/gui/config/ManagedConfig.kt
+++ b/src/main/kotlin/gui/config/ManagedConfig.kt
@@ -15,7 +15,6 @@ import org.lwjgl.glfw.GLFW
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
-import kotlin.enums.enumEntries
 import kotlin.io.path.createDirectories
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
@@ -135,7 +134,7 @@ abstract class ManagedConfig(
 		return StringIdentifiable.createCodec { x() }
 	}
 
-// TODO: wait on https://youtrack.jetbrains.com/issue/KT-73434
+	// TODO: wait on https://youtrack.jetbrains.com/issue/KT-73434
 //	protected inline fun <reified E> choice(
 //		propertyName: String,
 //		noinline default: () -> E
@@ -148,6 +147,8 @@ abstract class ManagedConfig(
 //			default
 //		)
 //	}
+	open fun onChange(option: ManagedOption<*>) {
+	}
 
 	protected fun duration(
 		propertyName: String,
diff --git a/src/main/kotlin/gui/config/ManagedOption.kt b/src/main/kotlin/gui/config/ManagedOption.kt
index d1aba83..383f392 100644
--- a/src/main/kotlin/gui/config/ManagedOption.kt
+++ b/src/main/kotlin/gui/config/ManagedOption.kt
@@ -6,7 +6,6 @@ import kotlinx.serialization.json.JsonObject
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 import net.minecraft.text.Text
-import moe.nea.firmament.Firmament
 import moe.nea.firmament.util.ErrorUtil
 
 class ManagedOption<T : Any>(
@@ -28,7 +27,13 @@ class ManagedOption<T : Any>(
 	val descriptionTranslationKey = "firmament.config.${element.name}.${propertyName}.description"
 	val labelDescription: Text = Text.translatable(descriptionTranslationKey)
 
-	lateinit var value: T
+	private var actualValue: T? = null
+	var value: T
+		get() = actualValue ?: error("Lateinit variable not initialized")
+		set(value) {
+			actualValue = value
+			element.onChange(this)
+		}
 
 	override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
 		this.value = value
diff --git a/src/main/resources/firmament.accesswidener b/src/main/resources/firmament.accesswidener
index 8e7dbab..cfa8e90 100644
--- a/src/main/resources/firmament.accesswidener
+++ b/src/main/resources/firmament.accesswidener
@@ -3,6 +3,7 @@ accessible class net/minecraft/client/render/RenderLayer$MultiPhase
 accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
 accessible class net/minecraft/client/font/TextRenderer$Drawer
 accessible field net/minecraft/client/gui/hud/InGameHud SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator;
+accessible field net/minecraft/client/network/ClientPlayNetworkHandler combinedDynamicRegistries Lnet/minecraft/registry/DynamicRegistryManager$Immutable;
 
 accessible field net/minecraft/client/render/item/HeldItemRenderer itemRenderer Lnet/minecraft/client/render/item/ItemRenderer;
 accessible field net/minecraft/client/render/item/ItemModels missingModelSupplier Ljava/util/function/Supplier;