Fixed kit loading

Plugily-Projects · May 30, 2023 · e6f0004 · e6f0004
1 parent c2e59c2
commit e6f0004
Show file tree

Hide file tree

Showing 27 changed files with 39 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,7 +38,7 @@ repositories {
 
 
 dependencies {
-    implementation("plugily.projects:MiniGamesBox-Classic:1.2.0-SNAPSHOT23") { isTransitive = false }
+    implementation("plugily.projects:MiniGamesBox-Classic:1.2.0-SNAPSHOT26") { isTransitive = false }
     compileOnly("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains:annotations:24.0.1")
     compileOnly(files("lib/spigot/1.8.8-R0.1.jar"))

diff --git a/src/main/java/plugily/projects/villagedefense/Main.java b/src/main/java/plugily/projects/villagedefense/Main.java
@@ -18,6 +18,7 @@
 
 package plugily.projects.villagedefense;
 
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPluginLoader;

diff --git a/src/main/java/plugily/projects/villagedefense/kits/free/KnightKit.java b/src/main/java/plugily/projects/villagedefense/kits/free/KnightKit.java
@@ -36,6 +36,7 @@ public class KnightKit extends FreeKit {
 
   public KnightKit() {
     setName(new MessageBuilder("KIT_CONTENT_KNIGHT_NAME").asKey().build());
+    setKey("Knight");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_KNIGHT_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/free/LightTankKit.java b/src/main/java/plugily/projects/villagedefense/kits/free/LightTankKit.java
@@ -37,6 +37,7 @@ public class LightTankKit extends FreeKit {
 
   public LightTankKit() {
     setName(new MessageBuilder("KIT_CONTENT_LIGHT_TANK_NAME").asKey().build());
+    setKey("LightTank");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_LIGHT_TANK_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/ArcherKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/ArcherKit.java
@@ -38,6 +38,7 @@ public class ArcherKit extends LevelKit {
   public ArcherKit() {
     setLevel(getKitsConfig().getInt("Required-Level.Archer"));
     setName(new MessageBuilder("KIT_CONTENT_ARCHER_NAME").asKey().build());
+    setKey("Archer");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_ARCHER_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/GolemFriendKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/GolemFriendKit.java
@@ -38,6 +38,7 @@ public class GolemFriendKit extends LevelKit {
 
   public GolemFriendKit() {
     setName(new MessageBuilder("KIT_CONTENT_GOLEM_FRIEND_NAME").asKey().build());
+    setKey("GolemFriend");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_GOLEM_FRIEND_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.GolemFriend"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/HardcoreKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/HardcoreKit.java
@@ -39,6 +39,7 @@ public class HardcoreKit extends LevelKit {
 
   public HardcoreKit() {
     setName(new MessageBuilder("KIT_CONTENT_HARDCORE_NAME").asKey().build());
+    setKey("Hardcore");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_HARDCORE_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.Hardcore"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/HealerKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/HealerKit.java
@@ -39,6 +39,7 @@ public class HealerKit extends LevelKit {
 
   public HealerKit() {
     setName(new MessageBuilder("KIT_CONTENT_HEALER_NAME").asKey().build());
+    setKey("Healer");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_HEALER_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.Healer"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/LooterKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/LooterKit.java
@@ -41,6 +41,7 @@ public class LooterKit extends LevelKit implements Listener {
 
   public LooterKit() {
     setName(new MessageBuilder("KIT_CONTENT_LOOTER_NAME").asKey().build());
+    setKey("Looter");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_LOOTER_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.Looter"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/MediumTankKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/MediumTankKit.java
@@ -37,6 +37,7 @@ public class MediumTankKit extends LevelKit {
 
   public MediumTankKit() {
     setName(new MessageBuilder("KIT_CONTENT_MEDIUM_TANK_NAME").asKey().build());
+    setKey("MediumTank");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_MEDIUM_TANK_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.MediumTank"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/PuncherKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/PuncherKit.java
@@ -38,6 +38,7 @@ public class PuncherKit extends LevelKit {
 
   public PuncherKit() {
     setName(new MessageBuilder("KIT_CONTENT_PUNCHER_NAME").asKey().build());
+    setKey("Puncher");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_PUNCHER_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.Puncher"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/RunnerKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/RunnerKit.java
@@ -41,6 +41,7 @@ public class RunnerKit extends LevelKit {
   public RunnerKit() {
     setLevel(getKitsConfig().getInt("Required-Level.Runner"));
     setName(new MessageBuilder("KIT_CONTENT_RUNNER_NAME").asKey().build());
+    setKey("Runner");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_RUNNER_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/TerminatorKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/TerminatorKit.java
@@ -40,6 +40,7 @@ public class TerminatorKit extends LevelKit {
 
   public TerminatorKit() {
     setName(new MessageBuilder("KIT_CONTENT_TERMINATOR_NAME").asKey().build());
+    setKey("Terminator");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_TERMINATOR_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.Terminator"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/WorkerKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/WorkerKit.java
@@ -46,6 +46,7 @@ public class WorkerKit extends LevelKit implements Listener {
   public WorkerKit() {
     setLevel(getKitsConfig().getInt("Required-Level.Worker"));
     setName(new MessageBuilder("KIT_CONTENT_WORKER_NAME").asKey().build());
+    setKey("Worker");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_WORKER_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/level/ZombieFinderKit.java b/src/main/java/plugily/projects/villagedefense/kits/level/ZombieFinderKit.java
@@ -49,6 +49,7 @@ public class ZombieFinderKit extends LevelKit implements Listener {
 
   public ZombieFinderKit() {
     setName(new MessageBuilder("KIT_CONTENT_ZOMBIE_TELEPORTER_NAME").asKey().build());
+    setKey("ZombieFinder");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_ZOMBIE_TELEPORTER_DESCRIPTION");
     setDescription(description);
     setLevel(getKitsConfig().getInt("Required-Level.ZombieFinder"));

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/BlockerKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/BlockerKit.java
@@ -51,6 +51,7 @@ public class BlockerKit extends PremiumKit implements Listener {
 
   public BlockerKit() {
     setName(new MessageBuilder("KIT_CONTENT_BLOCKER_NAME").asKey().build());
+    setKey("Blocker");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_BLOCKER_DESCRIPTION");
     setDescription(description);
     getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/CleanerKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/CleanerKit.java
@@ -46,6 +46,7 @@ public class CleanerKit extends PremiumKit implements Listener {
 
   public CleanerKit() {
     setName(new MessageBuilder("KIT_CONTENT_CLEANER_NAME").asKey().build());
+    setKey("Cleaner");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_CLEANER_DESCRIPTION");
     setDescription(description);
     getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/DogFriendKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/DogFriendKit.java
@@ -37,6 +37,7 @@ public class DogFriendKit extends PremiumKit {
 
   public DogFriendKit() {
     setName(new MessageBuilder("KIT_CONTENT_DOG_FRIEND_NAME").asKey().build());
+    setKey("DogFriend");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_DOG_FRIEND_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/HeavyTankKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/HeavyTankKit.java
@@ -38,6 +38,7 @@ public class HeavyTankKit extends PremiumKit {
 
   public HeavyTankKit() {
     setName(new MessageBuilder("KIT_CONTENT_HEAVY_TANK_NAME").asKey().build());
+    setKey("HeavyTank");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_HEAVY_TANK_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/MedicKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/MedicKit.java
@@ -45,6 +45,7 @@ public class MedicKit extends PremiumKit implements Listener {
 
   public MedicKit() {
     setName(new MessageBuilder("KIT_CONTENT_MEDIC_NAME").asKey().build());
+    setKey("Medic");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_MEDIC_DESCRIPTION");
     setDescription(description);
     getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/NakedKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/NakedKit.java
@@ -48,6 +48,7 @@ public class NakedKit extends PremiumKit implements Listener {
 
   public NakedKit() {
     setName(new MessageBuilder("KIT_CONTENT_WILD_NAKED_NAME").asKey().build());
+    setKey("Naked");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_WILD_NAKED_DESCRIPTION");
     setDescription(description);
     getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/PremiumHardcoreKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/PremiumHardcoreKit.java
@@ -36,6 +36,7 @@ public class PremiumHardcoreKit extends PremiumKit {
 
   public PremiumHardcoreKit() {
     setName(new MessageBuilder("KIT_CONTENT_PREMIUM_HARDCORE_NAME").asKey().build());
+    setKey("PremiumHardcore");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_PREMIUM_HARDCORE_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/ShotBowKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/ShotBowKit.java
@@ -46,6 +46,7 @@ public class ShotBowKit extends PremiumKit implements Listener {
 
   public ShotBowKit() {
     setName(new MessageBuilder("KIT_CONTENT_SHOT_BOW_NAME").asKey().build());
+    setKey("ShotBow");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_SHOT_BOW_DESCRIPTION");
     setDescription(description);
     getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/TeleporterKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/TeleporterKit.java
@@ -50,6 +50,7 @@ public class TeleporterKit extends PremiumKit implements Listener {
 
   public TeleporterKit() {
     setName(new MessageBuilder("KIT_CONTENT_TELEPORTER_NAME").asKey().build());
+    setKey("Teleporter");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_TELEPORTER_DESCRIPTION");
     setDescription(description);
     getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/TornadoKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/TornadoKit.java
@@ -54,6 +54,7 @@ public class TornadoKit extends PremiumKit implements Listener {
 
   public TornadoKit() {
     setName(new MessageBuilder("KIT_CONTENT_TORNADO_NAME").asKey().build());
+    setKey("Tornado");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_TORNADO_DESCRIPTION");
     setDescription(description);
     getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());

diff --git a/src/main/java/plugily/projects/villagedefense/kits/premium/WizardKit.java b/src/main/java/plugily/projects/villagedefense/kits/premium/WizardKit.java
@@ -59,6 +59,7 @@ public class WizardKit extends PremiumKit implements Listener {
 
   public WizardKit() {
     setName(new MessageBuilder("KIT_CONTENT_WIZARD_NAME").asKey().build());
+    setKey("Wizard");
     List<String> description = getPlugin().getLanguageManager().getLanguageListFromKey("KIT_CONTENT_WIZARD_DESCRIPTION");
     setDescription(description);
     getPlugin().getKitRegistry().registerKit(this);

diff --git a/src/main/resources/kits.yml b/src/main/resources/kits.yml
@@ -22,32 +22,31 @@ Required-Level:
 # Here you can disable plugily projects preconfigured kits.
 # Set 'false' to disable.
 Enabled-Game-Kits:
+  # Knight is default kit, it cannot be disabled
+  #Knight: true
+  LightTank: true
   Archer: true
-  Blocker: true
-  Cleaner: true
-  DogFriend: true
   GolemFriend: true
   Hardcore: true
   Healer: true
-  HeavyTank: true
-  # Knight is default kit, it cannot be disabled
-  #Knight: true
-  LightTank: true
   Looter: true
-  Medic: true
   MediumTank: true
-  Naked: true
-  PremiumHardcore: true
   Puncher: true
   Runner: true
+  Terminator: true
+  Worker: true
+  ZombieFinder: true
+  Blocker: true
+  Cleaner: true
+  DogFriend: true
+  HeavyTank: true
+  Medic: true
+  Naked: true
+  PremiumHardcore: true
   ShotBow: true
-  SuperArcher: true
   Teleporter: true
-  Terminator: true
   Tornado: true
   Wizard: true
-  Worker: true
-  ZombieFinder: true
 
 # The cooldown in seconds for some kit items
 Kit-Cooldown: