From 45540f3782d474fa14563d4e394d6e7bec6f1eb9 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Thu, 10 Nov 2022 17:07:39 +0100 Subject: [PATCH] Skill tree folder renamed --- .../src/main/java/net/Indyuce/mmocore/MMOCore.java | 4 ++-- .../Indyuce/mmocore/command/SkillTreeCommand.java | 2 +- .../net/Indyuce/mmocore/manager/ConfigManager.java | 12 ++++++------ .../Indyuce/mmocore/manager/SkillTreeManager.java | 2 +- MMOCore-Dist/src/main/resources/default/commands.yml | 4 ++-- .../default/{skilltree => skill-trees}/combat.yml | 0 .../default/{skilltree => skill-trees}/general.yml | 0 .../{skilltree => skill-trees}/mage-arcane-mage.yml | 0 .../{skilltree => skill-trees}/rogue-marksman.yml | 0 .../{skilltree => skill-trees}/warrior-paladin.yml | 0 10 files changed, 12 insertions(+), 12 deletions(-) rename MMOCore-Dist/src/main/resources/default/{skilltree => skill-trees}/combat.yml (100%) rename MMOCore-Dist/src/main/resources/default/{skilltree => skill-trees}/general.yml (100%) rename MMOCore-Dist/src/main/resources/default/{skilltree => skill-trees}/mage-arcane-mage.yml (100%) rename MMOCore-Dist/src/main/resources/default/{skilltree => skill-trees}/rogue-marksman.yml (100%) rename MMOCore-Dist/src/main/resources/default/{skilltree => skill-trees}/warrior-paladin.yml (100%) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/MMOCore.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/MMOCore.java index 6cc0b87b..6b8864c8 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/MMOCore.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/MMOCore.java @@ -277,8 +277,8 @@ public class MMOCore extends JavaPlugin { commandMap.register("mmocore", new PartyCommand(config.getConfigurationSection("party"))); if (config.contains("guild")) commandMap.register("mmocore", new GuildCommand(config.getConfigurationSection("guild"))); - if (config.contains("skill-tree")) - commandMap.register("mmocore", new SkillTreeCommand(config.getConfigurationSection("skill-tree"))); + if (config.contains("skill-trees")) + commandMap.register("mmocore", new SkillTreeCommand(config.getConfigurationSection("skill-trees"))); if (hasEconomy() && economy.isValid()) { if (config.contains("withdraw")) commandMap.register("mmocore", new WithdrawCommand(config.getConfigurationSection("withdraw"))); diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/SkillTreeCommand.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/SkillTreeCommand.java index 2fd40c25..9fca6e5e 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/SkillTreeCommand.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/SkillTreeCommand.java @@ -25,7 +25,7 @@ public class SkillTreeCommand extends BukkitCommand { if (!(sender instanceof Player player)) return false; PlayerData data = PlayerData.get(player); - MMOCommandEvent event = new MMOCommandEvent(data, "skilltree"); + MMOCommandEvent event = new MMOCommandEvent(data, "skilltrees"); Bukkit.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) return true; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java index 7165a728..91d83238 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java @@ -76,12 +76,12 @@ public class ConfigManager { loadDefaultFile("expcurves", "mining.txt"); } - if(!new File(MMOCore.plugin.getDataFolder()+"/skilltree").exists()) { - loadDefaultFile("skilltree","combat.yml"); - loadDefaultFile("skilltree","mage-arcane-mage.yml"); - loadDefaultFile("skilltree","rogue-marksman.yml"); - loadDefaultFile("skilltree","warrior-paladin.yml"); - loadDefaultFile("skilltree","general.yml"); + if(!new File(MMOCore.plugin.getDataFolder()+"/skill-trees").exists()) { + loadDefaultFile("skill-trees","combat.yml"); + loadDefaultFile("skill-trees","mage-arcane-mage.yml"); + loadDefaultFile("skill-trees","rogue-marksman.yml"); + loadDefaultFile("skill-trees","warrior-paladin.yml"); + loadDefaultFile("skill-trees","general.yml"); } diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillTreeManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillTreeManager.java index 9d25125e..be55981e 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillTreeManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillTreeManager.java @@ -57,7 +57,7 @@ public class SkillTreeManager extends MMOCoreRegister { public void initialize(boolean clearBefore) { if (clearBefore) registered.clear(); - File file = new File(MMOCore.plugin.getDataFolder() + "/skilltree"); + File file = new File(MMOCore.plugin.getDataFolder() + "/skill-trees"); if (!file.exists()) file.mkdirs(); load(file); diff --git a/MMOCore-Dist/src/main/resources/default/commands.yml b/MMOCore-Dist/src/main/resources/default/commands.yml index 4533d9d4..618cd337 100644 --- a/MMOCore-Dist/src/main/resources/default/commands.yml +++ b/MMOCore-Dist/src/main/resources/default/commands.yml @@ -28,8 +28,8 @@ guild: withdraw: main: "withdraw" aliases: ["w"] -skill-tree: - main: "skilltree" +skill-trees: + main: "skilltrees" aliase: ["st"] deposit: main: "deposit" diff --git a/MMOCore-Dist/src/main/resources/default/skilltree/combat.yml b/MMOCore-Dist/src/main/resources/default/skill-trees/combat.yml similarity index 100% rename from MMOCore-Dist/src/main/resources/default/skilltree/combat.yml rename to MMOCore-Dist/src/main/resources/default/skill-trees/combat.yml diff --git a/MMOCore-Dist/src/main/resources/default/skilltree/general.yml b/MMOCore-Dist/src/main/resources/default/skill-trees/general.yml similarity index 100% rename from MMOCore-Dist/src/main/resources/default/skilltree/general.yml rename to MMOCore-Dist/src/main/resources/default/skill-trees/general.yml diff --git a/MMOCore-Dist/src/main/resources/default/skilltree/mage-arcane-mage.yml b/MMOCore-Dist/src/main/resources/default/skill-trees/mage-arcane-mage.yml similarity index 100% rename from MMOCore-Dist/src/main/resources/default/skilltree/mage-arcane-mage.yml rename to MMOCore-Dist/src/main/resources/default/skill-trees/mage-arcane-mage.yml diff --git a/MMOCore-Dist/src/main/resources/default/skilltree/rogue-marksman.yml b/MMOCore-Dist/src/main/resources/default/skill-trees/rogue-marksman.yml similarity index 100% rename from MMOCore-Dist/src/main/resources/default/skilltree/rogue-marksman.yml rename to MMOCore-Dist/src/main/resources/default/skill-trees/rogue-marksman.yml diff --git a/MMOCore-Dist/src/main/resources/default/skilltree/warrior-paladin.yml b/MMOCore-Dist/src/main/resources/default/skill-trees/warrior-paladin.yml similarity index 100% rename from MMOCore-Dist/src/main/resources/default/skilltree/warrior-paladin.yml rename to MMOCore-Dist/src/main/resources/default/skill-trees/warrior-paladin.yml