Rest of "a big technical change"

- Moved commands to Kotlin and used BrigadierX library to organize the codes.

Author: Taskeren

build.gradle

@@ -45,6 +45,10 @@ dependencies {
 	def calcLib = "com.github.octocynth:calculator-lib:8c69c67b0e"
 	implementation calcLib
 	include calcLib
+
+	var brigadierX = "com.github.taskeren:brigadierX:${brigadier_x_version}"
+	implementation brigadierX
+	include brigadierX
 }
 
 base {

gradle.properties

@@ -24,3 +24,4 @@ fabric_kotlin_version=1.10.16+kotlin.1.9.21
 kotlin_version=1.9.21
 cloth_config_version=13.0.114
 modmenu_version=9.0.0
+brigadier_x_version=1.3.2

src/main/java/cn/taskeren/minequery/command/CmdCalculator.java

@@ -1,8 +1,8 @@
 package cn.taskeren.minequery
 
-import cn.taskeren.minequery.command.CmdCalculator
-import cn.taskeren.minequery.command.CmdKey2CmdSettings
-import cn.taskeren.minequery.command.CmdLocationCalc
+import cn.taskeren.minequery.command.CommandCalculator
+import cn.taskeren.minequery.command.CommandKey2CommandSettings
+import cn.taskeren.minequery.command.CommandLocationCalculator
 import cn.taskeren.minequery.config.MineQueryConfig
 import cn.taskeren.minequery.features.*
 import me.shedaniel.autoconfig.AutoConfig
@@ -48,9 +48,9 @@ object MineQuery : ClientModInitializer {
 
 		// register commands
 		ClientCommandRegistrationCallback.EVENT.register { dispatcher, _ ->
-			dispatcher.register(CmdCalculator.getBuilder())
-			dispatcher.register(CmdLocationCalc.getBuilder())
-			dispatcher.register(CmdKey2CmdSettings.getBuilder())
+			dispatcher.register(CommandCalculator)
+			dispatcher.register(CommandLocationCalculator)
+			dispatcher.register(CommandKey2CommandSettings)
 		}
 	}
 

src/main/java/cn/taskeren/minequery/command/CmdKey2CmdSettings.java

@@ -0,0 +1,31 @@
+package cn.taskeren.minequery.command
+
+import cn.taskeren.brigadierx.argument
+import cn.taskeren.brigadierx.executesX
+import cn.taskeren.brigadierx.newLiteralArgBuilder
+import com.mojang.brigadier.arguments.StringArgumentType
+import io.github.endreman0.calculator.Calculator
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+import net.minecraft.text.Text
+import net.minecraft.util.Formatting
+
+private const val KEY_EQUATION = "equation"
+
+internal val CommandCalculator = newLiteralArgBuilder<FabricClientCommandSource>("=") {
+	argument(KEY_EQUATION, StringArgumentType.greedyString()) {
+		executesX { ctx ->
+			val equation = StringArgumentType.getString(ctx, KEY_EQUATION)
+			val feedback = runCatching {
+				val type = Calculator.calculate(equation)
+				Text.translatable(
+					"text.minequery.calculator.done", "${Formatting.GRAY}$equation", "${Formatting.GREEN}${type}"
+				)
+			}.getOrElse {
+				Text.translatable(
+					"text.minequery.calculator.error", "${Formatting.RED}${Formatting.ITALIC}${it.message}"
+				)
+			}
+			ctx.source.sendFeedback(feedback)
+		}
+	}
+}

src/main/java/cn/taskeren/minequery/command/CmdLocationCalc.java

@@ -0,0 +1,18 @@
+package cn.taskeren.minequery.command
+
+import cn.taskeren.brigadierx.executesX
+import cn.taskeren.brigadierx.newLiteralArgBuilder
+import cn.taskeren.minequery.gui.Key2CommandSettingScreen
+import com.mojang.brigadier.Command
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+
+internal val CommandKey2CommandSettings = newLiteralArgBuilder<FabricClientCommandSource>("key2cmd") {
+	executesX {
+		// according to https://www.reddit.com/r/fabricmc/comments/w165i1/changing_the_clients_screen_from_a_command_help/
+		// any screen will be closed after command execution, so I need to open the screen after the end of the command.
+		it.source.client.send {
+			Key2CommandSettingScreen.show()
+		}
+		Command.SINGLE_SUCCESS
+	}
+}

src/main/kotlin/cn/taskeren/minequery/MineQuery.kt

@@ -0,0 +1,38 @@
+package cn.taskeren.minequery.command
+
+import cn.taskeren.brigadierx.argument
+import cn.taskeren.brigadierx.executesX
+import cn.taskeren.brigadierx.literal
+import cn.taskeren.brigadierx.newLiteralArgBuilder
+import cn.taskeren.minequery.command.client_pos.ClientPosArgumentType
+import com.mojang.brigadier.Command
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+import net.minecraft.text.Text
+import kotlin.math.floor
+
+internal val CommandLocationCalculator =
+	newLiteralArgBuilder<FabricClientCommandSource>("localc") {
+		literal("toNether") {
+			argument("location", ClientPosArgumentType.columnPos()) {
+				executes {
+					val pos = ClientPosArgumentType.getColumnPos(it, "location")
+					val x = floor(pos.x.toDouble() / 8)
+					val z = floor(pos.z.toDouble() / 8)
+					it.source.sendFeedback(Text.translatable("text.minequery.localc.to_nether", x, z))
+					Command.SINGLE_SUCCESS
+				}
+			}
+		}
+
+		literal("toOverworld") {
+			argument("location", ClientPosArgumentType.columnPos()) {
+				executesX {
+					val pos = ClientPosArgumentType.getColumnPos(it, "location")
+					val x = floor(pos.x.toDouble() * 8)
+					val z = floor(pos.z.toDouble() * 8)
+					it.source.sendFeedback(Text.translatable("text.minequery.localc.to_overworld", x, z))
+					Command.SINGLE_SUCCESS
+				}
+			}
+		}
+	}