From 1a29a2e2c48d57d7e0b4170e771852c8103ce085 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 22 Feb 2024 20:44:24 +0100 Subject: [PATCH] Revert to use ETYPE_AERO in MML --- megameklab/src/megameklab/ui/MenuBar.java | 4 ++-- megameklab/src/megameklab/ui/dialog/UiLoader.java | 2 +- megameklab/src/megameklab/ui/fighterAero/ASMainUI.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/megameklab/src/megameklab/ui/MenuBar.java b/megameklab/src/megameklab/ui/MenuBar.java index 1978a61cf..832cd34b9 100644 --- a/megameklab/src/megameklab/ui/MenuBar.java +++ b/megameklab/src/megameklab/ui/MenuBar.java @@ -179,7 +179,7 @@ private JMenu createSwitchUnitTypeMenu() { final JMenuItem miSwitchToFighter = new JMenuItem(resources.getString("miSwitchToFighter.text")); miSwitchToFighter.setName("miSwitchToFighter"); miSwitchToFighter.setMnemonic(KeyEvent.VK_A); - miSwitchToFighter.addActionListener(evt -> owner.newUnit(Entity.ETYPE_AEROSPACEFIGHTER)); + miSwitchToFighter.addActionListener(evt -> owner.newUnit(Entity.ETYPE_AERO)); switchUnitTypeMenu.add(miSwitchToFighter); } @@ -1058,7 +1058,7 @@ private void jMenuResetEntity_actionPerformed(ActionEvent event) { } else if (en.hasETypeFlag(Entity.ETYPE_JUMPSHIP)) { getUnitMainUi().createNewUnit(Entity.ETYPE_JUMPSHIP); } else if (owner.getEntity() instanceof Aero) { - getUnitMainUi().createNewUnit(Entity.ETYPE_AEROSPACEFIGHTER, en.isPrimitive()); + getUnitMainUi().createNewUnit(Entity.ETYPE_AERO, en.isPrimitive()); } else if (owner.getEntity() instanceof BattleArmor) { getUnitMainUi().createNewUnit(Entity.ETYPE_BATTLEARMOR); } else if (owner.getEntity() instanceof Infantry) { diff --git a/megameklab/src/megameklab/ui/dialog/UiLoader.java b/megameklab/src/megameklab/ui/dialog/UiLoader.java index 9d1e4ef7e..e68604095 100644 --- a/megameklab/src/megameklab/ui/dialog/UiLoader.java +++ b/megameklab/src/megameklab/ui/dialog/UiLoader.java @@ -76,7 +76,7 @@ public static void loadUi(Entity newUnit, String fileName) { } else if (newUnit.hasETypeFlag(Entity.ETYPE_JUMPSHIP)) { new UiLoader(Entity.ETYPE_JUMPSHIP, newUnit.isPrimitive(), false, newUnit, fileName).show(); } else if ((newUnit instanceof Aero) && !(newUnit instanceof FixedWingSupport)) { - new UiLoader(Entity.ETYPE_AEROSPACEFIGHTER, newUnit.isPrimitive(), false, newUnit, fileName).show(); + new UiLoader(Entity.ETYPE_AERO, newUnit.isPrimitive(), false, newUnit, fileName).show(); } else if (newUnit instanceof BattleArmor) { new UiLoader(Entity.ETYPE_BATTLEARMOR, false, false, newUnit, fileName).show(); } else if (newUnit instanceof Infantry) { diff --git a/megameklab/src/megameklab/ui/fighterAero/ASMainUI.java b/megameklab/src/megameklab/ui/fighterAero/ASMainUI.java index 0ee9e87b3..77e40c0cf 100644 --- a/megameklab/src/megameklab/ui/fighterAero/ASMainUI.java +++ b/megameklab/src/megameklab/ui/fighterAero/ASMainUI.java @@ -43,7 +43,7 @@ public class ASMainUI extends MegaMekLabMainUI { public ASMainUI(boolean primitive) { super(); - createNewUnit(Entity.ETYPE_AEROSPACEFIGHTER, primitive); + createNewUnit(Entity.ETYPE_AERO, primitive); finishSetup(); } @@ -88,7 +88,7 @@ public void reloadTabs() { @Override public void createNewUnit(long entityType, boolean isPrimitive, boolean isIndustrial, Entity oldEntity) { - if (entityType == Entity.ETYPE_AEROSPACEFIGHTER) { + if (entityType == Entity.ETYPE_AERO) { setEntity(new AeroSpaceFighter()); getEntity().setTechLevel(TechConstants.T_IS_TW_NON_BOX); } else if (entityType == Entity.ETYPE_CONV_FIGHTER) {