v1.1.2

save func name in export screen
overwriting functions + new cfg key
convert folder support

Author: justorl

gradle.properties

@@ -7,6 +7,6 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.16.9
 fabric_kotlin_version=1.13.6+kotlin.2.2.20
 fabric_api_version=0.90.0+1.20.1
-mod_version=1.1.1
+mod_version=1.1.2
 
 org.gradle.jvmargs=-Xmx4000m

src/main/kotlin/com/pulse/datapacktools/client/keybindings/ExportKeybinding.kt

@@ -2,11 +2,9 @@ package com.pulse.datapacktools.client.keybindings
 
 import com.pulse.datapacktools.client.screen.ExportFunctionScreen
 import com.pulse.datapacktools.client.util.PlayerUtil.getCommandBlockInFront
-import com.pulse.datapacktools.main.utils.ExtensionsUtil.getTargetBlock
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
 import net.minecraft.client.MinecraftClient
-import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen
 import net.minecraft.client.option.KeyBinding
 import net.minecraft.client.util.InputUtil
 import org.lwjgl.glfw.GLFW

src/main/kotlin/com/pulse/datapacktools/client/screen/ExportFunctionScreen.kt

@@ -11,6 +11,10 @@ import net.minecraft.text.Text
 import net.minecraft.util.Colors
 
 class ExportFunctionScreen() : Screen(Text.translatable("gui.datapacktools.export.screen_title")) {
+    companion object {
+        var lastFunctionName: String = ""
+    }
+
     private lateinit var functionNameField: TextFieldWidget
     private lateinit var exportButton: ButtonWidget
     private lateinit var cancelButton: ButtonWidget
@@ -28,6 +32,7 @@ class ExportFunctionScreen() : Screen(Text.translatable("gui.datapacktools.expor
             Text.of("Function Name")
         )
         functionNameField.setMaxLength(16)
+        functionNameField.text = lastFunctionName
 
         changeCommandCheckBox = CheckboxWidget(
             width / 2 - 100,
@@ -88,4 +93,9 @@ class ExportFunctionScreen() : Screen(Text.translatable("gui.datapacktools.expor
         functionNameField.tick()
         exportButton.active = functionNameField.text.isNotBlank()
     }
+
+    override fun close() {
+        lastFunctionName = functionNameField.text
+        super.close()
+    }
 }

src/main/kotlin/com/pulse/datapacktools/main/config/ConfigData.kt

@@ -2,6 +2,7 @@ package com.pulse.datapacktools.main.config
 
 class ConfigData {
     var enableAutomaticDatapackReload = true
+    var enableWritingInExistingFunctions = true
     var datapackNamespace = "datapacktools"
     var datapackName = "datapacktools"
 }

src/main/kotlin/com/pulse/datapacktools/main/packets/ConvertPacket.kt

@@ -44,11 +44,18 @@ object ConvertPacket {
         val worldDir: File = SessionUtils.worldFolderPath?.toFile() ?: return
         val commandList = mutableListOf<String>()
         createDefaultDatapack(worldDir)
+
         val functionsDir = File(worldDir, "datapacks/${ModConfig.data.datapackName}/data/${ModConfig.data.datapackNamespace}/functions")
+        val functionDir = File(functionsDir, functionName.substringBeforeLast('/'))
+        val functionFile = File(functionsDir, "${functionName}.mcfunction")
 
-        if (File(functionsDir, "${functionName}.mcfunction").exists()) {
-            player.sendMessage(Text.translatable("message.datapacktools.convert.fail.already_exists").formatted(Formatting.RED))
-            return
+        if (functionFile.exists()) {
+            if (!ModConfig.data.enableWritingInExistingFunctions) {
+                functionFile.readLines().forEach { commandList.add(it) }
+            } else {
+                player.sendMessage(Text.translatable("message.datapacktools.convert.fail.already_exists").formatted(Formatting.RED))
+                return
+            }
         }
 
         val pos: BlockPos = player.getTargetBlock()?.blockPos ?: return
@@ -68,9 +75,8 @@ object ConvertPacket {
             }
         }
 
-        File(functionsDir, "${functionName}.mcfunction").apply {
-            writeText(commandList.joinToString("\n"))
-        }
+        if (!functionDir.exists()) functionDir.mkdirs()
+        functionFile.writeText(commandList.joinToString("\n"))
 
         updateDatapack(player)