feat: /blueprint-editor save <custom id>

mcbrawls · Jan 15, 2025 · 6f9d86d · 6f9d86d
1 parent f460608
commit 6f9d86d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_build=8
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.14.8
+mod_version=1.14.9
 maven_group=net.mcbrawls
 mod_id=blueprint
 

diff --git a/src/main/kotlin/net/mcbrawls/blueprint/command/BlueprintEditorCommand.kt b/src/main/kotlin/net/mcbrawls/blueprint/command/BlueprintEditorCommand.kt
@@ -14,6 +14,8 @@ import net.minecraft.text.Text
 
 object BlueprintEditorCommand {
     const val BLUEPRINT_KEY = "blueprint"
+    const val BLUEPRINT_ID_KEY = "blueprint_id"
+
     private val NOT_BLUEPRINT_EDITOR_WORLD_EXCEPTION = SimpleCommandExceptionType(Text.literal("You are not in a Blueprint editor."))
     private val IN_BLUEPRINT_EDITOR_WORLD_EXCEPTION = SimpleCommandExceptionType(Text.literal("You are already in a Blueprint editor. Use /blueprint-editor close to leave."))
 
@@ -36,6 +38,11 @@ object BlueprintEditorCommand {
                 .then(
                     literal("save")
                         .executes(::executeSave)
+                        .then(
+                            argument(BLUEPRINT_ID_KEY, IdentifierArgumentType.identifier())
+                                .suggests { _, suggestions -> BlueprintManager.suggestBlueprints(suggestions) }
+                                .executes(::executeSave)
+                        )
                 )
         )
     }
@@ -68,10 +75,19 @@ object BlueprintEditorCommand {
     }
 
     private fun executeSave(context: CommandContext<ServerCommandSource>): Int {
+        val customBlueprintId = runCatching {
+            IdentifierArgumentType.getIdentifier(context, BLUEPRINT_ID_KEY)
+        }.getOrNull()
+
         val source = context.source
-        val world = source.world as? BlueprintEditorWorld ?: throw NOT_BLUEPRINT_EDITOR_WORLD_EXCEPTION.create()
-        val pathString = world.saveBlueprint()
-        source.sendFeedback({ Text.literal("Saved editor blueprint: \"$pathString\"") }, true)
+        if (customBlueprintId != null) {
+            source.sendFeedback({ Text.literal("Saved editor blueprint as \"$customBlueprintId\"") }, true)
+        } else {
+            val world = source.world as? BlueprintEditorWorld ?: throw NOT_BLUEPRINT_EDITOR_WORLD_EXCEPTION.create()
+            val pathString = world.saveBlueprint()
+            source.sendFeedback({ Text.literal("Saved editor blueprint: \"$pathString\"") }, true)
+        }
+
         return 1
     }
 }