Fixed conflicts

IllianiBird · IllianiBird · commit e1247a742252 · 2025-04-04T14:26:57.000-05:00
diff --git a/MekHQ/src/mekhq/campaign/io/CampaignXmlParser.java b/MekHQ/src/mekhq/campaign/io/CampaignXmlParser.java
@@ -29,8 +29,8 @@
 
 import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
 import static mekhq.campaign.force.Force.FORCE_NONE;
-import static mekhq.campaign.personnel.SkillDeprecationTool.DEPRECATED_SKILLS;
 import static mekhq.campaign.personnel.enums.PersonnelStatus.statusValidator;
+import static mekhq.campaign.personnel.skills.SkillDeprecationTool.DEPRECATED_SKILLS;
 import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
 
 import java.io.File;
@@ -1709,7 +1709,7 @@ private static void processPartsInUseRequestedStockMap(Campaign retVal, Node wn)
     }
 
     private static void processPartsInUseRequestedStockMapVal(Campaign retVal, Node wn,
-                                                              Map<String, Double> partsInUseRequestedStockMap) {
+          Map<String, Double> partsInUseRequestedStockMap) {
         NodeList wList = wn.getChildNodes();
 
         String key = null;
diff --git a/MekHQ/src/mekhq/gui/CommandCenterTab.java b/MekHQ/src/mekhq/gui/CommandCenterTab.java
@@ -261,8 +261,7 @@ private void initInfoPanel() {
             // This seems to be overwritten completely and immediately by refresh
             StringBuilder experienceString = new StringBuilder(64);
             experienceString.append("<html><b>")
-                  .append(mekhq.campaign.personnel.SkillType.getColoredExperienceLevelName(getCampaign().getReputation()
-                                                                                                 .getAverageSkillLevel()))
+                  .append(SkillType.getColoredExperienceLevelName(getCampaign().getReputation().getAverageSkillLevel()))
                   .append("</b></html>");
             lblExperience.setText(experienceString.toString());
         }
@@ -628,8 +627,7 @@ private void refreshBasicInfo() {
 
             StringBuilder experienceString = new StringBuilder(64);
             experienceString.append("<html><b>")
-                  .append(mekhq.campaign.personnel.SkillType.getColoredExperienceLevelName(campaign.getReputation()
-                                                                                                 .getAverageSkillLevel()))
+                  .append(SkillType.getColoredExperienceLevelName(campaign.getReputation().getAverageSkillLevel()))
                   .append("</b></html>");
             lblExperience.setText(experienceString.toString());
         }
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/CampaignOptionsPane.java b/MekHQ/src/mekhq/gui/campaignOptions/CampaignOptionsPane.java
@@ -29,6 +29,9 @@
 
 import static java.lang.Math.round;
 import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
+import static mekhq.campaign.personnel.skills.enums.SkillSubType.COMBAT_GUNNERY;
+import static mekhq.campaign.personnel.skills.enums.SkillSubType.COMBAT_PILOTING;
+import static mekhq.campaign.personnel.skills.enums.SkillSubType.SUPPORT;
 import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.CHARACTER_CREATION_ONLY;
 import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.CHARACTER_FLAW;
 import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.COMBAT_ABILITY;
@@ -456,7 +459,7 @@ private JTabbedPane createStrategicOperationsParentTab() {
      * @param isSaveAction determines if this action is saving options to a preset
      */
     public void applyCampaignOptionsToCampaign(@Nullable CampaignPreset preset, boolean isStartUp,
-                                               boolean isSaveAction) {
+          boolean isSaveAction) {
         CampaignOptions options = this.campaignOptions;
         RandomSkillPreferences presetRandomSkillPreferences = null;
         Map<String, SkillType> presetSkills = null;
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/contents/AbilitiesTab.java b/MekHQ/src/mekhq/gui/campaignOptions/contents/AbilitiesTab.java
@@ -27,6 +27,8 @@
  */
 package mekhq.gui.campaignOptions.contents;
 
+import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.CHARACTER_CREATION_ONLY;
+import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.CHARACTER_FLAW;
 import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.COMBAT_ABILITY;
 import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.MANEUVERING_ABILITY;
 import static mekhq.gui.campaignOptions.CampaignOptionsAbilityInfo.AbilityCategory.UTILITY_ABILITY;
@@ -44,7 +46,6 @@
 import java.util.Map.Entry;
 import java.util.ResourceBundle;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
