Merge branch 'master' into personalitiesTheyThemSupport

Author: IllianiBird

.editorconfig

@@ -7,13 +7,13 @@ indent_size = 4
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
-max_line_length = 140 # Google Style Guide
+max_line_length = 120
 curly_bracket_next_line = false
 spaces_around_operators = true
 spaces_around_brackets = "both"
 indent_brace_style = "K&R"
 wildcard_import_limit = 10
-continuation_indent_size = 4 # Google Style Guid
+continuation_indent_size = 6
 
 [*.xml]
 indent_style = "space"

.github/workflows/javadoc.yml .github/workflows/java-doc-pr.yml.github/workflows/javadoc.yml renamed to .github/workflows/java-doc-pr.yml

@@ -9,21 +9,14 @@ env:
 
 jobs:
   javadoc:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     outputs:
       mmRepo: ${{ steps.find_mm.outputs.mmRepo }}
       mmBranch: ${{ steps.find_mm.outputs.mmBranch }}
       mmlRepo: ${{ steps.find_mml.outputs.mmRepo }}
       mmlBranch: ${{ steps.find_mml.outputs.mmBranch }}
 
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        java-distribution: [temurin]
-        java-version: [17]
-      fail-fast: false
-
     steps:
       - name: Checkout out MekHQ
         uses: actions/checkout@v4
@@ -74,11 +67,11 @@ jobs:
           ref: ${{ steps.find_mml.outputs.mmlBranch }}
           path: megameklab
 
-      - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
+      - name: Set up Temurin JDK 17
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ matrix.java-distribution }}
-          java-version: ${{ matrix.java-version }}
+          distribution: temurin
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

.github/workflows/java-doc.yml

@@ -0,0 +1,71 @@
+name: JavaDoc Generation
+
+on:
+  push:
+    branches: ["master"]
+
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Check out MekHQ"
+        uses: actions/checkout@v4
+        with:
+          path: MekHQ
+
+      - name: "Check out MegaMekLab"
+        uses: actions/checkout@v4
+        with:
+          repository: MegaMek/megameklab
+          ref: master
+          path: megameklab
+
+      - name: Checkout MegaMek
+        uses: actions/checkout@v4
+        with:
+          repository: MegaMek/megamek
+          ref: master
+          path: megamek
+
+      - name: Set up Temurin JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
+
+      - name: Build with Gradle
+        working-directory: MekHQ
+        run: ./gradlew javadoc
+
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3 # or specific "vX.X.X" version tag for this action
+        with:
+          path: MekHQ/MekHQ/build/docs/javadoc
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

MekHQ/config/checkstyle/checkstyle.xml

@@ -55,7 +55,7 @@ https://raw.githubusercontent.com/checkstyle/checkstyle/master/src/main/resource
 
     <module name="LineLength">
         <property name="fileExtensions" value="java" />
-        <property name="max" value="140" />
+        <property name="max" value="120" />
         <property name="ignorePattern"
             value="^package.*|^import.*|href\s*=\s*&quot;[^&quot;]*&quot;|http://|https://|ftp://" />
     </module>

MekHQ/docs/history.txt

@@ -111,6 +111,15 @@ MEKHQ VERSION HISTORY:
 + PR #6157: Updated Battlefield Control Logic in Scenarios
 + PR #6159: Renamed `getAvailableForceIDs` Method to `getAvailableForceIDsForManualDeployment` For Improved Clarity
 + PR #6160: Replaced Magic Numbers With Constants For Scenario IDs
++ FIX #5829: ACAR - automatically change the color of the bot for another color if there is a collision
++ FIX #6059: PACAR auto-start only when using CommanderGUI
++ PR #6169: Updated Warehouse Parts Table To Better Indicate Brand-New Status in Quality Column
++ RFE #5919: Make Daily Log Killed in Action Text Show up in Red
++ Fix #6166: Corrected Resupply Interception Placeholder Messages
++ Fix #6169: Updated Reinforcement Logic to Better Support GM Overrides
++ PR #6173: Corrected Support Points Removal Logic
++ Fix #6174: Fixed new dependants claiming own name as job title in daily report
++ PR #6177: Drones are marked as unsupported units in MekHQ until they can be implemented in MegaMek
 
 
 0.50.03 (2025-02-02 2030 UTC)

MekHQ/resources/mekhq/resources/AtBStratCon.properties

@@ -24,8 +24,8 @@ selectForceForTemplate.Text=<html><b>Select a force from the list below.</b>\
 selectReinforcementsForTemplate.Text=<html><b>Select reinforcements from the list below.</b>\
   <br>\
   <br>Each attempt will cost Support Points and may be unsuccessful.</html>
-selectReinforcementsForTemplateNoSupportPoints.Text=<html><b>Unable to assign reinforcements. No\
-  \ Support Points available.</b></html>
+selectReinforcementsForTemplateNoSupportPoints.Text=<html><b>No Support Points available.</b> Only\
+  \ GM Reinforcement available.</html>
 
 reinforcementsAttempt.text=Attempting to reinforce scenario %s, roll <b>%s%s</b> vs. <b>%s</b>:
 reinforcementsAttempt.text.gm=Attempting to reinforce scenario %s:

MekHQ/resources/mekhq/resources/CampaignGUI.properties

@@ -48,6 +48,8 @@ miMHQOptions.toolTipText=This launches the MekHQ Options Dialog.
 menuThemes.text=Themes
 menuExit.text=Exit
 mekSelectorDialog.unsupported.gunEmplacement=Gun Emplacements are %s<b>not supported</b>%s by MekHQ.
+mekSelectorDialog.unsupported.droneOs=Drone units are %s<b>not supported</b>%s by MekHQ.
+mekSelectorDialog.unsupported.null=Unit does not have an entity.
 
 # Marketplace Menu
 menuMarket.text=Marketplace

MekHQ/resources/mekhq/resources/PartsTableModel.properties

@@ -0,0 +1,13 @@
+label.COL_NAME=Name
+label.COL_COST=Value per Unit
+label.COL_TOTAL_COST=Total Value
+label.COL_QUANTITY=#
+label.COL_QUALITY=Quality
+label.COL_TON=Tonnage
+label.COL_STATUS=Status
+label.COL_DETAIL=Details
+label.COL_TECH_BASE=Tech Base
+label.COL_REPAIR=Repair Details
+
+addendum.brandNew=Brand New
+addendum.used=Used

MekHQ/resources/mekhq/resources/Personnel.properties

@@ -328,116 +328,6 @@ PersonnelRole.ADMINISTRATOR_HR.text=Admin/HR
 PersonnelRole.DEPENDENT.text=Dependent
 PersonnelRole.NONE.text=None
 
-# PersonnelStatus Enum
-PersonnelStatus.ACTIVE.text=Active
-PersonnelStatus.ACTIVE.toolTipText=They are currently a member of the force.
-PersonnelStatus.ACTIVE.reportText=ERROR: ACTIVE should not call this method.
-PersonnelStatus.ACTIVE.logText=ERROR: ACTIVE should not call this method.
-PersonnelStatus.MIA.text=Missing in Action
-PersonnelStatus.MIA.toolTipText=They are currently missing in action.
-PersonnelStatus.MIA.reportText=%s has gone missing in action
-PersonnelStatus.MIA.logText=Went missing in action
-PersonnelStatus.POW.text=PoW
-PersonnelStatus.POW.toolTipText=They have been captured and are currently held as a prisoner of war.
-PersonnelStatus.POW.reportText=%s has been captured and are currently held as a prisoner of war
-PersonnelStatus.POW.logText=Was captured
-PersonnelStatus.ON_LEAVE.text=On Leave
-PersonnelStatus.ON_LEAVE.toolTipText=They are currently on leave from the force.
-PersonnelStatus.ON_LEAVE.reportText=%s has gone on leave from the force
-PersonnelStatus.ON_LEAVE.logText=Went on leave
-PersonnelStatus.ON_MATERNITY_LEAVE.text=On Maternity Leave
-PersonnelStatus.ON_MATERNITY_LEAVE.toolTipText=They are currently on maternity leave.
-PersonnelStatus.ON_MATERNITY_LEAVE.reportText=%s has gone on maternity leave
-PersonnelStatus.ON_MATERNITY_LEAVE.logText=Went on maternity leave
-PersonnelStatus.AWOL.text=AWOL
-PersonnelStatus.AWOL.toolTipText=They have abandoned their post.
-PersonnelStatus.AWOL.reportText=%s has abandoned their post.
-PersonnelStatus.AWOL.logText=Went AWOL
-PersonnelStatus.RETIRED.text=Retired
-PersonnelStatus.RETIRED.toolTipText=They have retired from the force.
-PersonnelStatus.RETIRED.reportText=%s has retired
-PersonnelStatus.RETIRED.logText=Retired
-PersonnelStatus.RESIGNED.text=Resigned
-PersonnelStatus.RESIGNED.toolTipText=They have resigned from the force.
-PersonnelStatus.RESIGNED.reportText=%s has resigned
-PersonnelStatus.RESIGNED.logText=Resigned
-PersonnelStatus.SACKED.text=Sacked
-PersonnelStatus.SACKED.toolTipText=They have been sacked.
-PersonnelStatus.SACKED.reportText=%s has been sacked
-PersonnelStatus.SACKED.logText=Was sacked
-PersonnelStatus.LEFT.text=Left
-PersonnelStatus.LEFT.toolTipText=They have left the force for unspecified reasons.
-PersonnelStatus.LEFT.reportText=%s has left the unit for unspecified reasons
-PersonnelStatus.LEFT.logText=Left the force
-PersonnelStatus.DESERTED.text=Deserted
-PersonnelStatus.DESERTED.toolTipText=They have deserted from the force.
-PersonnelStatus.DESERTED.reportText=%s has deserted from the force
-PersonnelStatus.DESERTED.logText=Deserted
-PersonnelStatus.DEFECTED.text=Defected
-PersonnelStatus.DEFECTED.toolTipText=They have defected to another force.
-PersonnelStatus.DEFECTED.reportText=%s has defected from the force
-PersonnelStatus.DEFECTED.logText=Defected
-PersonnelStatus.STUDENT.text=Student
-PersonnelStatus.STUDENT.toolTipText=Is away for education or training
-PersonnelStatus.STUDENT.reportText=%s has left for a period of education or training
-PersonnelStatus.STUDENT.logText=Studying away from the unit
-PersonnelStatus.MISSING.text=Missing
-PersonnelStatus.MISSING.toolTipText=Is missing
-PersonnelStatus.MISSING.reportText=%s has gone missing
-PersonnelStatus.MISSING.logText=Gone missing
-PersonnelStatus.KIA.text=Killed in Action
-PersonnelStatus.KIA.toolTipText=They have been killed in action.
-PersonnelStatus.KIA.reportText=%s has been killed in action
-PersonnelStatus.KIA.logText=Killed in action
-PersonnelStatus.HOMICIDE.text=Slain in a Homicide
-PersonnelStatus.HOMICIDE.toolTipText=They have been killed by another person outside of their combat duties.
-PersonnelStatus.HOMICIDE.reportText=%s was murdered
-PersonnelStatus.HOMICIDE.logText=Slain in a homicide
-PersonnelStatus.WOUNDS.text=Slain by their Wounds
-PersonnelStatus.WOUNDS.toolTipText=They have passed away due to their combat wounds.
-PersonnelStatus.WOUNDS.reportText=%s has passed away from their combat wounds
-PersonnelStatus.WOUNDS.logText=Passed away from their wounds
-PersonnelStatus.DISEASE.text=Died from Disease
-PersonnelStatus.DISEASE.toolTipText=They have passed away while fighting a disease.
-PersonnelStatus.DISEASE.reportText=%s has passed away while fighting a disease
-PersonnelStatus.DISEASE.logText=Passed away from disease
-PersonnelStatus.ACCIDENTAL.text=Died Accidentally
-PersonnelStatus.ACCIDENTAL.toolTipText=They have passed away in an accident.
-PersonnelStatus.ACCIDENTAL.reportText=%s was slain in accident
-PersonnelStatus.ACCIDENTAL.logText=Passed away in an accident
-PersonnelStatus.NATURAL_CAUSES.text=Died of Natural Causes
-PersonnelStatus.NATURAL_CAUSES.toolTipText=They have passed away from natural causes.
-PersonnelStatus.NATURAL_CAUSES.reportText=%s has passed away from natural causes
-PersonnelStatus.NATURAL_CAUSES.logText=Passed away from natural causes
-PersonnelStatus.OLD_AGE.text=Succumbed to Old Age
-PersonnelStatus.OLD_AGE.toolTipText=They have passed away due to complications originating from their advanced age.
-PersonnelStatus.OLD_AGE.reportText=%s has passed away due to complications originating from their advanced age
-PersonnelStatus.OLD_AGE.logText=Succumbed to their old age
-PersonnelStatus.MEDICAL_COMPLICATIONS.text=Succumbed to Medical Complications
-PersonnelStatus.MEDICAL_COMPLICATIONS.toolTipText=They have passed away due to complications originating from their medical treatment.
-PersonnelStatus.MEDICAL_COMPLICATIONS.reportText=%s has passed away due to complications originating from their medical treatment
-PersonnelStatus.MEDICAL_COMPLICATIONS.logText=Passed away due to complications relating to medical care
-PersonnelStatus.PREGNANCY_COMPLICATIONS.text=Succumbed to Pregnancy Complications
-PersonnelStatus.PREGNANCY_COMPLICATIONS.toolTipText=They have passed away due to complications originating from their pregnancy.
-PersonnelStatus.PREGNANCY_COMPLICATIONS.reportText=%s has passed away from complications originating from their pregnancy
-PersonnelStatus.PREGNANCY_COMPLICATIONS.logText=Passed away due to complications relating to their pregnancy
-PersonnelStatus.UNDETERMINED.text=Undetermined Cause of Death
-PersonnelStatus.UNDETERMINED.toolTipText=They are believed to have passed away from an unknown cause.
-PersonnelStatus.UNDETERMINED.reportText=%s has died, the cause unknown
-PersonnelStatus.UNDETERMINED.logText=Recorded as having passed away, the cause unknown
-PersonnelStatus.SUICIDE.text=Died from Suicide
-PersonnelStatus.SUICIDE.toolTipText=They took their own life.
-PersonnelStatus.SUICIDE.reportText=%s has taken their own life
-PersonnelStatus.SUICIDE.logText=Took their own life
-PersonnelStatus.ENEMY_BONDSMAN.text=Enemy Bondsman
-PersonnelStatus.ENEMY_BONDSMAN.toolTipText=They were taken as a Bondsman by enemy forces.
-PersonnelStatus.ENEMY_BONDSMAN.reportText=The enemy has claimed %s as a Bondsman.
-PersonnelStatus.ENEMY_BONDSMAN.logText=Taken as a Bondsman
-PersonnelStatus.BONDSREF.text=Bondsref
-PersonnelStatus.BONDSREF.toolTipText=They have performed Bondsref
-PersonnelStatus.BONDSREF.reportText=%s has preformed Bondsref instead of becoming a Bondsman.
-PersonnelStatus.BONDSREF.logText=Performed Bondsref
-
 # Phenotype Enum
 Phenotype.MEKWARRIOR.text=MekWarrior
 Phenotype.MEKWARRIOR.toolTipText=Probability of a trueborn person with appropriate bonuses for MekWarriors. Does not apply to non-clan factions.