Merge branch 'main' into silverbullet_hitmod

Author: exeea

.github/workflows/checkstyle.yml

@@ -5,7 +5,7 @@ on:
     branches: [ main ]
 
 jobs:
-  pr_build:
+  checkstyle:
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -27,12 +27,18 @@ jobs:
         with:
           path: megamek
 
+      - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v5
+        with:
+          distribution: ${{ matrix.java-distribution }}
+          java-version: ${{ matrix.java-version }}
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
 
       - name: Checkstyle
         working-directory: megamek
-        run: ./gradlew checkstyleMain
+        run: ./gradlew checkstyleMain checkstyleTest
 
       - name: Upload Test Logs on Failure
         uses: actions/upload-artifact@v6

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Test
         working-directory: megamek
-        run: ./gradlew test
+        run: ./gradlew test -x checkstyleMain -x checkstyleTest
 
       - name: Upload Test Logs on Failure
         uses: actions/upload-artifact@v6
@@ -72,7 +72,7 @@ jobs:
 
       - name: Build with Gradle
         working-directory: megamek
-        run: ./gradlew build -x test -PextraVersion="PR-${{ github.event.number }}-${{ env.COMMIT_SHORT_SHA }}"
+        run: ./gradlew build -x test -x checkstyleMain -x checkstyleTest -PextraVersion="PR-${{ github.event.number}}-${{ env.COMMIT_SHORT_SHA }}"
 
       - name: Upload TarGZ Release
         uses: actions/upload-artifact@v6

.gitignore

@@ -45,6 +45,8 @@ build/
 !/megamek/mmconf/shared.properties
 /megamek/mmconf/*.properties.bak
 /megamek/mmconf/*.preferences
+/megamek/mmconf/searches/*.json
+/megamek/mmconf/recent-advanced-searches.json
 
 # UserData
 megamek/userdata/**

config/checkstyle/checkstyle.xml

@@ -8,12 +8,10 @@
         <property name="file" value="${suppressionFile}" />
     </module>
 
-    <module name="RegexpSingleline">
-        <property name="format" value="^(?!.*(bg\.battletech|MechWarrior Copyright|MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks|BattleMech Manual)).*\b(?i)(mech|mechwarrior|battlemech|aerotech|protomech|'mech|`Mech|TripodMech|BipedMech|QuadMech|LandAirMech|OmniMech|'Mechs)\b.*$" />
-        <property name="ignoreCase" value="true" />
-        <property name="message" value="Forbidden word found" />
-        <property name="fileExtensions" value="properties, md" />
-        <property name="severity" value="error" />
+    <module name="SuppressWithNearbyTextFilter">
+        <property name="nearbyTextPattern" value="CHECKSTYLE IGNORE ForbiddenWords FOR (\d+) LINES" />
+        <property name="lineRange" value="$1" />
+        <property name="idPattern" value="ForbiddenWords" />
     </module>
 
     <!-- Check that "license" appears at least once in the file -->
@@ -24,21 +22,29 @@
         <property name="ignoreCase" value="true" />
         <property name="message" value="File must contain a license header" />
         <property name="severity" value="error" />
-        <property name="fileExtensions" value="java" />
+    </module>
+
+    <module name="RegexpSingleline">
+        <property name="id" value="ForbiddenWords" />
+        <property name="format" value="^(?!.*(bg\.battletech|MechWarrior Copyright|MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks|BattleMech Manual)).*\b(?i)(mech|mechwarrior|battlemech|aerotech|protomech|'mech|`Mech|TripodMech|BipedMech|QuadMech|LandAirMech|OmniMech|'Mechs)\b.*$" />
+        <property name="ignoreCase" value="true" />
+        <property name="message" value="Forbidden word found" />
+        <property name="severity" value="error" />
     </module>
 
     <module name="TreeWalker">
         <module name="SuppressWithNearbyCommentFilter">
             <property name="commentFormat" value="CHECKSTYLE IGNORE ForbiddenWords FOR (\d+) LINES" />
             <property name="checkFormat" value=".*" />
             <property name="influenceFormat" value="$1" />
+            <property name="idFormat" value="ForbiddenWords" />
         </module>
 
         <module name="SuppressionCommentFilter" />
 
         <module name="RegexpSinglelineJava">
             <property name="id" value="ForbiddenWords" />
-            <property name="format" value="^(?!.*(bg\.battletech|MechWarrior Copyright|MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks)).*\b(?i)(mech|mechwarrior|battlemech|aerotech|protomech|'mech|`Mech|TripodMech|BipedMech|QuadMech|LandAirMech|OmniMech|’Mechs)\b.*$" />
+            <property name="format" value="^(?!.*(bg\.battletech|MechWarrior Copyright|MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks|BattleMech Manual)).*\b(?i)(mech|mechwarrior|battlemech|aerotech|protomech|'mech|`Mech|TripodMech|BipedMech|QuadMech|LandAirMech|OmniMech|'Mechs)\b.*$" />
             <property name="ignoreCase" value="true" />
             <property name="ignoreComments" value="false" />
             <property name="message" value="Forbidden word found" />

megamek/build.gradle

@@ -207,6 +207,8 @@ tasks.register('copyFiles', Copy) {
     exclude "mmconf/mhq.preferences"
     exclude "mmconf/mm.preferences"
     exclude "mmconf/mml.preferences"
+    exclude "mmconf/recent-advanced-searches.json"
+    exclude "mmconf/searches/*.json"
 
     include "userdata/"
 

megamek/resources/megamek/client/messages.properties

@@ -791,6 +791,7 @@ ChatLounge.name.selectUnits=Select Units
 ChatLounge.name.spaceMap=Space Map
 ChatLounge.name.teamOverview=Team Overview
 ChatLounge.name.unitSetup=Unit Setup
+ChatLounge.name.networkOverview=Network Overview
 ChatLounge.noCamo=No Camo
 ChatLounge.noCmdr.title=No Commander!
 ChatLounge.noCmdr.msg=Commander killed victory is selected but the following players don't have a commander:\n
@@ -1132,6 +1133,7 @@ CommonMenuBar.viewAccessibilityWindow=Accessibility Window
 CommonMenuBar.viewIncGUIScale=Increase GUI Scale
 CommonMenuBar.viewDecGUIScale=Decrease GUI Scale
 CommonMenuBar.viewKeyboardShortcuts=Keyboard Shortcuts
+CommonMenuBar.viewNetworkInformation=Network Information
 CommonMenuBar.viewPlanetaryConditions=Planetary Conditions
 CommonMenuBar.ViewMenu=View
 CommonMenuBar.viewMinimap=Minimap
@@ -2615,6 +2617,8 @@ MekView.unitType.fixedWingSupport=Fixed Wing Support
 MekView.unitType.support=Support
 MekView.unitType.spaceStation=Space Station
 MekView.unitType.jumpShip=JumpShip
+MekView.unitType.advancedBuilding=Advanced Building
+MekView.unitType.mobileStructure=Mobile Structure
 MekView.unitType.warShip=WarShip
 MekView.unitType.dropShip=DropShip
 MekView.unitType.smallCraft=Small Craft
@@ -3550,6 +3554,13 @@ MissionRole.generator=Generator
 MissionRole.generator.tooltip=Structure provides power for dependent buildings.
 MissionRole.control=Control center
 MissionRole.control.tooltip=Structure controls other structures.
+#Network Information Dialog Text
+NetworkInformation.localIP=Local IP Address:
+NetworkInformation.remoteIP=Public IP Address:
+NetworkInformation.connectedIP=Game Connected to:
+NetworkInformation.buttonShowIPs=Show/Hide address
+NetworkInformation.blankIP=No Address
+NetworkInformation.title=Network Information
 #Random Map Dialog
 RandomMapDialog.ShowAtStart=<HTML><I><FONT SIZE = -2>Show at Map Editor startup
 RandomMapDialog.mountainPlain=Plain

megamek/resources/megamek/common/options/messages.properties

@@ -1002,12 +1002,14 @@ QuirksInfo.option.reinforced_legs.rulesBook=BMM
 QuirksInfo.option.reinforced_legs.rulesPage=85
 QuirksInfo.option.reinforced_legs.working=1
 QuirksInfo.option.rugged_1.displayableName=Rugged (1 Point)
-QuirksInfo.option.rugged_1.description=Mek is extremely reliable and doesn't need as much Maintenance. It can go twice as long between Maintenance checks.
+QuirksInfo.option.rugged_1.description=Mek is extremely reliable and doesn't need as much maintenance. It can go \
+  twice as long between maintenance checks.
 QuirksInfo.option.rugged_1.rulesBook=BMM
 QuirksInfo.option.rugged_1.rulesPage=85
 QuirksInfo.option.rugged_1.working=1
 QuirksInfo.option.rugged_2.displayableName=Rugged (2 Point)
-QuirksInfo.option.rugged_2.description=Mek is extremely reliable and doesn't need as much Maintenance. It can go three times as long between Maintenance checks.
+QuirksInfo.option.rugged_2.description=Mek is extremely reliable and doesn't need as much maintenance. It can go \
+  three times as long between maintenance checks.
 QuirksInfo.option.rugged_2.rulesBook=BMM
 QuirksInfo.option.rugged_2.rulesPage=85
 QuirksInfo.option.rugged_2.working=1
@@ -1296,7 +1298,7 @@ WeaponQuirksInfo.option.direct_torso_mount.description=The weapon can be flipped
 WeaponQuirksInfo.option.em_interference.displayableName=EM Interference
 WeaponQuirksInfo.option.em_interference.description=Firing this weapon causes Electromagnetic Interference against this vehicle for 1 turn.\nNot yet implemented. (BMM pg 87)
 WeaponQuirksInfo.option.exposed_linkage.displayableName=Exposed Weapon Linkage
-WeaponQuirksInfo.option.exposed_linkage.description=This weapon takes a critical on a roll of 10+ if it's housing location is hit.\nNot yet implemented. (SO pg 198)
+WeaponQuirksInfo.option.exposed_linkage.description=This weapon takes a critical on a roll of 10+ if its housing location is hit.\nNot yet implemented. (SO pg 198)
 WeaponQuirksInfo.option.fast_reload.displayableName=Fast Reload
 WeaponQuirksInfo.option.fast_reload.description=No game effect,\ncurrently. (SO pg 194)
 WeaponQuirksInfo.option.imp_cooling.displayableName=Improved Cooling Jacket

megamek/src/megamek/client/bot/BotClient.java

@@ -219,7 +219,7 @@ public void gameClientFeedbackRequest(GameCFREvent evt) {
                         // Picks the WAA with the highest expected damage,
                         // essentially same as if the auto_ams option was on
                         waa = Compute.getHighestExpectedDamage(game, evt.getWAAs(), true);
-                        
+
                         // Add second weapon attack counter for the bot when playtest 3 is active
                         WeaponAttackAction secondWaa = null;
                         if (game.getOptions().booleanOption(OptionsConstants.PLAYTEST_3)) {
@@ -236,7 +236,7 @@ public void gameClientFeedbackRequest(GameCFREvent evt) {
                         if (numInts == 2) {
                             indexes[1] = evt.getWAAs().indexOf(secondWaa);
                         }
-                        
+
                         sendAMSAssignCFRResponse(indexes);
                         break;
                     case CFR_APDS_ASSIGN:
@@ -1336,6 +1336,7 @@ private void resetMinefieldCounters() {
         getLocalPlayer().setNbrMFConventional(0);
         getLocalPlayer().setNbrMFInferno(0);
         getLocalPlayer().setNbrMFVibra(0);
+        getLocalPlayer().setNbrMFEMP(0);
         sendPlayerInfo();
     }
 
@@ -1374,10 +1375,11 @@ private MinefieldNumbers[] getMinefieldNumbers() {
                                               Minefield.TYPE_CONVENTIONAL),
                                         new MinefieldNumbers(getLocalPlayer().getNbrMFVibra(),
                                               Minefield.TYPE_VIBRABOMB),
+                                        new MinefieldNumbers(getLocalPlayer().getNbrMFEMP(),
+                                              Minefield.TYPE_EMP),
                                         // the following are added for completeness, but are not used by the bot
                                         new MinefieldNumbers(0, Minefield.TYPE_COMMAND_DETONATED),
                                         // no command detonated mines
-                                        new MinefieldNumbers(0, Minefield.TYPE_EMP), // no field for EMP mines exists
         };
     }
 

megamek/src/megamek/client/bot/princess/Princess.java

@@ -2740,7 +2740,7 @@ protected void initMovement() {
                             }
 
                             if (isEnemyBuildingEntity(entity, coords)) {
-                                fireControlState.getAdditionalTargets().add(bt);
+                                fireControlState.addAdditionalTarget(bt);
                                 sendChat("Building in Hex " +
                                       coords.toFriendlyString() +
                                       " designated target due to Building Entity.", Level.INFO);

megamek/src/megamek/client/ui/clientGUI/ClientGUI.java

@@ -105,6 +105,7 @@
 import megamek.client.ui.dialogs.buttonDialogs.EditBotsDialog;
 import megamek.client.ui.dialogs.buttonDialogs.GameOptionsDialog;
 import megamek.client.ui.dialogs.buttonDialogs.LOSDialog;
+import megamek.client.ui.dialogs.buttonDialogs.NetworkInformationDialog;
 import megamek.client.ui.dialogs.forceDisplay.ForceDisplayDialog;
 import megamek.client.ui.dialogs.forceDisplay.ForceDisplayPanel;
 import megamek.client.ui.dialogs.helpDialogs.AbstractHelpDialog;
@@ -278,6 +279,7 @@ public class ClientGUI extends AbstractClientGUI
     public static final String VIEW_CHANGE_THEME = "viewChangeTheme";
     public static final String VIEW_ROUND_REPORT = "viewRoundReport";
     public static final String VIEW_GAME_OPTIONS = "viewGameOptions";
+    public static final String VIEW_NETWORK_INFORMATION = "viewNetworkInformation";
     public static final String VIEW_CLIENT_SETTINGS = "viewClientSettings";
     public static final String VIEW_LOS_SETTING = "viewLOSSetting";
     public static final String VIEW_PLAYER_SETTINGS = "viewPlayerSettings";
@@ -372,6 +374,7 @@ public class ClientGUI extends AbstractClientGUI
 
     // some dialogs...
     private GameOptionsDialog gameOptionsDialog;
+    private NetworkInformationDialog networkInformationDialog;
     private MegaMekUnitSelectorDialog mekSelectorDialog;
     private PlayerListDialog playerListDialog;
     private RandomArmyDialog randomArmyDialog;
@@ -882,6 +885,14 @@ private void showOptions() {
         getGameOptionsDialog().setVisible(true);
     }
 
+    private void showNetworkInformation() {
+        // Display the network information screen
+        getNetworkInformationDialog().refresh();
+        getNetworkInformationDialog().pack();
+        getNetworkInformationDialog().setVisible(true);
+    }
+
+
     public void customizePlayer() {
         PlayerSettingsDialog psd = new PlayerSettingsDialog(this, client, (BoardView) boardViews.get(0));
         psd.setVisible(true);
@@ -959,6 +970,9 @@ public void resetWindowPositions() {
         if (gameOptionsDialog != null) {
             gameOptionsDialog.setBounds(0, 0, gameOptionsDialog.getWidth(), gameOptionsDialog.getHeight());
         }
+        if (networkInformationDialog != null) {
+            networkInformationDialog.setBounds(0, 0, networkInformationDialog.getWidth(), networkInformationDialog.getHeight());
+        }
         if (commonSettingsDialog != null) {
             commonSettingsDialog.setBounds(0, 0, commonSettingsDialog.getWidth(), commonSettingsDialog.getHeight());
         }
@@ -1070,6 +1084,9 @@ public void actionPerformed(ActionEvent event) {
             case VIEW_GAME_OPTIONS:
                 showOptions();
                 break;
+            case VIEW_NETWORK_INFORMATION:
+                showNetworkInformation();
+                break;
             case VIEW_PLAYER_SETTINGS:
                 customizePlayer();
                 break;
@@ -1350,6 +1367,13 @@ public GameOptionsDialog getGameOptionsDialog() {
         }
         return gameOptionsDialog;
     }
+    
+    public NetworkInformationDialog getNetworkInformationDialog() {
+        if (networkInformationDialog == null) {
+            networkInformationDialog = new NetworkInformationDialog(this);
+        }
+        return networkInformationDialog;
+    }
 
     public MegaMekUnitSelectorDialog getMekSelectorDialog() {
         return mekSelectorDialog;