More cleanup

author: rafa_99 <raroma09@gmail.com> 2022-05-15 00:32:05 +0100
committer: rafa_99 <raroma09@gmail.com> 2022-05-15 00:32:05 +0100
commit: 441c3a885a0207e56c636577bef89cee946038b0 (patch)
tree: c4f7bb1b07e1668d852659464127ccd460979fcd
parent: 8620e096e76614af73a596f8e92625fd96f831ad (diff)
2 files changed, 2 insertions, 40 deletions
diff --git a/src/com/rafa_99/pkrandom/newgui/Bundle.properties b/src/com/rafa_99/pkrandom/newgui/Bundle.properties
index 77f8231..7c449a7 100644
--- a/src/com/rafa_99/pkrandom/newgui/Bundle.properties
+++ b/src/com/rafa_99/pkrandom/newgui/Bundle.properties
@@ -1,7 +1,7 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 
-GUI.versionLabel.text=Sneed's Randomizer
+GUI.versionLabel.text=Sneed's Pokemon Randomizer
 GUI.generalOptionsPanel.title=General Options
 GUI.limitPokemonCheckBox.text=Limit Pokemon
 GUI.limitPokemonCheckBox.toolTipText=<html>Select this to allow yourself to limit the Pokemon used by the randomization.<br /><b>If this box isn't checked all Pokemon will be allowed.</b>
@@ -584,15 +584,13 @@ GUI.totpPercentageLevelModifierCheckBox.toolTipText=Checking this will enable a
 GUI.totpAllyUnchangedRadioButton.toolTipText=Don't change Ally Pokemon.
 GUI.pmsEvolutionMovesCheckBox.text=Evolution Moves for All Pokemon
 GUI.pmsEvolutionMovesCheckBox.toolTipText=<html>Selecting this option will cause every Pokemon to learn a move upon evolution.<br /><br /><b>Use carefully with Sun/Moon 1.0 - </b>due to a glitch, if a Pokemon has an evolution move and also learns a move<br />on the level that it evolved at, it will only learn the evolution move upon evolving.
-GUI.windowTitle=Universal Pokemon Randomizer ZX v%s
+GUI.windowTitle=Sneed's Pokemon Randomizer
 GUI.paWeighDuplicatesTogetherCheckBox.text=Combine Duplicate Abilities
 GUI.paWeighDuplicatesTogetherCheckBox.toolTipText=<html>This setting causes abilities that have the exact same effect to be considered as the same ability for randomization probability purposes. Every variation of the respective abilities can still appear.<br />This applies to:<br /><b>Gen 3+:</b> Insomnia/Vital Spirit, Clear Body/White Smoke, Huge Power/Pure Power, Battle Armor/Shell Armor, Cloud Nine/Air Lock<br /><b>Gen 4+:</b> Filter/Solid Rock<br /><b>Gen 5+:</b> Rough Skin/Iron Barbs, Mold Breaker/Turboblaze/Teravolt<br /><b>Gen 7+:</b> Wimp Out/Emergency Exit, Queenly Majesty/Dazzling, Gooey/Tangling Hair, Receiver/Power of Alchemy, Clear Body/White Smoke/Full Metal Body, Multiscale/Shadow Shield, Filter/Solid Rock/Prism Armor
-GUI.applyGameUpdateMenuItem.text=Load Game Update
 GUI.gameUpdateApplied=<html>Update saved for game: %s.<br />Note that if the update file is moved or renamed, you will have to reapply it.
 GUI.nonMatchingGameUpdate=<html>Supplied file %s is not a valid game update for %s.<br />Please check your game updates and try again.
 GUI.invalidGameUpdate=<html>Supplied file %s does not appear to be a valid game update.</br />Please check if the file is a valid game update.
 GUI.savingWithGameUpdate=<html>You've supplied a game update, so your game can only be output as a LayeredFS directory.<br /><b>Make sure you have this same game update installed in Citra or on your 3DS!</b>
-GUI.removeGameUpdateMenuItem.text=Unload Game Update
 GUI.keepGameLoadedAfterRandomizingMenuItem.text=Keep Game Loaded After Randomizing
 GUI.unloadGameAfterRandomizingMenuItem.text=Unload Game After Randomizing
 GUI.keepGameLoadedAfterRandomizing=Your loaded game and settings will now remain after a successful randomization.
diff --git a/src/com/rafa_99/pkrandom/newgui/NewRandomizerGUI.java b/src/com/rafa_99/pkrandom/newgui/NewRandomizerGUI.java
index 1bc6bce..3a6f001 100644
--- a/src/com/rafa_99/pkrandom/newgui/NewRandomizerGUI.java
+++ b/src/com/rafa_99/pkrandom/newgui/NewRandomizerGUI.java
@@ -322,8 +322,6 @@ public class NewRandomizerGUI {
 
     private JPopupMenu settingsMenu;
     private JMenuItem customNamesEditorMenuItem;
-    private JMenuItem applyGameUpdateMenuItem;
-    private JMenuItem removeGameUpdateMenuItem;
     private JMenuItem loadGetSettingsMenuItem;
     private JMenuItem keepOrUnloadGameAfterRandomizingMenuItem;
 
@@ -461,8 +459,6 @@ public class NewRandomizerGUI {
         saveSettingsButton.addActionListener(e -> saveQS());
         settingsButton.addActionListener(e -> settingsMenu.show(settingsButton,0,settingsButton.getHeight()));
         customNamesEditorMenuItem.addActionListener(e -> new CustomNamesEditorDialog(frame));
-        applyGameUpdateMenuItem.addActionListener(e -> applyGameUpdateMenuItemActionPerformed());
-        removeGameUpdateMenuItem.addActionListener(e -> removeGameUpdateMenuItemActionPerformed());
         loadGetSettingsMenuItem.addActionListener(e -> loadGetSettingsMenuItemActionPerformed());
         keepOrUnloadGameAfterRandomizingMenuItem.addActionListener(e -> keepOrUnloadGameAfterRandomizingMenuItemActionPerformed());
         limitPokemonButton.addActionListener(e -> {
@@ -642,14 +638,6 @@ public class NewRandomizerGUI {
         loadGetSettingsMenuItem.setText(bundle.getString("GUI.loadGetSettingsMenuItem.text"));
         settingsMenu.add(loadGetSettingsMenuItem);
 
-        applyGameUpdateMenuItem = new JMenuItem();
-        applyGameUpdateMenuItem.setText(bundle.getString("GUI.applyGameUpdateMenuItem.text"));
-        settingsMenu.add(applyGameUpdateMenuItem);
-
-        removeGameUpdateMenuItem = new JMenuItem();
-        removeGameUpdateMenuItem.setText(bundle.getString("GUI.removeGameUpdateMenuItem.text"));
-        settingsMenu.add(removeGameUpdateMenuItem);
-
         keepOrUnloadGameAfterRandomizingMenuItem = new JMenuItem();
         if (this.unloadGameOnSuccess) {
             keepOrUnloadGameAfterRandomizingMenuItem.setText(bundle.getString("GUI.keepGameLoadedAfterRandomizingMenuItem.text"));
@@ -1127,7 +1115,6 @@ public class NewRandomizerGUI {
                 }
                 gameUpdates.put(romHandler.getROMCode(), fh.getAbsolutePath());
                 attemptWriteConfig();
-                removeGameUpdateMenuItem.setVisible(true);
                 setRomNameLabel();
                 String text = String.format(bundle.getString("GUI.gameUpdateApplied"), romHandler.getROMName());
                 String url = "https://github.com/Ajarmar/universal-pokemon-randomizer-zx/wiki/Randomizing-the-3DS-games#3ds-game-updates";
@@ -1139,17 +1126,6 @@ public class NewRandomizerGUI {
         }
     }
 
-    private void removeGameUpdateMenuItemActionPerformed() {
-
-        if (romHandler == null) return;
-
-        gameUpdates.remove(romHandler.getROMCode());
-        attemptWriteConfig();
-        romHandler.removeGameUpdate();
-        removeGameUpdateMenuItem.setVisible(false);
-        setRomNameLabel();
-    }
-
     private void loadGetSettingsMenuItemActionPerformed() {
 
         if (romHandler == null) return;
@@ -2801,18 +2777,6 @@ public class NewRandomizerGUI {
                 //miscTweaksPanel.setLayout(noTweaksLayout);
             }
 
-            if (romHandler.generationOfPokemon() < 6) {
-                applyGameUpdateMenuItem.setVisible(false);
-            } else {
-                applyGameUpdateMenuItem.setVisible(true);
-            }
-
-            if (romHandler.hasGameUpdateLoaded()) {
-                removeGameUpdateMenuItem.setVisible(true);
-            } else {
-                removeGameUpdateMenuItem.setVisible(false);
-            }
-
             gameMascotLabel.setIcon(makeMascotIcon());
 
             if (romHandler instanceof AbstractDSRomHandler) {
author	rafa_99 <raroma09@gmail.com>	2022-05-15 00:32:05 +0100
committer	rafa_99 <raroma09@gmail.com>	2022-05-15 00:32:05 +0100
commit	441c3a885a0207e56c636577bef89cee946038b0 (patch)
tree	c4f7bb1b07e1668d852659464127ccd460979fcd
parent	8620e096e76614af73a596f8e92625fd96f831ad (diff)