Suite Version Tracking: MekHQ Changes

MekHQ/resources/mekhq/resources/MekHQ.properties

@@ -2,7 +2,6 @@
 
 Application.name = MekHQ
 Application.title = MekHQ
-Application.version = 0.49.4-SNAPSHOT
 Application.vendor= MekHQ Project
 Application.homepage=https://github.com/MegaMek
 Application.description = A program for managing BattleTech campaigns played via MegaMek or tabletop

MekHQ/src/mekhq/MekHQ.java

@@ -354,7 +354,7 @@ private void showInfo() {
 
         StringBuilder msg = new StringBuilder();
         msg.append("\t").append(resourceMap.getString("Application.name")).append(" ")
-                .append(resourceMap.getString("Application.version"));
+                .append(MekHqConstants.VERSION);
         if (TIMESTAMP > 0) {
             msg.append("\n\tCompiled on ").append(Instant.ofEpochMilli(TIMESTAMP));
         }

MekHQ/src/mekhq/MekHqConstants.java

@@ -20,10 +20,11 @@
  */
 package mekhq;
 
-public final class MekHqConstants {
+import megamek.SuiteConstants;
+
+public final class MekHqConstants extends SuiteConstants {
     // This is used in creating the name of save files, e.g. the MekHQ campaign file
     public static final String FILENAME_DATE_FORMAT = "yyyyMMdd";
-    public static final int MAXIMUM_D6_VALUE = 6;
     public static final int ASTECH_TEAM_SIZE = 6;
 
     //region MekHQ Options

MekHQ/src/mekhq/campaign/Campaign.java

@@ -4032,9 +4032,8 @@ public void writeToXml(PrintWriter pw1) {
         // File header
         pw1.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 
-        ResourceBundle resourceMap = ResourceBundle.getBundle("mekhq.resources.MekHQ");
         // Start the XML root.
-        pw1.println("<campaign version=\"" + resourceMap.getString("Application.version") + "\">");
+        pw1.println("<campaign version=\"" + MekHqConstants.VERSION + "\">");
 
         //region Basic Campaign Info
         MekHqXmlUtil.writeSimpleXMLOpenIndentedLine(pw1, indent, "info");

MekHQ/src/mekhq/campaign/CampaignOptions.java

@@ -25,7 +25,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import mekhq.Version;
+import megamek.Version;
 import mekhq.campaign.mission.enums.AtBLanceRole;
 import mekhq.campaign.enums.PlanetaryAcquisitionFactionLimit;
 import mekhq.campaign.market.enums.ContractMarketMethod;

MekHQ/src/mekhq/campaign/GamePreset.java

@@ -30,18 +30,15 @@
 
 import javax.xml.parsers.DocumentBuilder;
 
-import mekhq.Version;
+import megamek.Version;
+import mekhq.*;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import megamek.common.options.PilotOptions;
-import mekhq.MekHQ;
-import mekhq.MekHqXmlSerializable;
-import mekhq.MekHqXmlUtil;
-import mekhq.Utilities;
 import mekhq.campaign.personnel.SkillType;
 import mekhq.campaign.personnel.SpecialAbility;
 
@@ -133,8 +130,7 @@ public boolean isValid() {
     @Override
     public void writeToXml(PrintWriter pw, int indent) {
         pw.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-        pw.println("<gamePreset version=\"" + ResourceBundle.getBundle("mekhq.resources.MekHQ")
-                .getString("Application.version") + "\">");
+        pw.println("<gamePreset version=\"" + MekHqConstants.VERSION + "\">");
         MekHqXmlUtil.writeSimpleXmlTag(pw, indent, "title", title);
         MekHqXmlUtil.writeSimpleXmlTag(pw, indent, "description", description);
         if (getOptions() != null) {
@@ -190,7 +186,7 @@ public static GamePreset createGamePresetFromXMLFileInputStream(FileInputStream
 
         // Legacy Parsing method for any presets created before 0.47.11, as they did not include a version
         final String versionString = optionsEle.getAttribute("version");
-        Version version = new Version(versionString.isBlank() ? "0.47.11" : versionString);
+        final Version version = new Version(versionString.isBlank() ? "0.47.11" : versionString);
 
         // Okay, lets iterate through the children, eh?
         for (int x = 0; x < nl.getLength(); x++) {

MekHQ/src/mekhq/campaign/Kill.java

@@ -31,7 +31,7 @@
 
 import mekhq.MekHQ;
 import mekhq.MekHqXmlUtil;
-import mekhq.Version;
+import megamek.Version;
 
 /**
  * A kill record

MekHQ/src/mekhq/campaign/RandomSkillPreferences.java

@@ -26,7 +26,7 @@
 import mekhq.MekHQ;
 import mekhq.MekHqXmlUtil;
 
-import mekhq.Version;
+import megamek.Version;
 import mekhq.campaign.personnel.enums.PersonnelRole;
 import org.apache.commons.lang3.StringUtils;
 import org.w3c.dom.Node;

MekHQ/src/mekhq/campaign/force/Force.java

@@ -44,7 +44,7 @@
 
 import mekhq.MekHQ;
 import mekhq.MekHqXmlUtil;
-import mekhq.Version;
+import megamek.Version;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.mission.Scenario;
 import mekhq.campaign.unit.Unit;

MekHQ/src/mekhq/campaign/io/CampaignXmlParser.java

@@ -41,7 +41,7 @@
 import mekhq.MhqFileUtil;
 import mekhq.NullEntityException;
 import mekhq.Utilities;
-import mekhq.Version;
+import megamek.Version;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.CampaignOptions;
 import mekhq.campaign.CurrentLocation;
@@ -160,7 +160,7 @@ public Campaign parse() throws CampaignXmlParseException, NullEntityException {
         // Stupid weird parsing of XML. At least this cleans it up.
         campaignEle.normalize();
 
-        Version version = new Version(campaignEle.getAttribute("version"));
+        final Version version = new Version(campaignEle.getAttribute("version"));
 
         // Indicates whether or not new units were written to disk while
         // loading the Campaign file. If so, we need to kick back off loading
@@ -1319,8 +1319,7 @@ private static void postProcessParts(Campaign retVal, Version version) {
 
             // Fixup LargeCraftAmmoBins from old versions
             if ((prt.getUnit() != null) && (prt.getUnit().getEntity() != null)
-                    && ((version.getMinorVersion() < 43)
-                            || ((version.getMinorVersion() == 43) && (version.getSnapshot() < 5)))
+                    && version.isLowerThan("0.43.5")
                     && ((prt instanceof AmmoBin) || (prt instanceof MissingAmmoBin))) {
                 if (prt.getUnit().getEntity().usesWeaponBays()) {
                     Mounted ammo;
@@ -1475,7 +1474,7 @@ private static void postProcessParts(Campaign retVal, Version version) {
                 }
             }
 
-            // old versions didnt distinguish tank engines
+            // old versions didn't distinguish tank engines
             if ((prt instanceof EnginePart) && prt.getName().contains("Vehicle")) {
                 boolean isHover = null != u
                         && u.getEntity().getMovementMode() == EntityMovementMode.HOVER && u.getEntity() instanceof Tank;
@@ -1497,9 +1496,7 @@ private static void postProcessParts(Campaign retVal, Version version) {
                 ((MissingEnginePart) prt).fixClanFlag();
             }
 
-            if ((version.getMajorVersion() == 0)
-                    && ((version.getMinorVersion() < 44)
-                            || ((version.getMinorVersion() == 43) && (version.getSnapshot() < 7)))) {
+            if (version.isLowerThan("0.44.0")) {
                 if ((prt instanceof MekLocation)
                         && (((MekLocation) prt).getStructureType() == EquipmentType.T_STRUCTURE_ENDO_STEEL)) {
                     if (null != u) {

MekHQ/src/mekhq/campaign/io/Migration/CamouflageMigrator.java

@@ -20,7 +20,7 @@
 
 import megamek.common.icons.Camouflage;
 import mekhq.MekHQ;
-import mekhq.Version;
+import megamek.Version;
 
 /**
  * This migrates Camouflage from SeaBee's Pack to Deadborder's Pack.