From 8317fc4ca1d0fea12fd9b2e1548c59fb22374cad Mon Sep 17 00:00:00 2001 From: Indyuce Date: Sun, 27 Feb 2022 11:24:08 +0100 Subject: [PATCH] command api refactor --- .../command/MMOCoreCommandTreeRoot.java | 4 +- .../command/rpg/CoinsCommandTreeNode.java | 57 ++++++++++--------- .../command/rpg/NoteCommandTreeNode.java | 8 +-- .../command/rpg/ReloadCommandTreeNode.java | 2 +- .../rpg/admin/AdminCommandTreeNode.java | 2 +- .../rpg/admin/AttributeCommandTreeNode.java | 4 +- .../rpg/admin/ClassCommandTreeNode.java | 4 +- .../rpg/admin/ExperienceCommandTreeNode.java | 4 +- .../rpg/admin/ForceClassCommandTreeNode.java | 4 +- .../admin/HideActionBarCommandTreeNode.java | 4 +- .../rpg/admin/InfoCommandTreeNode.java | 4 +- .../rpg/admin/LevelCommandTreeNode.java | 4 +- .../rpg/admin/NoCooldownCommandTreeNode.java | 4 +- .../rpg/admin/PointsCommandTreeNode.java | 4 +- .../rpg/admin/ResetCommandTreeNode.java | 4 +- .../rpg/admin/ResourceCommandTreeNode.java | 4 +- .../rpg/booster/BoosterCommandTreeNode.java | 2 +- .../rpg/booster/CreateCommandTreeNode.java | 4 +- .../rpg/booster/ListCommandTreeNode.java | 2 +- .../rpg/booster/RemoveCommandTreeNode.java | 4 +- .../rpg/debug/DebugCommandTreeNode.java | 2 +- .../debug/StatModifiersCommandTreeNode.java | 4 +- .../rpg/debug/StatValueCommandTreeNode.java | 4 +- .../rpg/quest/CancelCommandTreeNode.java | 4 +- .../rpg/quest/FinishCommandTreeNode.java | 4 +- .../rpg/quest/QuestCommandTreeNode.java | 2 +- .../rpg/quest/StartCommandTreeNode.java | 4 +- .../rpg/waypoint/OpenCommandTreeNode.java | 4 +- .../rpg/waypoint/TeleportCommandTreeNode.java | 6 +- .../rpg/waypoint/UnlockCommandTreeNode.java | 6 +- .../waypoint/WaypointsCommandTreeNode.java | 2 +- 31 files changed, 87 insertions(+), 84 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java b/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java index 70ed75bc..dcefd387 100644 --- a/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java +++ b/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeRoot; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeRoot; +import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.command.rpg.CoinsCommandTreeNode; import net.Indyuce.mmocore.command.rpg.NoteCommandTreeNode; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java index fc8f2636..0e702165 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java @@ -1,44 +1,47 @@ package net.Indyuce.mmocore.command.rpg; import io.lumine.mythic.lib.api.util.SmartGive; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; -import net.Indyuce.mmocore.api.util.item.CurrencyItem; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; +import net.Indyuce.mmocore.api.util.item.CurrencyItemBuilder; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; public class CoinsCommandTreeNode extends CommandTreeNode { - public CoinsCommandTreeNode(CommandTreeNode parent) { - super(parent, "coins"); + public CoinsCommandTreeNode(CommandTreeNode parent) { + super(parent, "coins"); - addParameter(Parameter.PLAYER); - addParameter(Parameter.AMOUNT); - } + addParameter(Parameter.PLAYER); + addParameter(Parameter.AMOUNT); + } - @Override - public CommandResult execute(CommandSender sender, String[] args) { - if (args.length < 3) - return CommandResult.THROW_USAGE; + @Override + public CommandResult execute(CommandSender sender, String[] args) { + if (args.length < 3) + return CommandResult.THROW_USAGE; - Player player = Bukkit.getPlayer(args[1]); - if (player == null) { - sender.sendMessage(ChatColor.RED + "Could not find the player called " + args[1] + "."); - return CommandResult.FAILURE; - } + Player player = Bukkit.getPlayer(args[1]); + if (player == null) { + sender.sendMessage(ChatColor.RED + "Could not find the player called " + args[1] + "."); + return CommandResult.FAILURE; + } - int amount; - try { - amount = Integer.parseInt(args[2]); - } catch (Exception e) { - sender.sendMessage(ChatColor.RED + args[2] + " is not a valid number."); - return CommandResult.FAILURE; - } + int amount; + try { + amount = Integer.parseInt(args[2]); + } catch (Exception e) { + sender.sendMessage(ChatColor.RED + args[2] + " is not a valid number."); + return CommandResult.FAILURE; + } - new SmartGive(player).give(new CurrencyItem("GOLD_COIN", 1, amount).build()); - return CommandResult.SUCCESS; - } + ItemStack coins = new CurrencyItemBuilder("GOLD_COIN", 1).build(); + coins.setAmount(amount); + new SmartGive(player).give(coins); + return CommandResult.SUCCESS; + } } diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java index 19b85802..74c88e3f 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java @@ -7,10 +7,10 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.Indyuce.mmocore.api.util.item.CurrencyItem; +import net.Indyuce.mmocore.api.util.item.CurrencyItemBuilder; import io.lumine.mythic.lib.api.util.SmartGive; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class NoteCommandTreeNode extends CommandTreeNode { public NoteCommandTreeNode(CommandTreeNode parent) { @@ -40,7 +40,7 @@ public class NoteCommandTreeNode extends CommandTreeNode { return CommandResult.FAILURE; } - new SmartGive(player).give(new CurrencyItem("NOTE", worth).build()); + new SmartGive(player).give(new CurrencyItemBuilder("NOTE", worth).build()); return CommandResult.SUCCESS; } } diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java index f964d556..ba033ff7 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java @@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.CommandTreeNode; public class ReloadCommandTreeNode extends CommandTreeNode { public ReloadCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java index 5db6d11c..6065fce1 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.command.rpg.admin; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.CommandTreeNode; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource; import org.bukkit.command.CommandSender; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java index 4679d447..c1682b00 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class AttributeCommandTreeNode extends CommandTreeNode { public AttributeCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java index a2c122fc..4328fa8a 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.SavedClassInformation; import net.Indyuce.mmocore.command.CommandVerbose; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class ClassCommandTreeNode extends CommandTreeNode { public ClassCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java index 523c21dc..b556d3d7 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command.rpg.admin; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.command.CommandVerbose; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java index 58cdccc2..17bdcbce 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java @@ -9,8 +9,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.PlayerClass; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class ForceClassCommandTreeNode extends CommandTreeNode { public ForceClassCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java index a72c6865..0b94207c 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command.rpg.admin; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmocore.api.player.PlayerActivity; import net.Indyuce.mmocore.api.player.PlayerData; import org.bukkit.Bukkit; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java index 03c6928e..4b26626e 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class InfoCommandTreeNode extends CommandTreeNode { public InfoCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java index 7d3d8dee..512c187a 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java @@ -14,8 +14,8 @@ import net.Indyuce.mmocore.experience.PlayerProfessions; import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class LevelCommandTreeNode extends CommandTreeNode { public LevelCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java index 29698e91..ad41fde2 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java @@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class NoCooldownCommandTreeNode extends CommandTreeNode { public NoCooldownCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java index 8ef7c449..a240c997 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java @@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class PointsCommandTreeNode extends CommandTreeNode { private final String type; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java index c79b489f..de2b6824 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; import net.Indyuce.mmocore.command.CommandVerbose; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class ResetCommandTreeNode extends CommandTreeNode { public ResetCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java index 94f440ad..9f453a35 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command.rpg.admin; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource; import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java index e837758c..ec893da0 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.booster; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.CommandTreeNode; public class BoosterCommandTreeNode extends CommandTreeNode { public BoosterCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java index 09ad2d68..99b0742d 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.experience.Booster; import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class CreateCommandTreeNode extends CommandTreeNode { public CreateCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java index 55da16af..ecaba7d3 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java @@ -8,7 +8,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.experience.Booster; import net.Indyuce.mmocore.api.util.math.format.DelayFormat; import io.lumine.mythic.lib.MythicLib; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.CommandTreeNode; public class ListCommandTreeNode extends CommandTreeNode { public ListCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java index 08801ec2..03ce630f 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.command.CommandSender; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.experience.Booster; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class RemoveCommandTreeNode extends CommandTreeNode { public RemoveCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java index c488afb7..f077d10e 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.command.rpg.debug; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.CommandTreeNode; public class DebugCommandTreeNode extends CommandTreeNode { public static final String commandPrefix = ChatColor.YELLOW + "[" + ChatColor.RED + "DEBUG" + ChatColor.GOLD + "] " + ChatColor.RESET; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java index 4dd79cb9..38de283c 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java @@ -2,8 +2,8 @@ package net.Indyuce.mmocore.command.rpg.debug; import io.lumine.mythic.lib.api.stat.StatInstance; import io.lumine.mythic.lib.api.stat.modifier.StatModifier; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; import org.bukkit.ChatColor; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java index dc4683a5..f13d42a4 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class StatValueCommandTreeNode extends CommandTreeNode { public StatValueCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java index 8d38c1fb..1556da28 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java @@ -7,8 +7,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.PlayerQuests; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class CancelCommandTreeNode extends CommandTreeNode { public CancelCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/FinishCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/FinishCommandTreeNode.java index f44ed586..5514bfbb 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/FinishCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/FinishCommandTreeNode.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command.rpg.quest; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.PlayerQuests; import org.bukkit.Bukkit; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java index 4a09c09c..866b6981 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.quest; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.CommandTreeNode; public class QuestCommandTreeNode extends CommandTreeNode { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java index e56e853e..079c262c 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.PlayerQuests; import net.Indyuce.mmocore.api.quest.Quest; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class StartCommandTreeNode extends CommandTreeNode { public StartCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java index 7db30c5d..84f1ac91 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.manager.InventoryManager; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class OpenCommandTreeNode extends CommandTreeNode { public OpenCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java index 1a79f48b..9b78c351 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java @@ -1,9 +1,9 @@ package net.Indyuce.mmocore.command.rpg.waypoint; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.Waypoint; +import net.Indyuce.mmocore.waypoint.Waypoint; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java index 4a09e359..a33e7a30 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java @@ -6,10 +6,10 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.Waypoint; +import net.Indyuce.mmocore.waypoint.Waypoint; import net.Indyuce.mmocore.api.player.PlayerData; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; -import io.lumine.mythic.lib.commands.mmolib.api.Parameter; +import io.lumine.mythic.lib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.Parameter; public class UnlockCommandTreeNode extends CommandTreeNode { public UnlockCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java index 5ef0090a..839f2995 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.waypoint; import org.bukkit.command.CommandSender; -import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode; +import io.lumine.mythic.lib.command.api.CommandTreeNode; public class WaypointsCommandTreeNode extends CommandTreeNode { public WaypointsCommandTreeNode(CommandTreeNode parent) {