Merge branch 'v7' of https://github.com/mindustry-antigrief/mindustry…

…-client into foo-v7

.github/workflows/pr.yml

@@ -32,4 +32,4 @@ jobs:
 
       - name: Run Tests
         if: ${{ always() }}
-        run: ./gradlew test
+        run: ./gradlew tests:test

build.gradle

@@ -1,9 +1,7 @@
 import arc.struct.StringMap
 import arc.util.io.PropertiesUtils
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 buildscript{
     ext{
@@ -322,12 +320,9 @@ project(":core"){
         }
     }
 
-    tasks.withType(KotlinCompile).configureEach {
-        compilerOptions {
-            freeCompilerArgs.add("-Xjdk-release=1.8")
-            jvmTarget.set(JvmTarget.JVM_1_8)
-            languageVersion = KotlinVersion.KOTLIN_1_9
-        }
+    kotlin.compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+        freeCompilerArgs.add("-Xjdk-release=1.8")
     }
 
     tasks.withType(KaptWithoutKotlincTask.class).configureEach {
@@ -413,7 +408,7 @@ project(":server"){
 }
 
 project(":tests"){
-    apply plugin: "java"
+    apply plugin: "kotlin"
 
     dependencies{
         testImplementation project(":core")
@@ -437,6 +432,11 @@ project(":tests"){
             showStandardStreams = true
         }
     }
+
+    kotlin.compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+        freeCompilerArgs.add("-Xjdk-release=1.8")
+    }
 }
 
 project(":tools"){

core/assets/bundles/bundle.properties

@@ -120,8 +120,14 @@ client.command.help.description = Lists all client commands
 client.command.unit.description = Swap to specified unit
 client.command.unitcursor.description = Swap to closest specified unit to cursor
 client.command.count.description = Counts how many of a certain unit are alive
+client.command.count.success = [accent]{0}:\
+  Total(Cap): {1}({2})\
+  Free(Free Flagged): {3}({4})\
+  Flagged(Unflagged): {5}({6})\
+  Players(Command): {7}({8})\
+  Logic(Logic Flagged): {9}({10})
 client.command.coordsinvalid = [scarlet]Invalid coordinates, format is [x] [y] Eg: "{0} 10 300" or "{0}"
-client.command.spawn.description = Spawns unit(s) at the specified position
+client.command.spawn.description = Spawns unit(s) at the specified position. Set the team to "me" to spawn on your team, x and y can be set to "c" to spawn on cursor
 client.command.go.description = Navigates to (x, y) or the last coordinates posted to chat
 client.command.lookat.description = Moves camera to (x, y) or the last coordinates posted to chat
 client.command.tp.description = Teleports to (x, y) or the last coordinates posted to chat. Only works on servers without strict mode enabled
@@ -281,8 +287,21 @@ client.schematic.browser.fail.fetch = Failed to fetch {0}
 client.schematic.browser.fail.parse = Failed to parse {0} {1}
 client.schematic.browser.togglevisibility = Toggle visibility
 client.schematic.browser.tagged = {0}/{1} tagged
+client.schematic.chatshare = Share in chat
+client.schematic.chatsharemessage = {0} [white]has shared a schematic. Click here to download.
+
+client.mod.clientblacklisted = [red]Mod not compatible (or not needed) with Foo's Client
+client.mod.clientblacklisted.details = This mod is incompatible or redundant when used with Foo's client.
+client.mod.autoupdate = Allow Auto Updates
+client.mod.massupdate = Allow Mass Updates (Update Active Mods)
+
+client.mods.updateactive = Update Active Mods
+
+client.settings.unbind = Unbind
+client.settings.search.disabled.tooltip = [scarlet]Search disabled due to mod adding improper setting to list. Search logs for "disabling search bar"
+client.settings.search.disabled.log.add = Mod added an invalid setting to SettingsTable, disabling search bar for said table:\n{0}
+client.settings.search.disabled.log.row = Mod added an unexpected row to SettingsTable, disabling search bar for said table due to likely invalid settings:\n{0}
 
-settings.unbindKey = Unbind
 
 credits.text = Created by [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Credits
@@ -349,7 +368,6 @@ schematic.replace = A schematic by that name already exists. Replace it?
 schematic.exists = A schematic by that name already exists.
 schematic.import = Import Schematic...
 schematic.exportfile = Export File
-schematic.chatshare = Share in chat
 schematic.importfile = Import File
 schematic.browseworkshop = Browse Workshop
 schematic.copy = Copy to Clipboard
@@ -370,7 +388,6 @@ schematic.renametag = Rename Tag
 schematic.tagged = {0} tagged
 schematic.tagdelconfirm = Delete this tag completely?
 schematic.tagexists = That tag already exists.
-schematic.chatsharemessage = {0} [white]has shared a schematic. Click here to download.
 
 stats = Stats
 stats.wave = Waves Defeated
@@ -424,7 +441,6 @@ mods.none = [lightgray]No mods found!
 mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Folder
-mods.updateactive = Update Active Mods
 mods.viewcontent = View Content
 mods.reload = Reload
 mods.reloadexit = The game will now exit, to reload mods.
@@ -441,7 +457,6 @@ mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.incompatiblegame = [red]Outdated Game
 mod.incompatiblemod = [red]Incompatible
 mod.blacklisted = [red]Unsupported
-mod.clientblacklisted = [red]Mod not compatible (or not needed) with Foo's Client
 mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [red]Content Errors
 mod.circulardependencies = [red]Circular Dependencies
@@ -450,7 +465,6 @@ mod.requiresversion = [scarlet]Requires min game version: [accent]{0}
 mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
 mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
 mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
-mod.clientblacklisted.details = This mod is incompatible or redundant when used with Foo's client.
 mod.missingdependencies.details = This mod is missing dependencies: {0}
 mod.erroredcontent.details = This mod caused errors when loading. Ask the mod author to fix them.
 mod.circulardependencies.details = This mod has dependencies that depends on each other.
@@ -1512,19 +1526,21 @@ setting.showtoasts.description = Disables the showing of toasts. Useful to stop
 setting.unloaderview.name = Show Unloader Transfers
 setting.customnullunloader.name = Colored Null Loaders
 setting.cursednesslevel.name = Cursedness Level
-setting.cursednesslevel.description = EPILEPSY WARNING ANYTHING ABOVE OHNO
+setting.cursednesslevel.description = [scarlet]EPILEPSY WARNING ANYTHING ABOVE OHNO
 setting.showcutscenes.name = Show Cutscenes
 setting.logiclinkorder.name = Free Logic Link Names Upon Link Removal
 setting.powerinfo.name = Power Info
 setting.powerinfo.description = Shows power info of the largest network in the top left pane. Requires restart to take effect.
-setting.activemodesdisplay.name = Active Modes Diplay
+setting.activemodesdisplay.name = Active Modes Display
 setting.activemodesdisplay.description = Shows information about whether things are enabled (such as showing turret ranges, hiding fog, hiding air units, navigating, etc) in the top left pane.
-setting.useiconslogs.name = Use icons in logs
+setting.useiconslogs.name = Use Icons In Tile Logs
 setting.useiconslogs.description = Use icons instead of text
-setting.colorizelogs.name = Colorize logs
+setting.colorizelogs.name = Colorize Tile Logs
 setting.colorizelogs.description = Add some color to your log events
-setting.showmassdriverdistance.name = Show mass driver distance
+setting.showmassdriverdistance.name = Show Mass Driver Distance
 setting.showmassdriverdistance.description = Shows distance between two linked mass drivers
+setting.enableunderwaterenv.name = Enable Underwater Environment Rendering
+setting.enableunderwaterenv.description = Allows maps to cover the screen in a distracting "water" filter
 
 setting.misc.category = Miscellaneous
 setting.keybind1shiftcommand.name = Keybind+Shift Command