From 31282014b3fbf89f96a8d7a79c929ef3265949f8 Mon Sep 17 00:00:00 2001
From: Andreas Troelsen <garbagemule@gmail.com>
Date: Sun, 1 Nov 2020 16:52:01 +0100
Subject: [PATCH] Use slugs internally in Upgrade Waves.

This just removes the internal use of "lowercase name" in Upgrade Waves
and _should_ have no effect on the actual config-file and the parsing
done there.
---
 src/main/java/com/garbagemule/MobArena/MASpawnThread.java  | 4 ++--
 .../java/com/garbagemule/MobArena/waves/WaveParser.java    | 7 +++++--
 .../com/garbagemule/MobArena/waves/types/UpgradeWave.java  | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/garbagemule/MobArena/MASpawnThread.java b/src/main/java/com/garbagemule/MobArena/MASpawnThread.java
index 1d1ff54..76f2bf6 100644
--- a/src/main/java/com/garbagemule/MobArena/MASpawnThread.java
+++ b/src/main/java/com/garbagemule/MobArena/MASpawnThread.java
@@ -283,8 +283,8 @@ public class MASpawnThread implements Runnable
         UpgradeWave uw = (UpgradeWave) w;
 
         for (Player p : arena.getPlayersInArena()) {
-            String className = arena.getArenaPlayer(p).getArenaClass().getLowercaseName();
-            uw.grantItems(p, className);
+            String slug = arena.getArenaPlayer(p).getArenaClass().getSlug();
+            uw.grantItems(p, slug);
             uw.grantItems(p, "all");
         }
 
diff --git a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
index 01ab1d0..666977e 100644
--- a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
+++ b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
@@ -9,6 +9,7 @@ import com.garbagemule.MobArena.things.ThingManager;
 import com.garbagemule.MobArena.things.ThingPicker;
 import com.garbagemule.MobArena.util.ItemParser;
 import com.garbagemule.MobArena.util.PotionEffectParser;
+import com.garbagemule.MobArena.util.Slugs;
 import com.garbagemule.MobArena.waves.ability.Ability;
 import com.garbagemule.MobArena.waves.ability.AbilityManager;
 import com.garbagemule.MobArena.waves.enums.BossHealth;
@@ -468,16 +469,18 @@ public class WaveParser
         String path = "upgrades.";
 
         for (String className : classes) {
+            String slug = Slugs.create(className);
+
             // Legacy support
             Object val = config.get(path + className, null);
             if (val instanceof String) {
                 List<Thing> things = loadUpgradesFromString(className, (String) val, name, arena, thingman);
-                upgrades.put(className.toLowerCase(), things);
+                upgrades.put(slug, things);
             }
             // New complex setup
             else if (val instanceof ConfigurationSection) {
                 List<Thing> list = loadUpgradesFromSection(className, (ConfigurationSection) val, name, arena, thingman);
-                upgrades.put(className.toLowerCase(), list);
+                upgrades.put(slug, list);
             }
         }
 
diff --git a/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java b/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java
index 32e5a20..3d6104e 100644
--- a/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java
+++ b/src/main/java/com/garbagemule/MobArena/waves/types/UpgradeWave.java
@@ -27,8 +27,8 @@ public class UpgradeWave extends AbstractWave
         return new HashMap<>();
     }
 
-    public void grantItems(Player p, String className) {
-        List<Thing> list = upgrades.get(className);
+    public void grantItems(Player p, String slug) {
+        List<Thing> list = upgrades.get(slug);
         if (list == null) return;
 
         list.forEach(thing -> thing.giveTo(p));