Merge branch 'lambda-client:master' into master

Author: Blade-ua

.github/workflows/nightly_build.yml

@@ -97,4 +97,4 @@ jobs:
         if: steps.branch-name.outputs.is_default == 'true'
         run: |
           COMMITMESSAGE=`git log --pretty=format:'- \`%h\` %s' -5 --reverse` &&
-          (curl "$WEBHOOK" -sS -H "Content-Type:application/json" -X POST -d "{\"content\":null,\"embeds\":[{\"title\":\"Build $BUILD\",\"description\":\"**Branch:** ${{steps.branch-name.outputs.current_branch}}\\n**Changes:**\\n$COMMITMESSAGE\",\"url\":\"https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID\",\"color\":1487872,\"fields\":[{\"name\":\"Artifacts:\",\"value\":\"- [lambda-$BUILD.zip](https://nightly.link/$GITHUB_REPOSITORY/workflows/nightly_build.yml/$BRANCH_NAME/lambda-$BUILD.zip)\"}],\"footer\":{\"text\":\"$GITHUB_REPOSITORY\"},\"thumbnail\":{\"url\":\"https://raw.githubusercontent.com/lambda-client/lambda/master/src/main/resources/assets/minecraft/lambda/lambda_map.png\"}}],\"username\":\"Github Actions\",\"avatar_url\":\"https://www.2b2t.com.au/assets/github.jpeg\"}")
+          (curl "$WEBHOOK" -sS -H "Content-Type:application/json" -X POST -d "{\"content\":null,\"embeds\":[{\"title\":\"Build $BUILD\",\"description\":\"**Branch:** ${{ steps.branch-name.outputs.current_branch }}\\n**Changes:**\\n$COMMITMESSAGE\",\"url\":\"https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID\",\"color\":1487872,\"fields\":[{\"name\":\"Artifacts:\",\"value\":\"- [lambda-$BUILD.zip](https://nightly.link/$GITHUB_REPOSITORY/workflows/nightly_build.yml/${{ steps.branch-name.outputs.current_branch }}/lambda-$BUILD.zip)\"}],\"footer\":{\"text\":\"$GITHUB_REPOSITORY\"},\"thumbnail\":{\"url\":\"https://raw.githubusercontent.com/lambda-client/lambda/master/src/main/resources/assets/minecraft/lambda/lambda_map.png\"}}],\"username\":\"Github Actions\",\"avatar_url\":\"https://www.2b2t.com.au/assets/github.jpeg\"}")

build.gradle

@@ -186,6 +186,10 @@ shadowJar {
             'kotlin/**/*.kotlin_metadata',
             'kotlin/**/*.kotlin_builtins',
             'META-INF/*.version'
+    minimize {
+        exclude(dependency('cabaletta:baritone-api:.*'))
+        exclude(dependency('org.spongepowered:mixin:.*'))
+    }
     configurations = [project.configurations.jarLibs, project.configurations.onlyJarLibs]
     relocate 'kotlin', 'com.lambda.shadow.kotlin'
     relocate 'kotlinx', 'com.lambda.shadow.kotlinx'

src/main/kotlin/com/lambda/client/gui/hudgui/elements/world/Coordinates.kt

@@ -37,12 +37,12 @@ internal object Coordinates : LabelHud(
         if (showNetherOverworld) {
             when (world.provider.dimension) {
                 -1 -> { // Nether
-                    if (printDimensionName) displayText.add("Nether", secondaryColor)
+                    if (printDimensionName) displayText.add("Overworld", secondaryColor)
                     displayText.add(getFormattedCoords(entity.positionVector * netherToOverworld, true))
                 }
                 0 -> { // Overworld
                     if (printDimensionName)
-                        displayText.add("Overworld", secondaryColor)
+                        displayText.add("Nether", secondaryColor)
                     displayText.add(getFormattedCoords(entity.positionVector * overworldToNether, true))
                 }
             }

src/main/kotlin/com/lambda/client/module/modules/misc/MapDownloader.kt

@@ -46,6 +46,7 @@ internal object MapDownloader : Module(
     private var pendingTasks = mutableSetOf<MapInfo>()
     private val secTimer = TickTimer(TimeUnit.SECONDS)
     private val milliSecTimer = TickTimer(TimeUnit.MILLISECONDS)
+    private val illegalFilenameCharsRegex = "[^a-zA-Z0-9\\.\\-]".toRegex() // https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file
 
     init {
         existingHashes = getExistingHashes()
@@ -159,7 +160,11 @@ internal object MapDownloader : Module(
         try {
             val resized = BufferedImage(finalSize, finalSize, img.type)
             val g = resized.createGraphics()
-            val loc = "${FolderUtils.mapImagesFolder}${mapInfo.hash}_name_${mapInfo.name.replace(File.separator, "")}_id_${mapInfo.id}_${if (mc.isIntegratedServerRunning) "local" else "server_${player.connection.networkManager.remoteAddress.toString().replace("/", "_").replace(":", "_")}"}.png"
+            val loc = "${FolderUtils.mapImagesFolder}${mapInfo.hash}" +
+                "_name_${mapInfo.name.replace(illegalFilenameCharsRegex, "_")}" +
+                "_id_${mapInfo.id}" +
+                "_${if (mc.isIntegratedServerRunning) "local" 
+                    else "server_${player.connection.networkManager.remoteAddress.toString().replace("/", "_").replace(":", "_")}"}.png"
             g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
                 RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR)
             g.drawImage(img, 0, 0, finalSize, finalSize, 0, 0, img.width,

src/main/resources/mcmod.info

@@ -8,17 +8,17 @@
     "url": "https://github.com/lambda-client/lambda",
     "updateUrl": "",
     "authorList": [
-      "Constructor#9948",
-      "huddy987#5085",
-      "cz#6171",
-      "ToxicAven#3678",
-      "Nep Nep#3025",
-      "scorbett123#5313",
-      "hlsl#1315",
-      "ItCameFr0mMars#6559",
-      "romtec#6969",
-      "Save___G#4444",
-      "EnigmA_008#1505"
+      "@_constructor",
+      "@huddy987",
+      "@czho_",
+      "@toxicaven",
+      "@nepnepcat",
+      "@scorbett",
+      "@hlsl.",
+      "@itcamefr0mmars",
+      "@romtec",
+      "@save_g",
+      "@enigma_008"
     ],
     "credits": "Thanks to 086 for the original KAMI\nThanks to the team of KAMI Blue\nSpecial thanks to all contributors",
     "logoFile": "lambda.png",