Merge pull request #5981 from rjhancock/mechwarrior-class-rename

Mech -> Mek updates.

.github/workflows/validate-namechanges.yml

@@ -5,15 +5,15 @@ on:
     branches: [master]
     paths:
       # Necessary when the name_changes.txt list is updated or any unit file.
-      - "megamek/data/mechfiles/**.blk"
-      - "megamek/data/mechfiles/**.mtf"
-      - "megamek/data/mechfiles/name_changes.txt"
+      - "megamek/data/mekfiles/**.blk"
+      - "megamek/data/mekfiles/**.mtf"
+      - "megamek/data/mekfiles/name_changes.txt"
   pull_request:
     branches: [master]
     paths:
-      - "megamek/data/mechfiles/**.blk"
-      - "megamek/data/mechfiles/**.mtf"
-      - "megamek/data/mechfiles/name_changes.txt"
+      - "megamek/data/mekfiles/**.blk"
+      - "megamek/data/mekfiles/**.mtf"
+      - "megamek/data/mekfiles/name_changes.txt"
 
 env:
   GRADLE_OPTS: "-Dscan.link.VCS=${{ github.event.pull_request.html_url }}"

.gitignore

@@ -63,11 +63,11 @@ megamek/userdata/**
 /megamek/data/recordsheets/
 /megamek/data/splash/
 
-# mechfiles
-/megamek/data/mechfiles/units.cache
-/megamek/data/mechfiles/IrTech/
-/megamek/data/mechfiles/Special/
-/megamek/data/mechfiles/customs/
+# mekfiles
+/megamek/data/mekfiles/units.cache
+/megamek/data/mekfiles/IrTech/
+/megamek/data/mekfiles/Special/
+/megamek/data/mekfiles/customs/
 
 # Images
 /megamek/data/images/*_atlas.png

.mailmap

@@ -1,5 +1,5 @@
 Akjosch <[email protected]> Akjosch <[email protected]>
-arlith <[email protected]> Nicholas Walczak <[email protected]> 
+arlith <[email protected]> Nicholas Walczak <[email protected]>
 arlith <[email protected]> arlith <[email protected]>
 arlith <[email protected]> <[email protected]>
 beerockxs <[email protected]> Sebastian Brocks <[email protected]>
@@ -14,7 +14,7 @@ Dylan Myers <[email protected]> Dylan Myers <dylan.myers@bluemedo
 Hammer-GS <[email protected]> Dave N <[email protected]>
 Hammer-GS <[email protected]> Hammer-GS <[email protected]>
 Hammer-GS <[email protected]> HammerGS <[email protected]>
-Hammer-GS <[email protected]> Hammer <[email protected]> 
+Hammer-GS <[email protected]> Hammer <[email protected]>
 Hammer-GS <[email protected]> Hammer-GS <[email protected]>
 Hammer-GS <[email protected]> Hammer-GS <[email protected]>
 Hammer-GS <[email protected]> drivi <drivi@DESKTOP-T0L0AGJ>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

megamek/build.gradle

@@ -36,25 +36,25 @@ sourceSets {
 dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2'
-    implementation 'com.formdev:flatlaf:3.5'
-    implementation 'com.formdev:flatlaf-extras:3.5'
+    implementation 'com.formdev:flatlaf:3.5.1'
+    implementation 'com.formdev:flatlaf-extras:3.5.1'
     implementation 'com.sun.mail:jakarta.mail:2.0.1'
     implementation 'com.thoughtworks.xstream:xstream:1.4.20'
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
     implementation 'org.apache.commons:commons-collections4:4.5.0-M2'
-    implementation 'org.apache.commons:commons-lang3:3.15.0'
+    implementation 'org.apache.commons:commons-lang3:3.17.0'
     implementation 'org.apache.commons:commons-text:1.12.0'
-    implementation 'org.apache.logging.log4j:log4j-api:2.23.1'
-    implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
+    implementation 'org.apache.logging.log4j:log4j-api:2.24.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.24.0'
     implementation 'org.freemarker:freemarker:2.3.33'
     implementation 'org.commonmark:commonmark:0.22.0'
 
     runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
-    testImplementation 'org.mockito:mockito-core:5.12.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
+    testImplementation 'org.mockito:mockito-core:5.13.0'
 }
 
 application {
@@ -71,7 +71,7 @@ ext {
         '-Dsun.awt.disablegrab=true'
     ]
     data = 'data'
-    unitFiles = "${data}/mechfiles"
+    unitFiles = "${data}/mekfiles"
     rats = "${data}/rat"
     docs = "docs"
     lib = "lib"
@@ -359,7 +359,7 @@ task mechCacheCSVTool(type: JavaExec, dependsOn: jar) {
     description = 'Icon Tool'
     group = 'utility'
     classpath = sourceSets.main.runtimeClasspath
-    mainClass = 'megamek.utilities.MechCacheCSVTool'
+    mainClass = 'megamek.utilities.MekCacheCSVTool'
 }
 
 task nameChangesValidator(type: JavaExec, dependsOn: jar) {

megamek/data/fonts/btclassic/readme.txt

@@ -2,7 +2,7 @@ Fontname: Battletech Oldstyle
 Created by: Jason M. Knight (aka Deathshadow)
 http://www.classicbattletech.com/truetype/bt_oldstyle.zip
 
-This file contains a recreation of the fonts used in the Classic Battletech Logo on products from 1984 to 1991. Upper and Lower case letters are identical except for the letter R, which appears differently on the Battleforce products than it does on the others. The lower case R is that used on Battleforce, while the upper case version is that used on Mechwarrior and Succession Wars.
+This file contains a recreation of the fonts used in the Classic Battletech Logo on products from 1984 to 1991. Upper and Lower case letters are identical except for the letter R, which appears differently on the Battleforce products than it does on the others. The lower case R is that used on Battleforce, while the upper case version is that used on Mekwarrior and Succession Wars.
 
 Additionally, the following 5 wingdings are available: