Skip to content

Commit d2b7d98

Browse files
IllianiBirdIllianiBird
authored
Merge pull request #6600 from IllianiBird/imageUtilitiesMove
Moved `ImageUtilities` Into MegaMek Package
2 parents f102a01 + fb020d8 commit d2b7d98

22 files changed

+51
-308
lines changed

‎MekHQ/src/mekhq/campaign/mission/AtBContract.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import static megamek.common.enums.SkillLevel.REGULAR;
4646
import static megamek.common.enums.SkillLevel.parseFromInteger;
4747
import static megamek.common.enums.SkillLevel.parseFromString;
48+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
4849
import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
4950
import static mekhq.campaign.force.ForceType.STANDARD;
5051
import static mekhq.campaign.force.FormationLevel.BATTALION;
@@ -64,7 +65,6 @@
6465
import static mekhq.campaign.universe.Factions.getFactionLogo;
6566
import static mekhq.campaign.universe.fameAndInfamy.BatchallFactions.BATCHALL_FACTIONS;
6667
import static mekhq.utilities.EntityUtilities.getEntityFromUnitId;
67-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
6868

6969
import java.awt.BorderLayout;
7070
import java.awt.FlowLayout;

‎MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import static megamek.common.Compute.d6;
3535
import static megamek.common.Compute.randomInt;
3636
import static megamek.common.UnitType.*;
37+
import static megamek.common.planetaryconditions.Atmosphere.THIN;
3738
import static megamek.common.planetaryconditions.Wind.TORNADO_F4;
3839
import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
3940
import static mekhq.campaign.mission.AtBScenario.selectBotTeamCommanders;
@@ -69,6 +70,7 @@
6970
import megamek.common.enums.SkillLevel;
7071
import megamek.common.icons.Camouflage;
7172
import megamek.common.planetaryconditions.Atmosphere;
73+
import megamek.common.planetaryconditions.Wind;
7274
import megamek.logging.MMLogger;
7375
import mekhq.MHQConstants;
7476
import mekhq.MekHQ;
@@ -553,7 +555,8 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
553555
boolean allowsTanks = true;
554556

555557
if (campaign.getCampaignOptions().isUsePlanetaryModifiers()) {
556-
if (scenario.getAtmosphere().isLighterThan(Atmosphere.THIN)) {
558+
if (scenario.getAtmosphere().isLighterThan(THIN)) {
559+
logger.info("Atmosphere is lighter than {}, setting low pressure flag and disallowing Tanks", THIN);
557560
isLowPressure = true;
558561
allowsTanks = false;
559562
} else {
@@ -562,30 +565,36 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
562565
.getAtmosphere(currentDate);
563566

564567
switch (specific_atmosphere) {
565-
case TOXICPOISON:
566-
case TOXICCAUSTIC:
568+
case TOXICPOISON, TOXICCAUSTIC -> {
569+
logger.info("Atmosphere is {}, disallowing Tanks and Infantry", specific_atmosphere);
567570
allowsConvInfantry = false;
568571
allowsTanks = false;
569-
break;
570-
case TAINTEDPOISON:
571-
case TAINTEDCAUSTIC:
572+
}
573+
case TAINTEDPOISON, TAINTEDCAUSTIC -> {
574+
logger.info("Atmosphere is {}, setting tainted flag", specific_atmosphere);
572575
isTainted = true;
573-
break;
574-
default:
575-
break;
576+
}
577+
default -> {
578+
// No action needed for the default case.
579+
}
576580
}
577581
}
578582

579-
if (scenario.getGravity() <= 0.2) {
583+
double gravity = scenario.getGravity();
584+
if (gravity <= 0.2) {
585+
logger.info("Gravity is {}, setting low gravity flag and disallowing tanks", gravity);
580586
allowsTanks = false;
581587
isLowGravity = true;
582588
}
583589
}
584590

585591
if (campaign.getCampaignOptions().isUseWeatherConditions()) {
586-
if (scenario.getWind().isTornadoF1ToF3() || scenario.getWind().isTornadoF4()) {
592+
Wind wind = scenario.getWind();
593+
if (wind.isTornadoF1ToF3() || wind.isTornadoF4()) {
594+
logger.info("Tornado detected, disallowing Infantry");
587595
allowsConvInfantry = false;
588-
if (scenario.getWind().isTornadoF4()) {
596+
if (wind.isTornadoF4()) {
597+
logger.info("F4 Tornado detected, disallowing Battle Armor and Tanks");
589598
allowsTanks = false;
590599
allowsBattleArmor = false;
591600
}
@@ -991,8 +1000,7 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
9911000

9921001
boolean allowConventionalAircraft = scenario.getTemplate().mapParameters.getMapLocation() !=
9931002
MapLocation.Space &&
994-
scenario.getAtmosphere()
995-
.isDenserThan(Atmosphere.THIN);
1003+
scenario.getAtmosphere().isDenserThan(THIN);
9961004

9971005
if (fighterMultiplier > 0 && allowConventionalAircraft) {
9981006
baseFighterCount *= fighterMultiplier;

‎MekHQ/src/mekhq/gui/StratconPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import static java.awt.Color.BLACK;
3131
import static java.awt.Color.BLUE;
3232
import static java.awt.Font.BOLD;
33+
import static megamek.utilities.ImageUtilities.addTintToBufferedImage;
3334
import static mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment.Allied;
3435
import static mekhq.campaign.stratcon.StratconScenario.ScenarioState.PRIMARY_FORCES_COMMITTED;
3536
import static mekhq.campaign.stratcon.StratconScenario.ScenarioState.UNRESOLVED;
36-
import static mekhq.utilities.ImageUtilities.addTintToBufferedImage;
3737

3838
import java.awt.*;
3939
import java.awt.event.ActionEvent;

‎MekHQ/src/mekhq/gui/baseComponents/AbstractMHQNagDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
*/
2828
package mekhq.gui.baseComponents;
2929

30+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
3031
import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
3132
import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
32-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
3333

3434
import java.awt.BorderLayout;
3535
import java.awt.Component;

‎MekHQ/src/mekhq/gui/baseComponents/immersiveDialogs/ImmersiveDialogCore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import static megamek.client.ui.swing.util.FlatLafStyleBuilder.setFontScaling;
3535
import static megamek.client.ui.swing.util.UIUtil.scaleForGUI;
3636
import static megamek.common.icons.Portrait.DEFAULT_PORTRAIT_FILENAME;
37+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
3738
import static mekhq.campaign.force.Force.FORCE_NONE;
38-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
3939
import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
4040

4141
import java.awt.BorderLayout;

‎MekHQ/src/mekhq/gui/campaignOptions/SelectPresetDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
*/
2828
package mekhq.gui.campaignOptions;
2929

30+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
3031
import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.createGroupLayout;
31-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
3232

3333
import java.awt.BorderLayout;
3434
import java.awt.Component;
@@ -125,7 +125,7 @@ public SelectPresetDialog(JFrame frame, boolean includePresetSelectOption, boole
125125
DefaultListCellRenderer listRenderer = new DefaultListCellRenderer() {
126126
@Override
127127
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
128-
boolean cellHasFocus) {
128+
boolean cellHasFocus) {
129129
if (value instanceof CampaignPreset preset) {
130130
setText(preset.getTitle());
131131
}

‎MekHQ/src/mekhq/gui/campaignOptions/components/CampaignOptionsHeaderPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
package mekhq.gui.campaignOptions.components;
2929

3030
import static megamek.client.ui.swing.util.FlatLafStyleBuilder.setFontScaling;
31-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
31+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
3232

3333
import java.awt.GridBagConstraints;
3434
import java.util.ResourceBundle;

‎MekHQ/src/mekhq/gui/campaignOptions/contents/GeneralTab.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
import static megamek.client.ui.swing.util.FlatLafStyleBuilder.setFontScaling;
3131
import static megamek.common.options.OptionsConstants.ALLOWED_YEAR;
32+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
3233
import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.createGroupLayout;
33-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
3434

3535
import java.awt.Dimension;
3636
import java.awt.FlowLayout;
@@ -546,7 +546,7 @@ public void loadValuesFromCampaignOptions() {
546546
* the campaign's default faction is used.
547547
*/
548548
public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampaignOptions,
549-
@Nullable LocalDate presetDate, @Nullable Faction presetFaction) {
549+
@Nullable LocalDate presetDate, @Nullable Faction presetFaction) {
550550
CampaignOptions options = presetCampaignOptions;
551551
if (presetCampaignOptions == null) {
552552
options = this.campaignOptions;
@@ -587,7 +587,7 @@ public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampai
587587
* @param isSaveAction A boolean indicating if this is a save action.
588588
*/
589589
public void applyCampaignOptionsToCampaign(@Nullable CampaignOptions presetCampaignOptions, boolean isStartUp,
590-
boolean isSaveAction) {
590+
boolean isSaveAction) {
591591
// First, we apply any updates to the campaign
592592
if (!isSaveAction) {
593593
campaign.setName(txtName.getText());

‎MekHQ/src/mekhq/gui/dialog/ContractAutomationDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
*/
2828
package mekhq.gui.dialog;
2929

30+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
3031
import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
3132
import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
32-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
3333

3434
import java.awt.BorderLayout;
3535
import java.awt.Component;

‎MekHQ/src/mekhq/gui/dialog/NewsDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
package mekhq.gui.dialog;
2929

30-
import static mekhq.utilities.ImageUtilities.scaleImageIcon;
30+
import static megamek.utilities.ImageUtilities.scaleImageIcon;
3131
import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
3232

3333
import java.awt.Component;

0 commit comments

Comments
 (0)