v1.2.1

- fix current datapack text in datapack selection screen

Author: justorl

build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_api_version")}")
 
     modCompileOnly("com.github.Tectato:BetterCommandBlockUI:1.20-SNAPSHOT")
-    modImplementation(include("xyz.meowing:vexel-1.20.1-fabric:105")!!)
+    modImplementation(include("xyz.meowing:vexel-1.20.1-fabric:121")!!)
 }
 
 tasks {

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.2.0
+mod_version=1.2.1
 
 org.gradle.jvmargs=-Xmx4000m

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

@@ -66,7 +66,7 @@ class DatapackSelectionScreen(val parent: Screen? = null) : Screen(Text.translat
             textRenderer,
             Text.translatable("gui.datapacktools.datapack_selection.current", current),
             width / 2,
-            height / 2 - 60,
+            height / 2 - 20,
             Colors.GRAY
         )
 

src/main/kotlin/com/pulse/datapacktools/client/screen/vexel/CodeEditor.kt

@@ -86,8 +86,8 @@ class CodeEditor(
     private var lastClickTime = 0L
     private var clickCount = 0
     var isLoaded = false
+
     var hasUnsavedChanges = false
-    
     var onUnsavedChanges: ((Boolean) -> Unit)? = null
 
     private val lineNumberWidth: Float = 50f
@@ -182,7 +182,7 @@ class CodeEditor(
 
                 lastClickTime = currentTime
 
-				when (clickCount) {
+                when (clickCount) {
                     1 -> {
                         cursorLine = clickedLine
                         cursorCol = clickedCol
@@ -201,7 +201,7 @@ class CodeEditor(
                 }
 
                 resetCaretBlink()
-				commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return@onClick true
             } else {
                 isFocused = false
@@ -450,62 +450,62 @@ class CodeEditor(
             return true
         }
 
-            when (keyCode) {
+        when (keyCode) {
             KnitKeys.KEY_ESCAPE.code -> {
                 isFocused = false
                 return true
             }
             KnitKeys.KEY_ENTER.code -> {
                 saveState()
                 insertText("\n")
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_TAB.code -> {
                 saveState()
                 insertText("    ")
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_BACKSPACE.code -> {
                 saveState()
                 if (ctrlDown) deletePrevWord()
                 else deleteChar()
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_LEFT.code -> {
                 if (ctrlDown) moveWord(-1, shiftDown)
                 else moveCaret(-1, 0, shiftDown)
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_RIGHT.code -> {
                 if (ctrlDown) moveWord(1, shiftDown)
                 else moveCaret(1, 0, shiftDown)
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_UP.code -> {
                 moveCaret(0, -1, shiftDown)
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_DOWN.code -> {
                 moveCaret(0, 1, shiftDown)
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_HOME.code -> {
                 if (ctrlDown) moveCaretTo(0, 0, shiftDown)
                 else moveCaretTo(cursorLine, 0, shiftDown)
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
             KnitKeys.KEY_END.code -> {
                 if (ctrlDown) moveCaretTo(lines.size - 1, lines.last().length, shiftDown)
                 else moveCaretTo(cursorLine, lines[cursorLine].length, shiftDown)
-                    commandSuggester.refresh(lines[cursorLine], cursorCol)
+                commandSuggester.refresh(lines[cursorLine], cursorCol)
                 return true
             }
         }
@@ -725,7 +725,6 @@ class CodeEditor(
             selectionAnchorCol = cursorCol
         }
         resetCaretBlink()
-        
         commandSuggester.refresh(lines[cursorLine], cursorCol)
     }
 
@@ -967,5 +966,4 @@ class CodeEditor(
             onUnsavedChanges?.invoke(false)
         }
     }
-
 }

src/main/resources/assets/datapacktools/lang/en_us.json

@@ -3,6 +3,7 @@
   "gui.datapacktools.datapack_selection.screen_title": "Select datapack for editing",
   "gui.datapacktools.datapack_selection.subtitle": "Select datapack, that you will edit",
   "gui.datapacktools.datapack_selection.empty": "Datapacks were not found",
+  "gui.datapacktools.datapack_selection.current": "Currently selected: %s",
   "gui.datapacktools.namespace_selection.screen_title": "Select datapack for editing",
   "gui.datapacktools.namespace_selection.subtitle": "Choose namespace of datapack %s",
   "gui.datapacktools.namespace_selection.empty": "Namespaces were not found",

src/main/resources/assets/datapacktools/lang/ru_ru.json

@@ -3,6 +3,7 @@
   "gui.datapacktools.datapack_selection.screen_title": "Установить редактируемый датапак",
   "gui.datapacktools.datapack_selection.subtitle": "Выберите датапак, который вы будете редактировать",
   "gui.datapacktools.datapack_selection.empty": "Датапаки были не найдены",
+  "gui.datapacktools.datapack_selection.current": "Сейчас выбрано: %s",
   "gui.datapacktools.namespace_selection.screen_title": "Установить редактируемый датапак",
   "gui.datapacktools.namespace_selection.subtitle": "Выберите неймспейс в датапаке %s",
   "gui.datapacktools.namespace_selection.empty": "Неймспейсы не найдены",