Refactored ScenarioManager.getScenario().

Mezy · Jan 20, 2021 · 18a78d7 · 18a78d7
1 parent 2ba97a1
commit 18a78d7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/src/main/java/com/gmail/val59000mc/listeners/ItemsListener.java b/src/main/java/com/gmail/val59000mc/listeners/ItemsListener.java
@@ -465,17 +465,11 @@ private void handleScenarioInventory(InventoryClickEvent e){
 				return;
 			}
 
-			// Clicked scenario
-			Scenario scenario = scenarioManager.getScenario(meta.getDisplayName());
-
-			// Clicked item is not a scenario item
-			if (scenario == null){
-				return;
-			}
-
 			// Send scenario info
-			player.sendMessage(Lang.SCENARIO_GLOBAL_DESCRIPTION_HEADER.replace("%scenario%", scenario.getInfo().getName()));
-			scenario.getInfo().getDescription().forEach(s -> player.sendMessage(Lang.SCENARIO_GLOBAL_DESCRIPTION_PREFIX + s));
+			scenarioManager.getScenarioByName(meta.getDisplayName()).ifPresent(sce -> {
+				player.sendMessage(Lang.SCENARIO_GLOBAL_DESCRIPTION_HEADER.replace("%scenario%", sce.getInfo().getName()));
+				sce.getInfo().getDescription().forEach(s -> player.sendMessage(Lang.SCENARIO_GLOBAL_DESCRIPTION_PREFIX + s));
+			});
 		}else if (editInventory){
 			// Handle back item
 			if (item.getItemMeta().getDisplayName().equals(Lang.SCENARIO_GLOBAL_ITEM_BACK)) {
@@ -500,17 +494,15 @@ private void handleScenarioInventory(InventoryClickEvent e){
 				return;
 			}
 
-			// Clicked scenario
-			Scenario scenario = scenarioManager.getScenario(meta.getDisplayName());
-
 			// toggle scenario
-			scenarioManager.toggleScenario(scenario);
+			scenarioManager.getScenarioByName(meta.getDisplayName())
+					.ifPresent(scenarioManager::toggleScenario);
 
 			// Open edit inventory
 			player.openInventory(scenarioManager.getScenarioEditInventory(uhcPlayer.getBrowsingPage()));
 		}else if (voteInventory){
 			// Clicked scenario
-			Scenario scenario = scenarioManager.getScenario(meta.getDisplayName());
+			Scenario scenario = scenarioManager.getScenarioByName(meta.getDisplayName()).orElse(null);
 
 			// toggle scenario
 			if (uhcPlayer.getScenarioVotes().contains(scenario)){

diff --git a/src/main/java/com/gmail/val59000mc/scenarios/Scenario.java b/src/main/java/com/gmail/val59000mc/scenarios/Scenario.java
@@ -168,12 +168,6 @@ public Class<? extends ScenarioListener> getListener() {
         return listener;
     }
 
-    public boolean equals(String name){
-        return name.contains(getInfo().getName()) ||
-                name.replace(" ", "").toLowerCase().equals(key) ||
-                name.replace(" ", "").toLowerCase().equals(key.replace("_", ""));
-    }
-
     public ItemStack getScenarioItem() {
         ItemStack item = new ItemStack(material);
         ItemMeta meta = item.getItemMeta();

diff --git a/src/main/java/com/gmail/val59000mc/scenarios/ScenarioManager.java b/src/main/java/com/gmail/val59000mc/scenarios/ScenarioManager.java
@@ -138,15 +138,23 @@ public boolean toggleScenario(Scenario scenario){
      * Used to obtain the scenario object matching a certain name.
      * @param name Name of the scenario to be searched.
      * @return Returns a scenario object matching the name, or null when not found.
+     * @deprecated Replaced by {@link #getScenarioByName(String)}
      */
     @Nullable
-    public Scenario getScenario(String name){
-        for (Scenario scenario : registeredScenarios){
-            if (scenario.equals(name)){
-                return scenario;
-            }
-        }
-        return null;
+    @Deprecated
+    public Scenario getScenario(String name) {
+        return getScenarioByName(name).orElse(null);
+    }
+
+    /**
+     * Used to obtain the scenario object matching a certain name.
+     * @param name Name of the scenario to be searched.
+     * @return Returns a scenario object matching the name, or null when not found.
+     */
+    public Optional<Scenario> getScenarioByName(String name) {
+        return registeredScenarios.stream()
+                .filter(s -> name.contains(s.getInfo().getName()))
+                .findFirst();
     }
 
     /**