diff --git a/pom.xml b/pom.xml index 862b0ec..b8f9de4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ mc.promcteam ProMCCore - 1.0-ALPHA + 1.0.1-ALPHA @@ -17,6 +17,31 @@ 8 + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + prepare-package + + replace + + + + + ${project.build.directory} + + **/*.yml + + + + %PROJECT_VERSION% + ${project.version} + + + + diff --git a/src/main/java/su/nexmedia/engine/NexDataPlugin.java b/src/main/java/mc/promcteam/engine/NexDataPlugin.java similarity index 77% rename from src/main/java/su/nexmedia/engine/NexDataPlugin.java rename to src/main/java/mc/promcteam/engine/NexDataPlugin.java index bc3e8af..ddc44cc 100644 --- a/src/main/java/su/nexmedia/engine/NexDataPlugin.java +++ b/src/main/java/mc/promcteam/engine/NexDataPlugin.java @@ -1,11 +1,10 @@ -package su.nexmedia.engine; +package mc.promcteam.engine; +import mc.promcteam.engine.data.IDataHandler; +import mc.promcteam.engine.data.users.IAbstractUser; +import mc.promcteam.engine.data.users.IUserManager; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.data.IDataHandler; -import su.nexmedia.engine.data.users.IAbstractUser; -import su.nexmedia.engine.data.users.IUserManager; - public abstract class NexDataPlugin

, U extends IAbstractUser

> extends NexPlugin

{ protected IUserManager userManager; diff --git a/src/main/java/su/nexmedia/engine/NexEngine.java b/src/main/java/mc/promcteam/engine/NexEngine.java similarity index 81% rename from src/main/java/su/nexmedia/engine/NexEngine.java rename to src/main/java/mc/promcteam/engine/NexEngine.java index 0dbbf2f..40a7996 100644 --- a/src/main/java/su/nexmedia/engine/NexEngine.java +++ b/src/main/java/mc/promcteam/engine/NexEngine.java @@ -1,8 +1,18 @@ -package su.nexmedia.engine; +package mc.promcteam.engine; import java.util.HashSet; import java.util.Set; +import mc.promcteam.engine.core.Version; +import mc.promcteam.engine.core.config.CoreConfig; +import mc.promcteam.engine.core.config.CoreLang; +import mc.promcteam.engine.hooks.Hooks; +import mc.promcteam.engine.hooks.external.MythicMobsHK; +import mc.promcteam.engine.hooks.external.VaultHK; +import mc.promcteam.engine.hooks.external.WorldGuardHK; +import mc.promcteam.engine.hooks.external.citizens.CitizensHK; +import mc.promcteam.engine.nms.NMS; +import mc.promcteam.engine.nms.packets.PacketManager; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -10,23 +20,13 @@ import org.bukkit.plugin.PluginManager; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.commands.api.IGeneralCommand; -import su.nexmedia.engine.commands.list.Base64Command; -import su.nexmedia.engine.core.Version; -import su.nexmedia.engine.core.config.CoreConfig; -import su.nexmedia.engine.core.config.CoreLang; -import su.nexmedia.engine.hooks.HookManager; -import su.nexmedia.engine.hooks.Hooks; -import su.nexmedia.engine.hooks.external.MythicMobsHK; -import su.nexmedia.engine.hooks.external.VaultHK; -import su.nexmedia.engine.hooks.external.WorldGuardHK; -import su.nexmedia.engine.hooks.external.citizens.CitizensHK; -import su.nexmedia.engine.manager.editor.EditorManager; -import su.nexmedia.engine.nms.NMS; -import su.nexmedia.engine.nms.packets.PacketManager; -import su.nexmedia.engine.utils.Reflex; -import su.nexmedia.engine.utils.actions.ActionsManager; -import su.nexmedia.engine.utils.craft.CraftManager; +import mc.promcteam.engine.commands.api.IGeneralCommand; +import mc.promcteam.engine.commands.list.Base64Command; +import mc.promcteam.engine.hooks.HookManager; +import mc.promcteam.engine.manager.editor.EditorManager; +import mc.promcteam.engine.utils.Reflex; +import mc.promcteam.engine.utils.actions.ActionsManager; +import mc.promcteam.engine.utils.craft.CraftManager; public class NexEngine extends NexPlugin implements Listener { diff --git a/src/main/java/su/nexmedia/engine/NexPlugin.java b/src/main/java/mc/promcteam/engine/NexPlugin.java similarity index 88% rename from src/main/java/su/nexmedia/engine/NexPlugin.java rename to src/main/java/mc/promcteam/engine/NexPlugin.java index 76e31cc..5fab752 100644 --- a/src/main/java/su/nexmedia/engine/NexPlugin.java +++ b/src/main/java/mc/promcteam/engine/NexPlugin.java @@ -1,8 +1,16 @@ -package su.nexmedia.engine; +package mc.promcteam.engine; import java.util.List; import java.util.logging.Logger; +import mc.promcteam.engine.commands.CommandManager; +import mc.promcteam.engine.core.config.CoreLang; +import mc.promcteam.engine.hooks.external.MythicMobsHK; +import mc.promcteam.engine.hooks.external.VaultHK; +import mc.promcteam.engine.hooks.external.WorldGuardHK; +import mc.promcteam.engine.hooks.external.citizens.CitizensHK; +import mc.promcteam.engine.nms.NMS; +import mc.promcteam.engine.nms.packets.PacketManager; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.inventory.InventoryHolder; @@ -11,27 +19,19 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.commands.CommandManager; -import su.nexmedia.engine.commands.api.IGeneralCommand; -import su.nexmedia.engine.commands.list.MainCommand; -import su.nexmedia.engine.config.ConfigManager; -import su.nexmedia.engine.config.api.IConfigTemplate; -import su.nexmedia.engine.core.config.CoreLang; -import su.nexmedia.engine.hooks.HookManager; -import su.nexmedia.engine.hooks.NHook; -import su.nexmedia.engine.hooks.external.MythicMobsHK; -import su.nexmedia.engine.hooks.external.VaultHK; -import su.nexmedia.engine.hooks.external.WorldGuardHK; -import su.nexmedia.engine.hooks.external.citizens.CitizensHK; -import su.nexmedia.engine.manager.api.Loggable; -import su.nexmedia.engine.manager.api.gui.NGUI; -import su.nexmedia.engine.manager.editor.EditorHandler; -import su.nexmedia.engine.modules.ModuleManager; -import su.nexmedia.engine.nms.NMS; -import su.nexmedia.engine.nms.packets.PacketManager; -import su.nexmedia.engine.utils.actions.ActionsManager; -import su.nexmedia.engine.utils.actions.Parametized; -import su.nexmedia.engine.utils.craft.CraftManager; +import mc.promcteam.engine.commands.api.IGeneralCommand; +import mc.promcteam.engine.commands.list.MainCommand; +import mc.promcteam.engine.config.ConfigManager; +import mc.promcteam.engine.config.api.IConfigTemplate; +import mc.promcteam.engine.hooks.HookManager; +import mc.promcteam.engine.hooks.NHook; +import mc.promcteam.engine.manager.api.Loggable; +import mc.promcteam.engine.manager.api.gui.NGUI; +import mc.promcteam.engine.manager.editor.EditorHandler; +import mc.promcteam.engine.modules.ModuleManager; +import mc.promcteam.engine.utils.actions.ActionsManager; +import mc.promcteam.engine.utils.actions.Parametized; +import mc.promcteam.engine.utils.craft.CraftManager; public abstract class NexPlugin

> extends JavaPlugin implements Loggable { diff --git a/src/main/java/su/nexmedia/engine/commands/CommandManager.java b/src/main/java/mc/promcteam/engine/commands/CommandManager.java similarity index 80% rename from src/main/java/su/nexmedia/engine/commands/CommandManager.java rename to src/main/java/mc/promcteam/engine/commands/CommandManager.java index 7f264f9..09c17aa 100644 --- a/src/main/java/su/nexmedia/engine/commands/CommandManager.java +++ b/src/main/java/mc/promcteam/engine/commands/CommandManager.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.commands; +package mc.promcteam.engine.commands; import java.util.HashSet; import java.util.Set; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.IGeneralCommand; -import su.nexmedia.engine.commands.list.AboutCommand; -import su.nexmedia.engine.commands.list.EditorCommand; -import su.nexmedia.engine.commands.list.HelpCommand; -import su.nexmedia.engine.commands.list.MainCommand; -import su.nexmedia.engine.commands.list.ReloadCommand; -import su.nexmedia.engine.manager.api.Loadable; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.commands.api.IGeneralCommand; +import mc.promcteam.engine.commands.list.AboutCommand; +import mc.promcteam.engine.commands.list.EditorCommand; +import mc.promcteam.engine.commands.list.HelpCommand; +import mc.promcteam.engine.commands.list.MainCommand; +import mc.promcteam.engine.commands.list.ReloadCommand; +import mc.promcteam.engine.manager.api.Loadable; public class CommandManager

> implements Loadable { diff --git a/src/main/java/su/nexmedia/engine/commands/CommandRegister.java b/src/main/java/mc/promcteam/engine/commands/CommandRegister.java similarity index 96% rename from src/main/java/su/nexmedia/engine/commands/CommandRegister.java rename to src/main/java/mc/promcteam/engine/commands/CommandRegister.java index cfcd3ca..1183e23 100644 --- a/src/main/java/su/nexmedia/engine/commands/CommandRegister.java +++ b/src/main/java/mc/promcteam/engine/commands/CommandRegister.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.commands; +package mc.promcteam.engine.commands; import java.lang.reflect.Method; import java.util.Arrays; @@ -20,9 +20,9 @@ import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.IGeneralCommand; -import su.nexmedia.engine.utils.Reflex; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.commands.api.IGeneralCommand; +import mc.promcteam.engine.utils.Reflex; public class CommandRegister extends Command implements PluginIdentifiableCommand { diff --git a/src/main/java/su/nexmedia/engine/commands/api/IAbstractCommand.java b/src/main/java/mc/promcteam/engine/commands/api/IAbstractCommand.java similarity index 97% rename from src/main/java/su/nexmedia/engine/commands/api/IAbstractCommand.java rename to src/main/java/mc/promcteam/engine/commands/api/IAbstractCommand.java index cbfa92d..6a55969 100644 --- a/src/main/java/su/nexmedia/engine/commands/api/IAbstractCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/api/IAbstractCommand.java @@ -1,15 +1,15 @@ -package su.nexmedia.engine.commands.api; +package mc.promcteam.engine.commands.api; import java.util.Collections; import java.util.List; +import mc.promcteam.engine.NexPlugin; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.CollectionsUT; +import mc.promcteam.engine.utils.CollectionsUT; public abstract class IAbstractCommand

> { diff --git a/src/main/java/su/nexmedia/engine/commands/api/IGeneralCommand.java b/src/main/java/mc/promcteam/engine/commands/api/IGeneralCommand.java similarity index 96% rename from src/main/java/su/nexmedia/engine/commands/api/IGeneralCommand.java rename to src/main/java/mc/promcteam/engine/commands/api/IGeneralCommand.java index 3600a85..0eba23d 100644 --- a/src/main/java/su/nexmedia/engine/commands/api/IGeneralCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/api/IGeneralCommand.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.commands.api; +package mc.promcteam.engine.commands.api; import java.util.ArrayList; import java.util.Arrays; @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; +import mc.promcteam.engine.NexPlugin; import org.apache.commons.lang.ArrayUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -18,8 +19,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.StringUT; +import mc.promcteam.engine.utils.StringUT; public abstract class IGeneralCommand

> extends IAbstractCommand

implements CommandExecutor, TabExecutor { diff --git a/src/main/java/su/nexmedia/engine/commands/api/ISubCommand.java b/src/main/java/mc/promcteam/engine/commands/api/ISubCommand.java similarity index 92% rename from src/main/java/su/nexmedia/engine/commands/api/ISubCommand.java rename to src/main/java/mc/promcteam/engine/commands/api/ISubCommand.java index e784c0f..f3d8730 100644 --- a/src/main/java/su/nexmedia/engine/commands/api/ISubCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/api/ISubCommand.java @@ -1,12 +1,11 @@ -package su.nexmedia.engine.commands.api; +package mc.promcteam.engine.commands.api; import java.util.List; +import mc.promcteam.engine.NexPlugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; - public abstract class ISubCommand

> extends IAbstractCommand

{ protected IGeneralCommand

parent; diff --git a/src/main/java/su/nexmedia/engine/commands/list/AboutCommand.java b/src/main/java/mc/promcteam/engine/commands/list/AboutCommand.java similarity index 83% rename from src/main/java/su/nexmedia/engine/commands/list/AboutCommand.java rename to src/main/java/mc/promcteam/engine/commands/list/AboutCommand.java index 0bd8cbb..20f810a 100644 --- a/src/main/java/su/nexmedia/engine/commands/list/AboutCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/list/AboutCommand.java @@ -1,15 +1,15 @@ -package su.nexmedia.engine.commands.list; +package mc.promcteam.engine.commands.list; import java.util.Arrays; import java.util.List; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.commands.api.ISubCommand; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.ISubCommand; -import su.nexmedia.engine.utils.StringUT; +import mc.promcteam.engine.utils.StringUT; public class AboutCommand

> extends ISubCommand

{ diff --git a/src/main/java/su/nexmedia/engine/commands/list/Base64Command.java b/src/main/java/mc/promcteam/engine/commands/list/Base64Command.java similarity index 84% rename from src/main/java/su/nexmedia/engine/commands/list/Base64Command.java rename to src/main/java/mc/promcteam/engine/commands/list/Base64Command.java index 8f827f1..8f0ce96 100644 --- a/src/main/java/su/nexmedia/engine/commands/list/Base64Command.java +++ b/src/main/java/mc/promcteam/engine/commands/list/Base64Command.java @@ -1,14 +1,14 @@ -package su.nexmedia.engine.commands.list; +package mc.promcteam.engine.commands.list; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.commands.api.ISubCommand; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.commands.api.ISubCommand; -import su.nexmedia.engine.utils.ClickText; -import su.nexmedia.engine.utils.ItemUT; +import mc.promcteam.engine.utils.ClickText; +import mc.promcteam.engine.utils.ItemUT; public class Base64Command extends ISubCommand { diff --git a/src/main/java/su/nexmedia/engine/commands/list/EditorCommand.java b/src/main/java/mc/promcteam/engine/commands/list/EditorCommand.java similarity index 84% rename from src/main/java/su/nexmedia/engine/commands/list/EditorCommand.java rename to src/main/java/mc/promcteam/engine/commands/list/EditorCommand.java index d24ccc0..8ee84aa 100644 --- a/src/main/java/su/nexmedia/engine/commands/list/EditorCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/list/EditorCommand.java @@ -1,11 +1,11 @@ -package su.nexmedia.engine.commands.list; +package mc.promcteam.engine.commands.list; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.ISubCommand; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.commands.api.ISubCommand; public class EditorCommand

> extends ISubCommand

{ diff --git a/src/main/java/su/nexmedia/engine/commands/list/HelpCommand.java b/src/main/java/mc/promcteam/engine/commands/list/HelpCommand.java similarity index 87% rename from src/main/java/su/nexmedia/engine/commands/list/HelpCommand.java rename to src/main/java/mc/promcteam/engine/commands/list/HelpCommand.java index 1daab1b..4f858a3 100644 --- a/src/main/java/su/nexmedia/engine/commands/list/HelpCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/list/HelpCommand.java @@ -1,11 +1,11 @@ -package su.nexmedia.engine.commands.list; +package mc.promcteam.engine.commands.list; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.commands.api.ISubCommand; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.ISubCommand; -import su.nexmedia.engine.utils.StringUT; +import mc.promcteam.engine.utils.StringUT; public class HelpCommand

> extends ISubCommand

{ diff --git a/src/main/java/su/nexmedia/engine/commands/list/MainCommand.java b/src/main/java/mc/promcteam/engine/commands/list/MainCommand.java similarity index 82% rename from src/main/java/su/nexmedia/engine/commands/list/MainCommand.java rename to src/main/java/mc/promcteam/engine/commands/list/MainCommand.java index f8db3f8..25d3ad6 100644 --- a/src/main/java/su/nexmedia/engine/commands/list/MainCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/list/MainCommand.java @@ -1,11 +1,10 @@ -package su.nexmedia.engine.commands.list; +package mc.promcteam.engine.commands.list; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.commands.api.IGeneralCommand; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.IGeneralCommand; - public final class MainCommand

> extends IGeneralCommand

{ public MainCommand(@NotNull P plugin) { diff --git a/src/main/java/su/nexmedia/engine/commands/list/ReloadCommand.java b/src/main/java/mc/promcteam/engine/commands/list/ReloadCommand.java similarity index 84% rename from src/main/java/su/nexmedia/engine/commands/list/ReloadCommand.java rename to src/main/java/mc/promcteam/engine/commands/list/ReloadCommand.java index d351a18..72baebb 100644 --- a/src/main/java/su/nexmedia/engine/commands/list/ReloadCommand.java +++ b/src/main/java/mc/promcteam/engine/commands/list/ReloadCommand.java @@ -1,10 +1,10 @@ -package su.nexmedia.engine.commands.list; +package mc.promcteam.engine.commands.list; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.ISubCommand; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.commands.api.ISubCommand; public class ReloadCommand

> extends ISubCommand

{ diff --git a/src/main/java/su/nexmedia/engine/config/ConfigManager.java b/src/main/java/mc/promcteam/engine/config/ConfigManager.java similarity index 95% rename from src/main/java/su/nexmedia/engine/config/ConfigManager.java rename to src/main/java/mc/promcteam/engine/config/ConfigManager.java index c66dcc3..5e80082 100644 --- a/src/main/java/su/nexmedia/engine/config/ConfigManager.java +++ b/src/main/java/mc/promcteam/engine/config/ConfigManager.java @@ -1,15 +1,14 @@ -package su.nexmedia.engine.config; +package mc.promcteam.engine.config; import java.io.File; import java.io.IOException; import java.util.UUID; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.config.api.JYML; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; - public class ConfigManager

> { @NotNull private P plugin; diff --git a/src/main/java/su/nexmedia/engine/config/ResourceExtractor.java b/src/main/java/mc/promcteam/engine/config/ResourceExtractor.java similarity index 98% rename from src/main/java/su/nexmedia/engine/config/ResourceExtractor.java rename to src/main/java/mc/promcteam/engine/config/ResourceExtractor.java index e9f2282..ed887c2 100644 --- a/src/main/java/su/nexmedia/engine/config/ResourceExtractor.java +++ b/src/main/java/mc/promcteam/engine/config/ResourceExtractor.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.config; +package mc.promcteam.engine.config; import java.io.File; import java.io.FileOutputStream; @@ -12,7 +12,7 @@ import org.apache.commons.lang.Validate; import org.bukkit.plugin.java.JavaPlugin; -import su.nexmedia.engine.utils.FileUT; +import mc.promcteam.engine.utils.FileUT; public final class ResourceExtractor { diff --git a/src/main/java/su/nexmedia/engine/config/api/IConfigTemplate.java b/src/main/java/mc/promcteam/engine/config/api/IConfigTemplate.java similarity index 92% rename from src/main/java/su/nexmedia/engine/config/api/IConfigTemplate.java rename to src/main/java/mc/promcteam/engine/config/api/IConfigTemplate.java index fb72c33..6efef0b 100644 --- a/src/main/java/su/nexmedia/engine/config/api/IConfigTemplate.java +++ b/src/main/java/mc/promcteam/engine/config/api/IConfigTemplate.java @@ -1,14 +1,13 @@ -package su.nexmedia.engine.config.api; +package mc.promcteam.engine.config.api; +import mc.promcteam.engine.NexDataPlugin; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.data.StorageType; +import mc.promcteam.engine.modules.IModule; +import mc.promcteam.engine.utils.CollectionsUT; +import mc.promcteam.engine.utils.StringUT; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexDataPlugin; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.data.StorageType; -import su.nexmedia.engine.modules.IModule; -import su.nexmedia.engine.utils.CollectionsUT; -import su.nexmedia.engine.utils.StringUT; - public abstract class IConfigTemplate { protected NexPlugin plugin; diff --git a/src/main/java/mc/promcteam/engine/config/api/ILangMsg.java b/src/main/java/mc/promcteam/engine/config/api/ILangMsg.java new file mode 100644 index 0000000..33ea826 --- /dev/null +++ b/src/main/java/mc/promcteam/engine/config/api/ILangMsg.java @@ -0,0 +1,251 @@ +package mc.promcteam.engine.config.api; + +import mc.promcteam.engine.utils.CollectionsUT; +import mc.promcteam.engine.utils.MsgUT; +import mc.promcteam.engine.utils.StringUT; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.UnaryOperator; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class ILangMsg { + + private static final Pattern PATTERN_MESSAGE = Pattern.compile("(\\{message:)+(.)+?(\\})+(.*?)(\\})?"); + private static final String[] MESSAGE_ARGUMENTS = new String[]{"type", "prefix", "fadeIn", "stay", "fadeOut"}; + private static final Pattern[] PATTERN_ARGUMENTS = new Pattern[MESSAGE_ARGUMENTS.length]; + + static { + for (int i = 0; i < MESSAGE_ARGUMENTS.length; i++) { + PATTERN_ARGUMENTS[i] = Pattern.compile("(~)+(" + MESSAGE_ARGUMENTS[i] + ")+?(:)+(.*?)(;)"); + } + } + + private ILangTemplate template; + private String msgDefault; + private String msgColor; + private String path; + + private OutputType out = OutputType.CHAT; + private boolean isPrefix = true; + private int[] titlesTimes = new int[3]; + + public ILangMsg(@NotNull ILangTemplate template, @NotNull String msg) { + this.template = template; + this.msgDefault = msg; + this.setMsg(msg); + } + + ILangMsg(@NotNull ILangMsg from) { + this.template = from.template; + this.msgDefault = from.getDefaultMsg(); + this.msgColor = from.getMsg(); + this.path = from.getPath(); + this.out = from.out; + this.isPrefix = from.isPrefix; + this.titlesTimes = from.titlesTimes; + } + + @NotNull + public String getPath() { + return this.path; + } + + void setPath(@NotNull String path) { + this.path = path.replace("_", "."); + } + + boolean setArguments(@NotNull String msg) { + Matcher mArgs = PATTERN_MESSAGE.matcher(msg); + if (!mArgs.find()) return false; + + // String with only args + String extract = mArgs.group(0); + String arguments = extract.replace("{message:", "").replace("}", "").trim(); + this.msgColor = msg.replace(extract, ""); + + for (int i = 0; i < MESSAGE_ARGUMENTS.length; i++) { + // Search for flag of this parameter + String argType = MESSAGE_ARGUMENTS[i]; + Pattern pArgVal = PATTERN_ARGUMENTS[i]; + Matcher mArgVal = pArgVal.matcher(arguments); // TODO 200ms + + // Get the flag value + if (mArgVal.find()) { + // Extract only value from all flag string + String argValue = mArgVal.group(4).trim(); + switch (argType) { + case "type": { + this.out = CollectionsUT.getEnum(argValue, OutputType.class); + break; + } + case "prefix": { + this.isPrefix = Boolean.parseBoolean(argValue); + break; + } + case "fadeIn": { + this.titlesTimes[0] = StringUT.getInteger(argValue, -1); + break; + } + case "stay": { + this.titlesTimes[1] = StringUT.getInteger(argValue, -1); + if (this.titlesTimes[1] < 0) this.titlesTimes[1] = 10000; + break; + } + case "fadeOut": { + this.titlesTimes[2] = StringUT.getInteger(argValue, -1); + break; + } + } + } + } + return true; + } + + @NotNull + public String getDefaultMsg() { + return this.msgDefault; + } + + @NotNull + public String getMsgReady() { + return this.replaceDefaults().apply(this.msgColor); + } + + @NotNull + public String getMsg() { + return this.msgColor; + } + + public void setMsg(@NotNull String msg) { + // When TRUE, then 'msgColor' is already set by this 'msg' value. + if (!this.setArguments(msg)) { + this.msgColor = msg; + } + + // Do not replace colors for JSON message, otherwise it will be broken. + if (!MsgUT.isJSON(msg)) { + this.msgColor = StringUT.color(this.msgColor); + } + } + + @SuppressWarnings("unchecked") + @NotNull + public ILangMsg replace(@NotNull String var, @NotNull Object replacer) { + if (this.isEmpty()) return this; + if (replacer instanceof List) return this.replace(var, (List) replacer); + + return this.replace(str -> str.replace(var, String.valueOf(replacer))); + } + + @NotNull + public ILangMsg replace(@NotNull String var, @NotNull List replacer) { + if (this.isEmpty()) return this; + + StringBuilder builder = new StringBuilder(); + replacer.forEach(rep -> { + if (builder.length() > 0) builder.append("\\n"); + builder.append(rep.toString()); + }); + + return this.replace(str -> str.replace(var, builder.toString())); + } + + @NotNull + public ILangMsg replace(@NotNull UnaryOperator replacer) { + if (this.isEmpty()) return this; + + ILangMsg msgCopy = new ILangMsg(this); + msgCopy.msgColor = StringUT.color(replacer.apply(msgCopy.getMsg())); + return msgCopy; + } + + public boolean isEmpty() { + return (this.out == OutputType.NONE || this.getMsg().isEmpty()); + } + + public void broadcast() { + if (this.isEmpty()) return; + + for (Player player : Bukkit.getServer().getOnlinePlayers()) { + if (player != null) this.send(player); + } + this.send(Bukkit.getServer().getConsoleSender()); + } + + public void send(@NotNull CommandSender sender) { + if (this.isEmpty()) return; + + if (this.out == OutputType.CHAT) { + String prefix = isPrefix ? template.plugin.lang().Prefix.getMsgReady() : ""; + + this.asList().forEach(line -> { + MsgUT.sendWithJSON(sender, prefix + line); + }); + } else if (sender instanceof Player) { + Player player = (Player) sender; + if (this.out == OutputType.ACTION_BAR) { + MsgUT.sendActionBar(player, this.getMsgReady()); + } else if (this.out == OutputType.TITLES) { + List list = this.asList(); + if (list.isEmpty()) return; + + String title = list.get(0); + String subtitle = list.size() > 1 ? list.get(1) : ""; + player.sendTitle(title, subtitle, this.titlesTimes[0], this.titlesTimes[1], this.titlesTimes[2]); + } + } + } + + @NotNull + public List asList() { + String msg = this.getMsgReady(); + if (msg.isEmpty()) return Collections.emptyList(); + + List list = new ArrayList<>(); + for (String line : msg.split("\\\\n")) { + list.add(line.trim()); + } + return list; + } + + /** + * Replaces a raw '\n' new line splitter with a system one. + * + * @return A string with a system new line splitters. + */ + @NotNull + public String normalizeLines() { + StringBuilder text = new StringBuilder(""); + for (String line : this.asList()) { + if (text.length() > 0) text.append("\n"); + text.append(line); + } + return text.toString(); + } + + @NotNull + private UnaryOperator replaceDefaults() { + return str -> { + for (Map.Entry entry : this.template.getCustomPlaceholders().entrySet()) { + str = str.replace(entry.getKey(), entry.getValue()); + } + return str.replace("%plugin%", template.plugin.cfg().pluginName); + }; + } + + public static enum OutputType { + CHAT, + ACTION_BAR, + TITLES, + NONE, + ; + } +} \ No newline at end of file diff --git a/src/main/java/su/nexmedia/engine/config/api/ILangTemplate.java b/src/main/java/mc/promcteam/engine/config/api/ILangTemplate.java similarity index 95% rename from src/main/java/su/nexmedia/engine/config/api/ILangTemplate.java rename to src/main/java/mc/promcteam/engine/config/api/ILangTemplate.java index 14d47b5..5a956c5 100644 --- a/src/main/java/su/nexmedia/engine/config/api/ILangTemplate.java +++ b/src/main/java/mc/promcteam/engine/config/api/ILangTemplate.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.config.api; +package mc.promcteam.engine.config.api; import java.lang.reflect.Field; import java.util.Arrays; @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.StringUT; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.Reflex; -import su.nexmedia.engine.utils.StringUT; +import mc.promcteam.engine.utils.Reflex; public abstract class ILangTemplate { diff --git a/src/main/java/su/nexmedia/engine/config/api/JYML.java b/src/main/java/mc/promcteam/engine/config/api/JYML.java similarity index 95% rename from src/main/java/su/nexmedia/engine/config/api/JYML.java rename to src/main/java/mc/promcteam/engine/config/api/JYML.java index 262220c..6e1c28b 100644 --- a/src/main/java/su/nexmedia/engine/config/api/JYML.java +++ b/src/main/java/mc/promcteam/engine/config/api/JYML.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.config.api; +package mc.promcteam.engine.config.api; import java.io.File; import java.io.FileNotFoundException; @@ -14,6 +14,12 @@ import java.util.TreeMap; import java.util.stream.Collectors; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.manager.api.gui.ContentType; +import mc.promcteam.engine.manager.api.gui.GuiItem; +import mc.promcteam.engine.manager.types.ClickType; +import mc.promcteam.engine.utils.StringUT; import org.bukkit.Color; import org.bukkit.Location; import org.bukkit.Material; @@ -30,21 +36,15 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.manager.api.gui.ContentType; -import su.nexmedia.engine.manager.api.gui.GuiItem; -import su.nexmedia.engine.manager.types.ClickType; -import su.nexmedia.engine.utils.CollectionsUT; -import su.nexmedia.engine.utils.FileUT; -import su.nexmedia.engine.utils.ItemUT; -import su.nexmedia.engine.utils.LocUT; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.ActionManipulator; -import su.nexmedia.engine.utils.constants.JStrings; -import su.nexmedia.engine.utils.craft.api.ICraftRecipe; -import su.nexmedia.engine.utils.craft.api.IFurnaceRecipe; -import su.nexmedia.engine.utils.random.Rnd; +import mc.promcteam.engine.utils.CollectionsUT; +import mc.promcteam.engine.utils.FileUT; +import mc.promcteam.engine.utils.ItemUT; +import mc.promcteam.engine.utils.LocUT; +import mc.promcteam.engine.utils.actions.ActionManipulator; +import mc.promcteam.engine.utils.constants.JStrings; +import mc.promcteam.engine.utils.craft.api.ICraftRecipe; +import mc.promcteam.engine.utils.craft.api.IFurnaceRecipe; +import mc.promcteam.engine.utils.random.Rnd; public class JYML extends YamlConfiguration { diff --git a/src/main/java/su/nexmedia/engine/core/Version.java b/src/main/java/mc/promcteam/engine/core/Version.java similarity index 90% rename from src/main/java/su/nexmedia/engine/core/Version.java rename to src/main/java/mc/promcteam/engine/core/Version.java index 041cb95..eb2be2b 100644 --- a/src/main/java/su/nexmedia/engine/core/Version.java +++ b/src/main/java/mc/promcteam/engine/core/Version.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.core; +package mc.promcteam.engine.core; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.CollectionsUT; +import mc.promcteam.engine.utils.CollectionsUT; public enum Version { diff --git a/src/main/java/su/nexmedia/engine/core/config/CoreConfig.java b/src/main/java/mc/promcteam/engine/core/config/CoreConfig.java similarity index 85% rename from src/main/java/su/nexmedia/engine/core/config/CoreConfig.java rename to src/main/java/mc/promcteam/engine/core/config/CoreConfig.java index 902ea97..eac24f9 100644 --- a/src/main/java/su/nexmedia/engine/core/config/CoreConfig.java +++ b/src/main/java/mc/promcteam/engine/core/config/CoreConfig.java @@ -1,13 +1,13 @@ -package su.nexmedia.engine.core.config; +package mc.promcteam.engine.core.config; import java.util.HashMap; import java.util.Map; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.config.api.IConfigTemplate; -import su.nexmedia.engine.utils.StringUT; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.config.api.IConfigTemplate; +import mc.promcteam.engine.utils.StringUT; public class CoreConfig extends IConfigTemplate { diff --git a/src/main/java/su/nexmedia/engine/core/config/CoreLang.java b/src/main/java/mc/promcteam/engine/core/config/CoreLang.java similarity index 97% rename from src/main/java/su/nexmedia/engine/core/config/CoreLang.java rename to src/main/java/mc/promcteam/engine/core/config/CoreLang.java index 335bb19..5420172 100644 --- a/src/main/java/su/nexmedia/engine/core/config/CoreLang.java +++ b/src/main/java/mc/promcteam/engine/core/config/CoreLang.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.core.config; +package mc.promcteam.engine.core.config; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -7,11 +7,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.ILangMsg; -import su.nexmedia.engine.config.api.ILangTemplate; -import su.nexmedia.engine.utils.StringUT; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.config.api.ILangMsg; +import mc.promcteam.engine.config.api.ILangTemplate; +import mc.promcteam.engine.utils.StringUT; public class CoreLang extends ILangTemplate { diff --git a/src/main/java/su/nexmedia/engine/data/DataTypes.java b/src/main/java/mc/promcteam/engine/data/DataTypes.java similarity index 98% rename from src/main/java/su/nexmedia/engine/data/DataTypes.java rename to src/main/java/mc/promcteam/engine/data/DataTypes.java index d6de5a3..ee34853 100644 --- a/src/main/java/su/nexmedia/engine/data/DataTypes.java +++ b/src/main/java/mc/promcteam/engine/data/DataTypes.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.data; +package mc.promcteam.engine.data; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/su/nexmedia/engine/data/IDataHandler.java b/src/main/java/mc/promcteam/engine/data/IDataHandler.java similarity index 98% rename from src/main/java/su/nexmedia/engine/data/IDataHandler.java rename to src/main/java/mc/promcteam/engine/data/IDataHandler.java index 6e11db6..f126b47 100644 --- a/src/main/java/su/nexmedia/engine/data/IDataHandler.java +++ b/src/main/java/mc/promcteam/engine/data/IDataHandler.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.data; +package mc.promcteam.engine.data; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -17,6 +17,8 @@ import java.util.UUID; import java.util.function.Function; +import mc.promcteam.engine.data.serial.ItemStackSerializer; +import mc.promcteam.engine.data.users.IAbstractUser; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.data.serial.ItemStackSerializer; -import su.nexmedia.engine.data.users.IAbstractUser; +import mc.promcteam.engine.NexPlugin; public abstract class IDataHandler

, U extends IAbstractUser

> { diff --git a/src/main/java/su/nexmedia/engine/data/StorageType.java b/src/main/java/mc/promcteam/engine/data/StorageType.java similarity index 88% rename from src/main/java/su/nexmedia/engine/data/StorageType.java rename to src/main/java/mc/promcteam/engine/data/StorageType.java index 4bd47fc..e519793 100644 --- a/src/main/java/su/nexmedia/engine/data/StorageType.java +++ b/src/main/java/mc/promcteam/engine/data/StorageType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.data; +package mc.promcteam.engine.data; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/su/nexmedia/engine/data/event/EngineUserCreatedEvent.java b/src/main/java/mc/promcteam/engine/data/event/EngineUserCreatedEvent.java similarity index 66% rename from src/main/java/su/nexmedia/engine/data/event/EngineUserCreatedEvent.java rename to src/main/java/mc/promcteam/engine/data/event/EngineUserCreatedEvent.java index fa59193..85e63f8 100644 --- a/src/main/java/su/nexmedia/engine/data/event/EngineUserCreatedEvent.java +++ b/src/main/java/mc/promcteam/engine/data/event/EngineUserCreatedEvent.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.data.event; +package mc.promcteam.engine.data.event; +import mc.promcteam.engine.data.users.IAbstractUser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexDataPlugin; -import su.nexmedia.engine.data.users.IAbstractUser; +import mc.promcteam.engine.NexDataPlugin; public class EngineUserCreatedEvent

, U extends IAbstractUser

> extends EngineUserEvent { diff --git a/src/main/java/su/nexmedia/engine/data/event/EngineUserEvent.java b/src/main/java/mc/promcteam/engine/data/event/EngineUserEvent.java similarity index 70% rename from src/main/java/su/nexmedia/engine/data/event/EngineUserEvent.java rename to src/main/java/mc/promcteam/engine/data/event/EngineUserEvent.java index 5111404..402f5e9 100644 --- a/src/main/java/su/nexmedia/engine/data/event/EngineUserEvent.java +++ b/src/main/java/mc/promcteam/engine/data/event/EngineUserEvent.java @@ -1,10 +1,10 @@ -package su.nexmedia.engine.data.event; +package mc.promcteam.engine.data.event; +import mc.promcteam.engine.data.users.IAbstractUser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexDataPlugin; -import su.nexmedia.engine.data.users.IAbstractUser; -import su.nexmedia.engine.manager.api.event.IEvent; +import mc.promcteam.engine.NexDataPlugin; +import mc.promcteam.engine.manager.api.event.IEvent; public abstract class EngineUserEvent

, U extends IAbstractUser

> extends IEvent { diff --git a/src/main/java/su/nexmedia/engine/data/event/EngineUserLoadEvent.java b/src/main/java/mc/promcteam/engine/data/event/EngineUserLoadEvent.java similarity index 66% rename from src/main/java/su/nexmedia/engine/data/event/EngineUserLoadEvent.java rename to src/main/java/mc/promcteam/engine/data/event/EngineUserLoadEvent.java index 9a612dd..e311612 100644 --- a/src/main/java/su/nexmedia/engine/data/event/EngineUserLoadEvent.java +++ b/src/main/java/mc/promcteam/engine/data/event/EngineUserLoadEvent.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.data.event; +package mc.promcteam.engine.data.event; +import mc.promcteam.engine.data.users.IAbstractUser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexDataPlugin; -import su.nexmedia.engine.data.users.IAbstractUser; +import mc.promcteam.engine.NexDataPlugin; public class EngineUserLoadEvent

, U extends IAbstractUser

> extends EngineUserEvent { diff --git a/src/main/java/su/nexmedia/engine/data/event/EngineUserUnloadEvent.java b/src/main/java/mc/promcteam/engine/data/event/EngineUserUnloadEvent.java similarity index 66% rename from src/main/java/su/nexmedia/engine/data/event/EngineUserUnloadEvent.java rename to src/main/java/mc/promcteam/engine/data/event/EngineUserUnloadEvent.java index 8ac0065..e3b3a93 100644 --- a/src/main/java/su/nexmedia/engine/data/event/EngineUserUnloadEvent.java +++ b/src/main/java/mc/promcteam/engine/data/event/EngineUserUnloadEvent.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.data.event; +package mc.promcteam.engine.data.event; +import mc.promcteam.engine.data.users.IAbstractUser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexDataPlugin; -import su.nexmedia.engine.data.users.IAbstractUser; +import mc.promcteam.engine.NexDataPlugin; public class EngineUserUnloadEvent

, U extends IAbstractUser

> extends EngineUserEvent { diff --git a/src/main/java/su/nexmedia/engine/data/serial/ItemStackSerializer.java b/src/main/java/mc/promcteam/engine/data/serial/ItemStackSerializer.java similarity index 91% rename from src/main/java/su/nexmedia/engine/data/serial/ItemStackSerializer.java rename to src/main/java/mc/promcteam/engine/data/serial/ItemStackSerializer.java index 4191a14..70b8bc0 100644 --- a/src/main/java/su/nexmedia/engine/data/serial/ItemStackSerializer.java +++ b/src/main/java/mc/promcteam/engine/data/serial/ItemStackSerializer.java @@ -1,8 +1,8 @@ -package su.nexmedia.engine.data.serial; +package mc.promcteam.engine.data.serial; import com.google.gson.*; import org.bukkit.inventory.ItemStack; -import su.nexmedia.engine.utils.ItemUT; +import mc.promcteam.engine.utils.ItemUT; import java.lang.reflect.Type; diff --git a/src/main/java/su/nexmedia/engine/data/users/IAbstractUser.java b/src/main/java/mc/promcteam/engine/data/users/IAbstractUser.java similarity index 96% rename from src/main/java/su/nexmedia/engine/data/users/IAbstractUser.java rename to src/main/java/mc/promcteam/engine/data/users/IAbstractUser.java index cf22263..a3314f2 100644 --- a/src/main/java/su/nexmedia/engine/data/users/IAbstractUser.java +++ b/src/main/java/mc/promcteam/engine/data/users/IAbstractUser.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.data.users; +package mc.promcteam.engine.data.users; import java.util.UUID; @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; +import mc.promcteam.engine.NexPlugin; public abstract class IAbstractUser

> { diff --git a/src/main/java/su/nexmedia/engine/data/users/IUserManager.java b/src/main/java/mc/promcteam/engine/data/users/IUserManager.java similarity index 95% rename from src/main/java/su/nexmedia/engine/data/users/IUserManager.java rename to src/main/java/mc/promcteam/engine/data/users/IUserManager.java index 8621024..1cf4813 100644 --- a/src/main/java/su/nexmedia/engine/data/users/IUserManager.java +++ b/src/main/java/mc/promcteam/engine/data/users/IUserManager.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.data.users; +package mc.promcteam.engine.data.users; import java.util.Collection; import java.util.HashMap; @@ -18,13 +18,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexDataPlugin; -import su.nexmedia.engine.data.event.EngineUserCreatedEvent; -import su.nexmedia.engine.data.event.EngineUserLoadEvent; -import su.nexmedia.engine.data.event.EngineUserUnloadEvent; -import su.nexmedia.engine.hooks.Hooks; -import su.nexmedia.engine.manager.IManager; -import su.nexmedia.engine.manager.api.task.ITask; +import mc.promcteam.engine.NexDataPlugin; +import mc.promcteam.engine.data.event.EngineUserCreatedEvent; +import mc.promcteam.engine.data.event.EngineUserLoadEvent; +import mc.promcteam.engine.data.event.EngineUserUnloadEvent; +import mc.promcteam.engine.hooks.Hooks; +import mc.promcteam.engine.manager.IManager; +import mc.promcteam.engine.manager.api.task.ITask; public abstract class IUserManager

, U extends IAbstractUser

> extends IManager

{ diff --git a/src/main/java/su/nexmedia/engine/hooks/HookManager.java b/src/main/java/mc/promcteam/engine/hooks/HookManager.java similarity index 94% rename from src/main/java/su/nexmedia/engine/hooks/HookManager.java rename to src/main/java/mc/promcteam/engine/hooks/HookManager.java index a669a28..9cc60bd 100644 --- a/src/main/java/su/nexmedia/engine/hooks/HookManager.java +++ b/src/main/java/mc/promcteam/engine/hooks/HookManager.java @@ -1,17 +1,16 @@ -package su.nexmedia.engine.hooks; +package mc.promcteam.engine.hooks; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.manager.IManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.manager.IManager; - public class HookManager extends IManager { private Map>> hooks; diff --git a/src/main/java/su/nexmedia/engine/hooks/HookState.java b/src/main/java/mc/promcteam/engine/hooks/HookState.java similarity index 88% rename from src/main/java/su/nexmedia/engine/hooks/HookState.java rename to src/main/java/mc/promcteam/engine/hooks/HookState.java index 658f7de..8e20afe 100644 --- a/src/main/java/su/nexmedia/engine/hooks/HookState.java +++ b/src/main/java/mc/promcteam/engine/hooks/HookState.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.hooks; +package mc.promcteam.engine.hooks; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/su/nexmedia/engine/hooks/Hooks.java b/src/main/java/mc/promcteam/engine/hooks/Hooks.java similarity index 94% rename from src/main/java/su/nexmedia/engine/hooks/Hooks.java rename to src/main/java/mc/promcteam/engine/hooks/Hooks.java index 6ef5beb..75b134a 100644 --- a/src/main/java/su/nexmedia/engine/hooks/Hooks.java +++ b/src/main/java/mc/promcteam/engine/hooks/Hooks.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.hooks; +package mc.promcteam.engine.hooks; import java.util.Collections; import java.util.Map; @@ -14,11 +14,11 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.hooks.external.MythicMobsHK; -import su.nexmedia.engine.hooks.external.VaultHK; -import su.nexmedia.engine.hooks.external.WorldGuardHK; -import su.nexmedia.engine.utils.constants.JStrings; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.hooks.external.MythicMobsHK; +import mc.promcteam.engine.hooks.external.VaultHK; +import mc.promcteam.engine.hooks.external.WorldGuardHK; +import mc.promcteam.engine.utils.constants.JStrings; public class Hooks { diff --git a/src/main/java/su/nexmedia/engine/hooks/NHook.java b/src/main/java/mc/promcteam/engine/hooks/NHook.java similarity index 84% rename from src/main/java/su/nexmedia/engine/hooks/NHook.java rename to src/main/java/mc/promcteam/engine/hooks/NHook.java index ae40740..862cb59 100644 --- a/src/main/java/su/nexmedia/engine/hooks/NHook.java +++ b/src/main/java/mc/promcteam/engine/hooks/NHook.java @@ -1,10 +1,9 @@ -package su.nexmedia.engine.hooks; +package mc.promcteam.engine.hooks; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.manager.IListener; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.manager.IListener; - public abstract class NHook

> extends IListener

{ protected HookState state; diff --git a/src/main/java/su/nexmedia/engine/hooks/external/MythicMobsHK.java b/src/main/java/mc/promcteam/engine/hooks/external/MythicMobsHK.java similarity index 94% rename from src/main/java/su/nexmedia/engine/hooks/external/MythicMobsHK.java rename to src/main/java/mc/promcteam/engine/hooks/external/MythicMobsHK.java index aa6a869..fdd6a54 100644 --- a/src/main/java/su/nexmedia/engine/hooks/external/MythicMobsHK.java +++ b/src/main/java/mc/promcteam/engine/hooks/external/MythicMobsHK.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.hooks.external; +package mc.promcteam.engine.hooks.external; import java.util.ArrayList; import java.util.List; @@ -13,9 +13,9 @@ import io.lumine.xikage.mythicmobs.api.exceptions.InvalidMobTypeException; import io.lumine.xikage.mythicmobs.mobs.ActiveMob; import io.lumine.xikage.mythicmobs.mobs.MythicMob; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.hooks.HookState; -import su.nexmedia.engine.hooks.NHook; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.hooks.HookState; +import mc.promcteam.engine.hooks.NHook; public class MythicMobsHK extends NHook { diff --git a/src/main/java/su/nexmedia/engine/hooks/external/VaultHK.java b/src/main/java/mc/promcteam/engine/hooks/external/VaultHK.java similarity index 96% rename from src/main/java/su/nexmedia/engine/hooks/external/VaultHK.java rename to src/main/java/mc/promcteam/engine/hooks/external/VaultHK.java index a5045ad..23d4b87 100644 --- a/src/main/java/su/nexmedia/engine/hooks/external/VaultHK.java +++ b/src/main/java/mc/promcteam/engine/hooks/external/VaultHK.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.hooks.external; +package mc.promcteam.engine.hooks.external; import java.util.Arrays; import java.util.Collections; @@ -17,9 +17,9 @@ import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.hooks.HookState; -import su.nexmedia.engine.hooks.NHook; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.hooks.HookState; +import mc.promcteam.engine.hooks.NHook; public class VaultHK extends NHook { diff --git a/src/main/java/su/nexmedia/engine/hooks/external/WorldGuardHK.java b/src/main/java/mc/promcteam/engine/hooks/external/WorldGuardHK.java similarity index 94% rename from src/main/java/su/nexmedia/engine/hooks/external/WorldGuardHK.java rename to src/main/java/mc/promcteam/engine/hooks/external/WorldGuardHK.java index b0b2426..598e12a 100644 --- a/src/main/java/su/nexmedia/engine/hooks/external/WorldGuardHK.java +++ b/src/main/java/mc/promcteam/engine/hooks/external/WorldGuardHK.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.hooks.external; +package mc.promcteam.engine.hooks.external; import java.util.Collection; @@ -16,9 +16,9 @@ import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.hooks.HookState; -import su.nexmedia.engine.hooks.NHook; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.hooks.HookState; +import mc.promcteam.engine.hooks.NHook; public class WorldGuardHK extends NHook { diff --git a/src/main/java/su/nexmedia/engine/hooks/external/citizens/CitizensHK.java b/src/main/java/mc/promcteam/engine/hooks/external/citizens/CitizensHK.java similarity index 94% rename from src/main/java/su/nexmedia/engine/hooks/external/citizens/CitizensHK.java rename to src/main/java/mc/promcteam/engine/hooks/external/citizens/CitizensHK.java index a622425..97e916a 100644 --- a/src/main/java/su/nexmedia/engine/hooks/external/citizens/CitizensHK.java +++ b/src/main/java/mc/promcteam/engine/hooks/external/citizens/CitizensHK.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.hooks.external.citizens; +package mc.promcteam.engine.hooks.external.citizens; import java.util.Collections; import java.util.HashMap; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.event.NPCRightClickEvent; import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.TraitInfo; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.hooks.HookState; -import su.nexmedia.engine.hooks.NHook; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.hooks.HookState; +import mc.promcteam.engine.hooks.NHook; public class CitizensHK extends NHook { diff --git a/src/main/java/su/nexmedia/engine/hooks/external/citizens/CitizensListener.java b/src/main/java/mc/promcteam/engine/hooks/external/citizens/CitizensListener.java similarity index 81% rename from src/main/java/su/nexmedia/engine/hooks/external/citizens/CitizensListener.java rename to src/main/java/mc/promcteam/engine/hooks/external/citizens/CitizensListener.java index c12578e..0dbf30b 100644 --- a/src/main/java/su/nexmedia/engine/hooks/external/citizens/CitizensListener.java +++ b/src/main/java/mc/promcteam/engine/hooks/external/citizens/CitizensListener.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.hooks.external.citizens; +package mc.promcteam.engine.hooks.external.citizens; import net.citizensnpcs.api.event.NPCLeftClickEvent; import net.citizensnpcs.api.event.NPCRightClickEvent; diff --git a/src/main/java/su/nexmedia/engine/manager/AbstractListener.java b/src/main/java/mc/promcteam/engine/manager/AbstractListener.java similarity index 87% rename from src/main/java/su/nexmedia/engine/manager/AbstractListener.java rename to src/main/java/mc/promcteam/engine/manager/AbstractListener.java index 147981e..76090c4 100644 --- a/src/main/java/su/nexmedia/engine/manager/AbstractListener.java +++ b/src/main/java/mc/promcteam/engine/manager/AbstractListener.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager; +package mc.promcteam.engine.manager; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; diff --git a/src/main/java/su/nexmedia/engine/manager/IListener.java b/src/main/java/mc/promcteam/engine/manager/IListener.java similarity index 83% rename from src/main/java/su/nexmedia/engine/manager/IListener.java rename to src/main/java/mc/promcteam/engine/manager/IListener.java index 23a9d49..c2bd73e 100644 --- a/src/main/java/su/nexmedia/engine/manager/IListener.java +++ b/src/main/java/mc/promcteam/engine/manager/IListener.java @@ -1,9 +1,8 @@ -package su.nexmedia.engine.manager; +package mc.promcteam.engine.manager; +import mc.promcteam.engine.NexPlugin; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; - public abstract class IListener

> implements AbstractListener { @NotNull public final P plugin; diff --git a/src/main/java/su/nexmedia/engine/manager/IManager.java b/src/main/java/mc/promcteam/engine/manager/IManager.java similarity index 62% rename from src/main/java/su/nexmedia/engine/manager/IManager.java rename to src/main/java/mc/promcteam/engine/manager/IManager.java index 2592560..2d0b930 100644 --- a/src/main/java/su/nexmedia/engine/manager/IManager.java +++ b/src/main/java/mc/promcteam/engine/manager/IManager.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.manager; +package mc.promcteam.engine.manager; +import mc.promcteam.engine.NexPlugin; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.manager.api.Loadable; +import mc.promcteam.engine.manager.api.Loadable; public abstract class IManager

> extends IListener

implements Loadable { diff --git a/src/main/java/su/nexmedia/engine/manager/LoadableItem.java b/src/main/java/mc/promcteam/engine/manager/LoadableItem.java similarity index 88% rename from src/main/java/su/nexmedia/engine/manager/LoadableItem.java rename to src/main/java/mc/promcteam/engine/manager/LoadableItem.java index bcb27af..ae08bc4 100644 --- a/src/main/java/su/nexmedia/engine/manager/LoadableItem.java +++ b/src/main/java/mc/promcteam/engine/manager/LoadableItem.java @@ -1,11 +1,11 @@ -package su.nexmedia.engine.manager; +package mc.promcteam.engine.manager; import java.io.File; +import mc.promcteam.engine.NexPlugin; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; +import mc.promcteam.engine.config.api.JYML; public abstract class LoadableItem { diff --git a/src/main/java/su/nexmedia/engine/manager/api/Cleanable.java b/src/main/java/mc/promcteam/engine/manager/api/Cleanable.java similarity index 57% rename from src/main/java/su/nexmedia/engine/manager/api/Cleanable.java rename to src/main/java/mc/promcteam/engine/manager/api/Cleanable.java index 89e2d90..3b61c2a 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/Cleanable.java +++ b/src/main/java/mc/promcteam/engine/manager/api/Cleanable.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api; +package mc.promcteam.engine.manager.api; public interface Cleanable { diff --git a/src/main/java/su/nexmedia/engine/manager/api/Editable.java b/src/main/java/mc/promcteam/engine/manager/api/Editable.java similarity index 55% rename from src/main/java/su/nexmedia/engine/manager/api/Editable.java rename to src/main/java/mc/promcteam/engine/manager/api/Editable.java index f98f786..daa2658 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/Editable.java +++ b/src/main/java/mc/promcteam/engine/manager/api/Editable.java @@ -1,9 +1,8 @@ -package su.nexmedia.engine.manager.api; +package mc.promcteam.engine.manager.api; +import mc.promcteam.engine.manager.api.gui.NGUI; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.manager.api.gui.NGUI; - public interface Editable { @NotNull diff --git a/src/main/java/su/nexmedia/engine/manager/api/IActionEditable.java b/src/main/java/mc/promcteam/engine/manager/api/IActionEditable.java similarity index 53% rename from src/main/java/su/nexmedia/engine/manager/api/IActionEditable.java rename to src/main/java/mc/promcteam/engine/manager/api/IActionEditable.java index 4247111..856c9bd 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/IActionEditable.java +++ b/src/main/java/mc/promcteam/engine/manager/api/IActionEditable.java @@ -1,10 +1,10 @@ -package su.nexmedia.engine.manager.api; +package mc.promcteam.engine.manager.api; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.manager.editor.object.IEditorActionsMain; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.manager.editor.object.IEditorActionsMain; -import su.nexmedia.engine.utils.actions.api.IActioned; +import mc.promcteam.engine.utils.actions.api.IActioned; public interface IActionEditable extends IActioned, Editable { diff --git a/src/main/java/su/nexmedia/engine/manager/api/Loadable.java b/src/main/java/mc/promcteam/engine/manager/api/Loadable.java similarity index 77% rename from src/main/java/su/nexmedia/engine/manager/api/Loadable.java rename to src/main/java/mc/promcteam/engine/manager/api/Loadable.java index 4a6b43f..2d17fe5 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/Loadable.java +++ b/src/main/java/mc/promcteam/engine/manager/api/Loadable.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api; +package mc.promcteam.engine.manager.api; public interface Loadable { diff --git a/src/main/java/su/nexmedia/engine/manager/api/Loggable.java b/src/main/java/mc/promcteam/engine/manager/api/Loggable.java similarity index 82% rename from src/main/java/su/nexmedia/engine/manager/api/Loggable.java rename to src/main/java/mc/promcteam/engine/manager/api/Loggable.java index 971912e..785f9fc 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/Loggable.java +++ b/src/main/java/mc/promcteam/engine/manager/api/Loggable.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api; +package mc.promcteam.engine.manager.api; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/su/nexmedia/engine/manager/api/Saveable.java b/src/main/java/mc/promcteam/engine/manager/api/Saveable.java similarity index 57% rename from src/main/java/su/nexmedia/engine/manager/api/Saveable.java rename to src/main/java/mc/promcteam/engine/manager/api/Saveable.java index c914a17..9a40141 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/Saveable.java +++ b/src/main/java/mc/promcteam/engine/manager/api/Saveable.java @@ -1,8 +1,8 @@ -package su.nexmedia.engine.manager.api; +package mc.promcteam.engine.manager.api; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.config.api.JYML; +import mc.promcteam.engine.config.api.JYML; public interface Saveable { diff --git a/src/main/java/su/nexmedia/engine/manager/api/event/ICancellableEvent.java b/src/main/java/mc/promcteam/engine/manager/api/event/ICancellableEvent.java similarity index 90% rename from src/main/java/su/nexmedia/engine/manager/api/event/ICancellableEvent.java rename to src/main/java/mc/promcteam/engine/manager/api/event/ICancellableEvent.java index 82fd815..18c2a54 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/event/ICancellableEvent.java +++ b/src/main/java/mc/promcteam/engine/manager/api/event/ICancellableEvent.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api.event; +package mc.promcteam.engine.manager.api.event; import org.bukkit.event.Cancellable; diff --git a/src/main/java/su/nexmedia/engine/manager/api/event/IEvent.java b/src/main/java/mc/promcteam/engine/manager/api/event/IEvent.java similarity index 91% rename from src/main/java/su/nexmedia/engine/manager/api/event/IEvent.java rename to src/main/java/mc/promcteam/engine/manager/api/event/IEvent.java index 6cb0609..8228119 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/event/IEvent.java +++ b/src/main/java/mc/promcteam/engine/manager/api/event/IEvent.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api.event; +package mc.promcteam.engine.manager.api.event; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/su/nexmedia/engine/manager/api/gui/ContentType.java b/src/main/java/mc/promcteam/engine/manager/api/gui/ContentType.java similarity index 66% rename from src/main/java/su/nexmedia/engine/manager/api/gui/ContentType.java rename to src/main/java/mc/promcteam/engine/manager/api/gui/ContentType.java index a1b449b..f93506d 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/gui/ContentType.java +++ b/src/main/java/mc/promcteam/engine/manager/api/gui/ContentType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api.gui; +package mc.promcteam.engine.manager.api.gui; public enum ContentType { diff --git a/src/main/java/su/nexmedia/engine/manager/api/gui/GuiClick.java b/src/main/java/mc/promcteam/engine/manager/api/gui/GuiClick.java similarity index 86% rename from src/main/java/su/nexmedia/engine/manager/api/gui/GuiClick.java rename to src/main/java/mc/promcteam/engine/manager/api/gui/GuiClick.java index a1e6414..3c2a171 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/gui/GuiClick.java +++ b/src/main/java/mc/promcteam/engine/manager/api/gui/GuiClick.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api.gui; +package mc.promcteam.engine.manager.api.gui; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/su/nexmedia/engine/manager/api/gui/GuiItem.java b/src/main/java/mc/promcteam/engine/manager/api/gui/GuiItem.java similarity index 97% rename from src/main/java/su/nexmedia/engine/manager/api/gui/GuiItem.java rename to src/main/java/mc/promcteam/engine/manager/api/gui/GuiItem.java index 9bf1c3b..60f7468 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/gui/GuiItem.java +++ b/src/main/java/mc/promcteam/engine/manager/api/gui/GuiItem.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api.gui; +package mc.promcteam.engine.manager.api.gui; import java.util.ArrayList; import java.util.List; @@ -6,6 +6,7 @@ import java.util.Map.Entry; import java.util.TreeMap; +import mc.promcteam.engine.manager.types.ClickType; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; @@ -13,8 +14,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.manager.types.ClickType; -import su.nexmedia.engine.utils.actions.ActionManipulator; +import mc.promcteam.engine.utils.actions.ActionManipulator; public class GuiItem { diff --git a/src/main/java/su/nexmedia/engine/manager/api/gui/JIcon.java b/src/main/java/mc/promcteam/engine/manager/api/gui/JIcon.java similarity index 96% rename from src/main/java/su/nexmedia/engine/manager/api/gui/JIcon.java rename to src/main/java/mc/promcteam/engine/manager/api/gui/JIcon.java index 17cfdb5..6cd2390 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/gui/JIcon.java +++ b/src/main/java/mc/promcteam/engine/manager/api/gui/JIcon.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api.gui; +package mc.promcteam.engine.manager.api.gui; import java.util.ArrayList; import java.util.List; @@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.utils.StringUT; +import mc.promcteam.engine.utils.StringUT; public class JIcon { diff --git a/src/main/java/su/nexmedia/engine/manager/api/gui/NGUI.java b/src/main/java/mc/promcteam/engine/manager/api/gui/NGUI.java similarity index 97% rename from src/main/java/su/nexmedia/engine/manager/api/gui/NGUI.java rename to src/main/java/mc/promcteam/engine/manager/api/gui/NGUI.java index d46cbc0..370903c 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/gui/NGUI.java +++ b/src/main/java/mc/promcteam/engine/manager/api/gui/NGUI.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.api.gui; +package mc.promcteam.engine.manager.api.gui; import java.util.ArrayList; import java.util.HashMap; @@ -12,6 +12,9 @@ import java.util.UUID; import java.util.stream.Collectors; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.manager.IListener; +import mc.promcteam.engine.manager.types.ClickType; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -25,14 +28,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.manager.IListener; -import su.nexmedia.engine.manager.api.task.ITask; -import su.nexmedia.engine.manager.types.ClickType; -import su.nexmedia.engine.utils.ItemUT; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.ActionManipulator; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.manager.api.task.ITask; +import mc.promcteam.engine.utils.ItemUT; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.actions.ActionManipulator; public abstract class NGUI

> extends IListener

implements InventoryHolder { diff --git a/src/main/java/su/nexmedia/engine/manager/api/task/ITask.java b/src/main/java/mc/promcteam/engine/manager/api/task/ITask.java similarity index 93% rename from src/main/java/su/nexmedia/engine/manager/api/task/ITask.java rename to src/main/java/mc/promcteam/engine/manager/api/task/ITask.java index 3ae06e5..022b5f3 100644 --- a/src/main/java/su/nexmedia/engine/manager/api/task/ITask.java +++ b/src/main/java/mc/promcteam/engine/manager/api/task/ITask.java @@ -1,9 +1,8 @@ -package su.nexmedia.engine.manager.api.task; +package mc.promcteam.engine.manager.api.task; +import mc.promcteam.engine.NexPlugin; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; - public abstract class ITask

> { @NotNull protected P plugin; diff --git a/src/main/java/su/nexmedia/engine/manager/editor/EditorActionsHandler.java b/src/main/java/mc/promcteam/engine/manager/editor/EditorActionsHandler.java similarity index 76% rename from src/main/java/su/nexmedia/engine/manager/editor/EditorActionsHandler.java rename to src/main/java/mc/promcteam/engine/manager/editor/EditorActionsHandler.java index df49204..1128bcf 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/EditorActionsHandler.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/EditorActionsHandler.java @@ -1,22 +1,21 @@ -package su.nexmedia.engine.manager.editor; +package mc.promcteam.engine.manager.editor; import java.util.ArrayList; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.manager.editor.object.IEditorActionsMain; +import mc.promcteam.engine.manager.editor.object.IEditorActionsParametized; +import mc.promcteam.engine.manager.editor.object.IEditorActionsParams; +import mc.promcteam.engine.manager.editor.object.IEditorActionsSection; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.manager.editor.object.IEditorActionsMain; -import su.nexmedia.engine.manager.editor.object.IEditorActionsParametized; -import su.nexmedia.engine.manager.editor.object.IEditorActionsParams; -import su.nexmedia.engine.manager.editor.object.IEditorActionsSection; -import su.nexmedia.engine.manager.editor.object.IEditorActionsMain.ActionBuilder; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.ActionCategory; -import su.nexmedia.engine.utils.actions.ActionSection; -import su.nexmedia.engine.utils.actions.Parametized; -import su.nexmedia.engine.utils.actions.params.IParam; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.actions.ActionCategory; +import mc.promcteam.engine.utils.actions.ActionSection; +import mc.promcteam.engine.utils.actions.Parametized; +import mc.promcteam.engine.utils.actions.params.IParam; public class EditorActionsHandler extends EditorHandler { @@ -40,7 +39,7 @@ protected boolean onType(@NotNull Player p, @Nullable Object editObject, if (editor.getActionBuilders().containsKey(sectionId)) return false; ActionSection section = new ActionSection(new ArrayList<>(), new ArrayList<>(), "null", new ArrayList<>()); - ActionBuilder builder = new ActionBuilder(section, sectionId); + IEditorActionsMain.ActionBuilder builder = new IEditorActionsMain.ActionBuilder(section, sectionId); editor.getActionBuilders().put(sectionId, builder); editor.open(p, 1); @@ -60,7 +59,7 @@ protected boolean onType(@NotNull Player p, @Nullable Object editObject, } // Check for valid Builder. - ActionBuilder builder = editor.getSectionEditor().getEditorMain().getActionBuilder(editor.getSectionEditor().getSectionId()); + IEditorActionsMain.ActionBuilder builder = editor.getSectionEditor().getEditorMain().getActionBuilder(editor.getSectionEditor().getSectionId()); if (builder == null) { EditorManager.errorCustom(p, plugin.lang().Error_Internal.getMsg()); return false; @@ -80,7 +79,7 @@ private boolean onTypeParam(@NotNull Player p, @NotNull Object editObject, IEditorActionsParams paramEditor = (IEditorActionsParams) editObject; IEditorActionsSection sectionEditor = paramEditor.getSctionEditor(); - ActionBuilder builder = sectionEditor.getEditorMain().getActionBuilder(sectionEditor.getSectionId()); + IEditorActionsMain.ActionBuilder builder = sectionEditor.getEditorMain().getActionBuilder(sectionEditor.getSectionId()); if (builder == null) { EditorManager.errorCustom(p, plugin.lang().Error_Internal.getMsg()); return false; diff --git a/src/main/java/su/nexmedia/engine/manager/editor/EditorHandler.java b/src/main/java/mc/promcteam/engine/manager/editor/EditorHandler.java similarity index 91% rename from src/main/java/su/nexmedia/engine/manager/editor/EditorHandler.java rename to src/main/java/mc/promcteam/engine/manager/editor/EditorHandler.java index b26ffd8..add7f98 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/EditorHandler.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/EditorHandler.java @@ -1,7 +1,8 @@ -package su.nexmedia.engine.manager.editor; +package mc.promcteam.engine.manager.editor; import java.util.Map; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -10,11 +11,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.manager.IListener; -import su.nexmedia.engine.manager.api.gui.NGUI; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.constants.JStrings; +import mc.promcteam.engine.manager.IListener; +import mc.promcteam.engine.manager.api.gui.NGUI; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.constants.JStrings; public abstract class EditorHandler

> extends IListener

{ diff --git a/src/main/java/su/nexmedia/engine/manager/editor/EditorManager.java b/src/main/java/mc/promcteam/engine/manager/editor/EditorManager.java similarity index 93% rename from src/main/java/su/nexmedia/engine/manager/editor/EditorManager.java rename to src/main/java/mc/promcteam/engine/manager/editor/EditorManager.java index 86990e8..2ef9737 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/EditorManager.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/EditorManager.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.editor; +package mc.promcteam.engine.manager.editor; import java.util.AbstractMap; import java.util.Collection; @@ -6,16 +6,16 @@ import java.util.WeakHashMap; import java.util.stream.Collectors; +import mc.promcteam.engine.NexEngine; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.utils.ClickText; -import su.nexmedia.engine.utils.ClickText.ClickWord; -import su.nexmedia.engine.utils.CollectionsUT; -import su.nexmedia.engine.utils.constants.JStrings; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.utils.ClickText; +import mc.promcteam.engine.utils.ClickText.ClickWord; +import mc.promcteam.engine.utils.CollectionsUT; +import mc.promcteam.engine.utils.constants.JStrings; public class EditorManager { diff --git a/src/main/java/su/nexmedia/engine/manager/editor/EditorType.java b/src/main/java/mc/promcteam/engine/manager/editor/EditorType.java similarity index 77% rename from src/main/java/su/nexmedia/engine/manager/editor/EditorType.java rename to src/main/java/mc/promcteam/engine/manager/editor/EditorType.java index d51288c..5738ca5 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/EditorType.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/EditorType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.editor; +package mc.promcteam.engine.manager.editor; public enum EditorType { diff --git a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsMain.java b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsMain.java similarity index 91% rename from src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsMain.java rename to src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsMain.java index 332bb99..9c28c33 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsMain.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsMain.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.editor.object; +package mc.promcteam.engine.manager.editor.object; import java.util.ArrayList; import java.util.Collections; @@ -7,6 +7,8 @@ import java.util.Map; import java.util.regex.Matcher; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.NexPlugin; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; @@ -16,27 +18,25 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.manager.LoadableItem; -import su.nexmedia.engine.manager.api.IActionEditable; -import su.nexmedia.engine.manager.api.gui.ContentType; -import su.nexmedia.engine.manager.api.gui.GuiClick; -import su.nexmedia.engine.manager.api.gui.GuiItem; -import su.nexmedia.engine.manager.api.gui.JIcon; -import su.nexmedia.engine.manager.api.gui.NGUI; -import su.nexmedia.engine.manager.editor.EditorManager; -import su.nexmedia.engine.manager.editor.EditorType; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.ActionCategory; -import su.nexmedia.engine.utils.actions.ActionManipulator; -import su.nexmedia.engine.utils.actions.ActionSection; -import su.nexmedia.engine.utils.actions.Parametized; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.params.IParamValue; -import su.nexmedia.engine.utils.actions.targets.ITargetSelector; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.manager.LoadableItem; +import mc.promcteam.engine.manager.api.IActionEditable; +import mc.promcteam.engine.manager.api.gui.ContentType; +import mc.promcteam.engine.manager.api.gui.GuiClick; +import mc.promcteam.engine.manager.api.gui.GuiItem; +import mc.promcteam.engine.manager.api.gui.JIcon; +import mc.promcteam.engine.manager.api.gui.NGUI; +import mc.promcteam.engine.manager.editor.EditorManager; +import mc.promcteam.engine.manager.editor.EditorType; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.actions.ActionCategory; +import mc.promcteam.engine.utils.actions.ActionManipulator; +import mc.promcteam.engine.utils.actions.ActionSection; +import mc.promcteam.engine.utils.actions.Parametized; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.params.IParamValue; +import mc.promcteam.engine.utils.actions.targets.ITargetSelector; public class IEditorActionsMain

> extends NGUI

{ diff --git a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsParametized.java b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsParametized.java similarity index 87% rename from src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsParametized.java rename to src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsParametized.java index cac6f24..f651029 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsParametized.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsParametized.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.editor.object; +package mc.promcteam.engine.manager.editor.object; import java.util.ArrayList; import java.util.HashMap; @@ -6,6 +6,9 @@ import java.util.Map; import java.util.Map.Entry; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.manager.editor.EditorManager; +import mc.promcteam.engine.manager.editor.EditorType; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; @@ -14,21 +17,17 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.manager.api.gui.ContentType; -import su.nexmedia.engine.manager.api.gui.GuiClick; -import su.nexmedia.engine.manager.api.gui.GuiItem; -import su.nexmedia.engine.manager.api.gui.JIcon; -import su.nexmedia.engine.manager.api.gui.NGUI; -import su.nexmedia.engine.manager.editor.EditorManager; -import su.nexmedia.engine.manager.editor.EditorType; -import su.nexmedia.engine.manager.editor.object.IEditorActionsMain.ActionBuilder; -import su.nexmedia.engine.utils.ClickText; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.ClickText.ClickWord; -import su.nexmedia.engine.utils.actions.ActionCategory; -import su.nexmedia.engine.utils.actions.Parametized; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.manager.api.gui.ContentType; +import mc.promcteam.engine.manager.api.gui.GuiClick; +import mc.promcteam.engine.manager.api.gui.GuiItem; +import mc.promcteam.engine.manager.api.gui.JIcon; +import mc.promcteam.engine.manager.api.gui.NGUI; +import mc.promcteam.engine.utils.ClickText; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.ClickText.ClickWord; +import mc.promcteam.engine.utils.actions.ActionCategory; +import mc.promcteam.engine.utils.actions.Parametized; public class IEditorActionsParametized

> extends NGUI

{ @@ -146,7 +145,7 @@ public IEditorActionsParams

getParamEditor(@NotNull Parametized pz) { @Override protected void onCreate(@NotNull Player p, @NotNull Inventory inv, int page) { - ActionBuilder builder = sectionEditor.getEditorMain().getActionBuilder(sectionEditor.getSectionId()); + IEditorActionsMain.ActionBuilder builder = sectionEditor.getEditorMain().getActionBuilder(sectionEditor.getSectionId()); if (builder == null) { plugin.warn("Invalid ActionBuilder for '" + sectionEditor.getSectionId() + "' section!"); return; diff --git a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsParams.java b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsParams.java similarity index 87% rename from src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsParams.java rename to src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsParams.java index b614442..17b8ea1 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsParams.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsParams.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.editor.object; +package mc.promcteam.engine.manager.editor.object; import java.util.ArrayList; import java.util.HashSet; @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; @@ -15,22 +16,21 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.manager.api.gui.ContentType; -import su.nexmedia.engine.manager.api.gui.GuiClick; -import su.nexmedia.engine.manager.api.gui.GuiItem; -import su.nexmedia.engine.manager.api.gui.JIcon; -import su.nexmedia.engine.manager.api.gui.NGUI; -import su.nexmedia.engine.manager.editor.EditorManager; -import su.nexmedia.engine.manager.editor.EditorType; -import su.nexmedia.engine.manager.editor.object.IEditorActionsMain.ActionBuilder; -import su.nexmedia.engine.utils.ClickText; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.ClickText.ClickWord; -import su.nexmedia.engine.utils.actions.ActionCategory; -import su.nexmedia.engine.utils.actions.Parametized; -import su.nexmedia.engine.utils.actions.params.IParam; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.manager.api.gui.ContentType; +import mc.promcteam.engine.manager.api.gui.GuiClick; +import mc.promcteam.engine.manager.api.gui.GuiItem; +import mc.promcteam.engine.manager.api.gui.JIcon; +import mc.promcteam.engine.manager.api.gui.NGUI; +import mc.promcteam.engine.manager.editor.EditorManager; +import mc.promcteam.engine.manager.editor.EditorType; +import mc.promcteam.engine.manager.editor.object.IEditorActionsMain.ActionBuilder; +import mc.promcteam.engine.utils.ClickText; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.ClickText.ClickWord; +import mc.promcteam.engine.utils.actions.ActionCategory; +import mc.promcteam.engine.utils.actions.Parametized; +import mc.promcteam.engine.utils.actions.params.IParam; public class IEditorActionsParams

> extends NGUI

{ diff --git a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsSection.java b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsSection.java similarity index 86% rename from src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsSection.java rename to src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsSection.java index f9d94fb..136e3ff 100644 --- a/src/main/java/su/nexmedia/engine/manager/editor/object/IEditorActionsSection.java +++ b/src/main/java/mc/promcteam/engine/manager/editor/object/IEditorActionsSection.java @@ -1,20 +1,20 @@ -package su.nexmedia.engine.manager.editor.object; +package mc.promcteam.engine.manager.editor.object; import java.util.HashMap; import java.util.Map; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.manager.api.gui.ContentType; -import su.nexmedia.engine.manager.api.gui.GuiClick; -import su.nexmedia.engine.manager.api.gui.GuiItem; -import su.nexmedia.engine.manager.api.gui.NGUI; -import su.nexmedia.engine.manager.editor.EditorManager; -import su.nexmedia.engine.utils.actions.ActionCategory; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.manager.api.gui.ContentType; +import mc.promcteam.engine.manager.api.gui.GuiClick; +import mc.promcteam.engine.manager.api.gui.GuiItem; +import mc.promcteam.engine.manager.api.gui.NGUI; +import mc.promcteam.engine.manager.editor.EditorManager; +import mc.promcteam.engine.utils.actions.ActionCategory; public class IEditorActionsSection

> extends NGUI

{ diff --git a/src/main/java/su/nexmedia/engine/manager/types/ClickType.java b/src/main/java/mc/promcteam/engine/manager/types/ClickType.java similarity index 95% rename from src/main/java/su/nexmedia/engine/manager/types/ClickType.java rename to src/main/java/mc/promcteam/engine/manager/types/ClickType.java index 98b6797..ec2271d 100644 --- a/src/main/java/su/nexmedia/engine/manager/types/ClickType.java +++ b/src/main/java/mc/promcteam/engine/manager/types/ClickType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.types; +package mc.promcteam.engine.manager.types; import org.bukkit.event.block.Action; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/su/nexmedia/engine/manager/types/MobGroup.java b/src/main/java/mc/promcteam/engine/manager/types/MobGroup.java similarity index 95% rename from src/main/java/su/nexmedia/engine/manager/types/MobGroup.java rename to src/main/java/mc/promcteam/engine/manager/types/MobGroup.java index d46d9a1..0da743d 100644 --- a/src/main/java/su/nexmedia/engine/manager/types/MobGroup.java +++ b/src/main/java/mc/promcteam/engine/manager/types/MobGroup.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.manager.types; +package mc.promcteam.engine.manager.types; import org.bukkit.entity.Ambient; import org.bukkit.entity.Animals; diff --git a/src/main/java/su/nexmedia/engine/modules/IExternalModule.java b/src/main/java/mc/promcteam/engine/modules/IExternalModule.java similarity index 77% rename from src/main/java/su/nexmedia/engine/modules/IExternalModule.java rename to src/main/java/mc/promcteam/engine/modules/IExternalModule.java index 90e3a2e..9608b63 100644 --- a/src/main/java/su/nexmedia/engine/modules/IExternalModule.java +++ b/src/main/java/mc/promcteam/engine/modules/IExternalModule.java @@ -1,10 +1,9 @@ -package su.nexmedia.engine.modules; +package mc.promcteam.engine.modules; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.core.config.CoreConfig; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.core.config.CoreConfig; - public abstract class IExternalModule

> extends IModule

{ public IExternalModule(@NotNull P plugin) { diff --git a/src/main/java/su/nexmedia/engine/modules/IModule.java b/src/main/java/mc/promcteam/engine/modules/IModule.java similarity index 92% rename from src/main/java/su/nexmedia/engine/modules/IModule.java rename to src/main/java/mc/promcteam/engine/modules/IModule.java index 6999e70..f9b22cf 100644 --- a/src/main/java/su/nexmedia/engine/modules/IModule.java +++ b/src/main/java/mc/promcteam/engine/modules/IModule.java @@ -1,13 +1,13 @@ -package su.nexmedia.engine.modules; +package mc.promcteam.engine.modules; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.core.config.CoreConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.core.config.CoreConfig; -import su.nexmedia.engine.manager.IListener; -import su.nexmedia.engine.manager.api.Loggable; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.manager.IListener; +import mc.promcteam.engine.manager.api.Loggable; public abstract class IModule

> extends IListener

implements Loggable { diff --git a/src/main/java/su/nexmedia/engine/modules/IModuleExecutor.java b/src/main/java/mc/promcteam/engine/modules/IModuleExecutor.java similarity index 86% rename from src/main/java/su/nexmedia/engine/modules/IModuleExecutor.java rename to src/main/java/mc/promcteam/engine/modules/IModuleExecutor.java index 63c5697..1748d20 100644 --- a/src/main/java/su/nexmedia/engine/modules/IModuleExecutor.java +++ b/src/main/java/mc/promcteam/engine/modules/IModuleExecutor.java @@ -1,11 +1,11 @@ -package su.nexmedia.engine.modules; +package mc.promcteam.engine.modules; +import mc.promcteam.engine.NexPlugin; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.commands.api.IGeneralCommand; +import mc.promcteam.engine.commands.api.IGeneralCommand; public class IModuleExecutor

> extends IGeneralCommand

{ diff --git a/src/main/java/su/nexmedia/engine/modules/ModuleManager.java b/src/main/java/mc/promcteam/engine/modules/ModuleManager.java similarity index 94% rename from src/main/java/su/nexmedia/engine/modules/ModuleManager.java rename to src/main/java/mc/promcteam/engine/modules/ModuleManager.java index cbb8b2b..b4367cb 100644 --- a/src/main/java/su/nexmedia/engine/modules/ModuleManager.java +++ b/src/main/java/mc/promcteam/engine/modules/ModuleManager.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.modules; +package mc.promcteam.engine.modules; import java.io.File; import java.lang.reflect.Constructor; @@ -14,14 +14,14 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.core.config.CoreConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.core.config.CoreConfig; -import su.nexmedia.engine.manager.api.Loadable; -import su.nexmedia.engine.modules.IExternalModule.LoadPriority; -import su.nexmedia.engine.utils.FileUT; +import mc.promcteam.engine.manager.api.Loadable; +import mc.promcteam.engine.modules.IExternalModule.LoadPriority; +import mc.promcteam.engine.utils.FileUT; public class ModuleManager

> implements Loadable { diff --git a/src/main/java/su/nexmedia/engine/nms/NMS.java b/src/main/java/mc/promcteam/engine/nms/NMS.java similarity index 95% rename from src/main/java/su/nexmedia/engine/nms/NMS.java rename to src/main/java/mc/promcteam/engine/nms/NMS.java index ea2a487..7caea39 100644 --- a/src/main/java/su/nexmedia/engine/nms/NMS.java +++ b/src/main/java/mc/promcteam/engine/nms/NMS.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms; +package mc.promcteam.engine.nms; import io.netty.channel.Channel; import org.bukkit.block.Block; @@ -6,9 +6,7 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.utils.reflection.ReflectionUtil; - -import java.lang.reflect.InvocationTargetException; +import mc.promcteam.engine.utils.reflection.ReflectionUtil; public interface NMS { diff --git a/src/main/java/su/nexmedia/engine/nms/V1_13_R2.java b/src/main/java/mc/promcteam/engine/nms/V1_13_R2.java similarity index 99% rename from src/main/java/su/nexmedia/engine/nms/V1_13_R2.java rename to src/main/java/mc/promcteam/engine/nms/V1_13_R2.java index 8ac8eed..22726cd 100644 --- a/src/main/java/su/nexmedia/engine/nms/V1_13_R2.java +++ b/src/main/java/mc/promcteam/engine/nms/V1_13_R2.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms; +package mc.promcteam.engine.nms; public class V1_13_R2 implements NMS { diff --git a/src/main/java/su/nexmedia/engine/nms/V1_14_R1.java b/src/main/java/mc/promcteam/engine/nms/V1_14_R1.java similarity index 99% rename from src/main/java/su/nexmedia/engine/nms/V1_14_R1.java rename to src/main/java/mc/promcteam/engine/nms/V1_14_R1.java index 7ca936a..5604f4b 100644 --- a/src/main/java/su/nexmedia/engine/nms/V1_14_R1.java +++ b/src/main/java/mc/promcteam/engine/nms/V1_14_R1.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms; +package mc.promcteam.engine.nms; public class V1_14_R1 implements NMS { diff --git a/src/main/java/su/nexmedia/engine/nms/V1_15_R1.java b/src/main/java/mc/promcteam/engine/nms/V1_15_R1.java similarity index 99% rename from src/main/java/su/nexmedia/engine/nms/V1_15_R1.java rename to src/main/java/mc/promcteam/engine/nms/V1_15_R1.java index f82fe61..7fa992e 100644 --- a/src/main/java/su/nexmedia/engine/nms/V1_15_R1.java +++ b/src/main/java/mc/promcteam/engine/nms/V1_15_R1.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms; +package mc.promcteam.engine.nms; public class V1_15_R1 implements NMS { diff --git a/src/main/java/su/nexmedia/engine/nms/V1_16_R2.java b/src/main/java/mc/promcteam/engine/nms/V1_16_R2.java similarity index 99% rename from src/main/java/su/nexmedia/engine/nms/V1_16_R2.java rename to src/main/java/mc/promcteam/engine/nms/V1_16_R2.java index 4204137..7b09e71 100644 --- a/src/main/java/su/nexmedia/engine/nms/V1_16_R2.java +++ b/src/main/java/mc/promcteam/engine/nms/V1_16_R2.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms; +package mc.promcteam.engine.nms; public class V1_16_R2 implements NMS { diff --git a/src/main/java/su/nexmedia/engine/nms/V1_16_R3.java b/src/main/java/mc/promcteam/engine/nms/V1_16_R3.java similarity index 99% rename from src/main/java/su/nexmedia/engine/nms/V1_16_R3.java rename to src/main/java/mc/promcteam/engine/nms/V1_16_R3.java index b3ce6e4..d3972d2 100644 --- a/src/main/java/su/nexmedia/engine/nms/V1_16_R3.java +++ b/src/main/java/mc/promcteam/engine/nms/V1_16_R3.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms; +package mc.promcteam.engine.nms; public class V1_16_R3 implements NMS { diff --git a/src/main/java/su/nexmedia/engine/nms/packets/IPacketHandler.java b/src/main/java/mc/promcteam/engine/nms/packets/IPacketHandler.java similarity index 54% rename from src/main/java/su/nexmedia/engine/nms/packets/IPacketHandler.java rename to src/main/java/mc/promcteam/engine/nms/packets/IPacketHandler.java index 64d5229..16335b1 100644 --- a/src/main/java/su/nexmedia/engine/nms/packets/IPacketHandler.java +++ b/src/main/java/mc/promcteam/engine/nms/packets/IPacketHandler.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.nms.packets; +package mc.promcteam.engine.nms.packets; +import mc.promcteam.engine.nms.packets.events.EnginePlayerPacketEvent; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.nms.packets.events.EnginePlayerPacketEvent; -import su.nexmedia.engine.nms.packets.events.EngineServerPacketEvent; +import mc.promcteam.engine.nms.packets.events.EngineServerPacketEvent; public interface IPacketHandler { diff --git a/src/main/java/su/nexmedia/engine/nms/packets/PacketManager.java b/src/main/java/mc/promcteam/engine/nms/packets/PacketManager.java similarity index 94% rename from src/main/java/su/nexmedia/engine/nms/packets/PacketManager.java rename to src/main/java/mc/promcteam/engine/nms/packets/PacketManager.java index ff03ea8..06b94df 100644 --- a/src/main/java/su/nexmedia/engine/nms/packets/PacketManager.java +++ b/src/main/java/mc/promcteam/engine/nms/packets/PacketManager.java @@ -1,5 +1,6 @@ -package su.nexmedia.engine.nms.packets; +package mc.promcteam.engine.nms.packets; +import mc.promcteam.engine.nms.packets.events.EnginePlayerPacketEvent; import io.netty.channel.*; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -7,10 +8,9 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.manager.IManager; -import su.nexmedia.engine.nms.packets.events.EnginePlayerPacketEvent; -import su.nexmedia.engine.nms.packets.events.EngineServerPacketEvent; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.manager.IManager; +import mc.promcteam.engine.nms.packets.events.EngineServerPacketEvent; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/su/nexmedia/engine/nms/packets/events/EnginePacketEvent.java b/src/main/java/mc/promcteam/engine/nms/packets/events/EnginePacketEvent.java similarity index 83% rename from src/main/java/su/nexmedia/engine/nms/packets/events/EnginePacketEvent.java rename to src/main/java/mc/promcteam/engine/nms/packets/events/EnginePacketEvent.java index 6fd6c05..9c07512 100644 --- a/src/main/java/su/nexmedia/engine/nms/packets/events/EnginePacketEvent.java +++ b/src/main/java/mc/promcteam/engine/nms/packets/events/EnginePacketEvent.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.nms.packets.events; +package mc.promcteam.engine.nms.packets.events; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.manager.api.event.ICancellableEvent; +import mc.promcteam.engine.manager.api.event.ICancellableEvent; public abstract class EnginePacketEvent extends ICancellableEvent { diff --git a/src/main/java/su/nexmedia/engine/nms/packets/events/EnginePlayerPacketEvent.java b/src/main/java/mc/promcteam/engine/nms/packets/events/EnginePlayerPacketEvent.java similarity index 84% rename from src/main/java/su/nexmedia/engine/nms/packets/events/EnginePlayerPacketEvent.java rename to src/main/java/mc/promcteam/engine/nms/packets/events/EnginePlayerPacketEvent.java index 58f86a0..e9d2f86 100644 --- a/src/main/java/su/nexmedia/engine/nms/packets/events/EnginePlayerPacketEvent.java +++ b/src/main/java/mc/promcteam/engine/nms/packets/events/EnginePlayerPacketEvent.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms.packets.events; +package mc.promcteam.engine.nms.packets.events; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/su/nexmedia/engine/nms/packets/events/EngineServerPacketEvent.java b/src/main/java/mc/promcteam/engine/nms/packets/events/EngineServerPacketEvent.java similarity index 84% rename from src/main/java/su/nexmedia/engine/nms/packets/events/EngineServerPacketEvent.java rename to src/main/java/mc/promcteam/engine/nms/packets/events/EngineServerPacketEvent.java index f062a35..6476b52 100644 --- a/src/main/java/su/nexmedia/engine/nms/packets/events/EngineServerPacketEvent.java +++ b/src/main/java/mc/promcteam/engine/nms/packets/events/EngineServerPacketEvent.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.nms.packets.events; +package mc.promcteam.engine.nms.packets.events; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/su/nexmedia/engine/utils/ClickText.java b/src/main/java/mc/promcteam/engine/utils/ClickText.java similarity index 97% rename from src/main/java/su/nexmedia/engine/utils/ClickText.java rename to src/main/java/mc/promcteam/engine/utils/ClickText.java index 39e17b9..055218d 100644 --- a/src/main/java/su/nexmedia/engine/utils/ClickText.java +++ b/src/main/java/mc/promcteam/engine/utils/ClickText.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.util.HashMap; import java.util.List; @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.Set; +import mc.promcteam.engine.core.Version; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -16,8 +17,7 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -import su.nexmedia.engine.core.Version; -import su.nexmedia.engine.utils.constants.JStrings; +import mc.promcteam.engine.utils.constants.JStrings; /** * @author Fogus® Multimedia diff --git a/src/main/java/su/nexmedia/engine/utils/CollectionsUT.java b/src/main/java/mc/promcteam/engine/utils/CollectionsUT.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/CollectionsUT.java rename to src/main/java/mc/promcteam/engine/utils/CollectionsUT.java index 037e07a..16eee4b 100644 --- a/src/main/java/su/nexmedia/engine/utils/CollectionsUT.java +++ b/src/main/java/mc/promcteam/engine/utils/CollectionsUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/su/nexmedia/engine/utils/DataUT.java b/src/main/java/mc/promcteam/engine/utils/DataUT.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/DataUT.java rename to src/main/java/mc/promcteam/engine/utils/DataUT.java index aac74b6..610d9b0 100644 --- a/src/main/java/su/nexmedia/engine/utils/DataUT.java +++ b/src/main/java/mc/promcteam/engine/utils/DataUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; diff --git a/src/main/java/su/nexmedia/engine/utils/EffectUT.java b/src/main/java/mc/promcteam/engine/utils/EffectUT.java similarity index 97% rename from src/main/java/su/nexmedia/engine/utils/EffectUT.java rename to src/main/java/mc/promcteam/engine/utils/EffectUT.java index f7a08cb..ad9292a 100644 --- a/src/main/java/su/nexmedia/engine/utils/EffectUT.java +++ b/src/main/java/mc/promcteam/engine/utils/EffectUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import org.bukkit.Color; import org.bukkit.Location; @@ -10,7 +10,7 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.random.Rnd; +import mc.promcteam.engine.utils.random.Rnd; public class EffectUT { diff --git a/src/main/java/su/nexmedia/engine/utils/EntityUT.java b/src/main/java/mc/promcteam/engine/utils/EntityUT.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/EntityUT.java rename to src/main/java/mc/promcteam/engine/utils/EntityUT.java index 5e43aa0..ceed6eb 100644 --- a/src/main/java/su/nexmedia/engine/utils/EntityUT.java +++ b/src/main/java/mc/promcteam/engine/utils/EntityUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import org.bukkit.Material; import org.bukkit.attribute.Attribute; diff --git a/src/main/java/su/nexmedia/engine/utils/FileUT.java b/src/main/java/mc/promcteam/engine/utils/FileUT.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/FileUT.java rename to src/main/java/mc/promcteam/engine/utils/FileUT.java index 7eed449..1f60156 100644 --- a/src/main/java/su/nexmedia/engine/utils/FileUT.java +++ b/src/main/java/mc/promcteam/engine/utils/FileUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/java/su/nexmedia/engine/utils/ItemUT.java b/src/main/java/mc/promcteam/engine/utils/ItemUT.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/ItemUT.java rename to src/main/java/mc/promcteam/engine/utils/ItemUT.java index cdba9a8..e9800cb 100644 --- a/src/main/java/su/nexmedia/engine/utils/ItemUT.java +++ b/src/main/java/mc/promcteam/engine/utils/ItemUT.java @@ -1,7 +1,11 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.config.ConfigManager; +import mc.promcteam.engine.core.Version; +import mc.promcteam.engine.hooks.Hooks; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -14,10 +18,6 @@ import org.bukkit.inventory.meta.SkullMeta; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.config.ConfigManager; -import su.nexmedia.engine.core.Version; -import su.nexmedia.engine.hooks.Hooks; import java.util.*; import java.util.function.UnaryOperator; diff --git a/src/main/java/su/nexmedia/engine/utils/LocUT.java b/src/main/java/mc/promcteam/engine/utils/LocUT.java similarity index 97% rename from src/main/java/su/nexmedia/engine/utils/LocUT.java rename to src/main/java/mc/promcteam/engine/utils/LocUT.java index 6410c0d..58e9689 100644 --- a/src/main/java/su/nexmedia/engine/utils/LocUT.java +++ b/src/main/java/mc/promcteam/engine/utils/LocUT.java @@ -1,9 +1,11 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.core.config.CoreConfig; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; @@ -14,9 +16,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.core.config.CoreConfig; - public class LocUT { @Nullable diff --git a/src/main/java/su/nexmedia/engine/utils/MsgUT.java b/src/main/java/mc/promcteam/engine/utils/MsgUT.java similarity index 92% rename from src/main/java/su/nexmedia/engine/utils/MsgUT.java rename to src/main/java/mc/promcteam/engine/utils/MsgUT.java index ca4406b..3396d40 100644 --- a/src/main/java/su/nexmedia/engine/utils/MsgUT.java +++ b/src/main/java/mc/promcteam/engine/utils/MsgUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.util.HashMap; import java.util.Map; @@ -15,7 +15,6 @@ import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; -import su.nexmedia.engine.utils.ClickText.ClickWord; public class MsgUT { @@ -93,7 +92,7 @@ public static void sendWithJSON(@NotNull CommandSender p, @NotNull String orig) return; } - Map jsonMap = new HashMap<>(); // Map for placeholders + Map jsonMap = new HashMap<>(); // Map for placeholders // Loop until JSON messages ends while (mFull.find()) { String textToJS = mFull.group(4); // Only text to JSON @@ -114,7 +113,7 @@ public static void sendWithJSON(@NotNull CommandSender p, @NotNull String orig) String arguments = mArgs.group(0).replace("{json:", "").replace("}", "").trim(); // Create json data cache - ClickWord cw = new ClickText(textToJS).createPlaceholder(textPlaceholder, textToJS); + ClickText.ClickWord cw = new ClickText(textToJS).createPlaceholder(textPlaceholder, textToJS); for (String argType : JSON_ARGUMENTS) { // Search for flag of this parameter @@ -151,15 +150,15 @@ public static void sendWithJSON(@NotNull CommandSender p, @NotNull String orig) } ClickText clickText = new ClickText(orig); - for (Entry e : jsonMap.entrySet()) { + for (Entry e : jsonMap.entrySet()) { String textPlaceholder = e.getKey()[0]; String textOriginal = e.getKey()[1]; - ClickWord jsonData = e.getValue(); + ClickText.ClickWord jsonData = e.getValue(); //System.out.println("JS Place: " + textPlaceholder); //System.out.println("JS Orig: " + textOriginal); - ClickWord clickWord = clickText.createPlaceholder(textPlaceholder, textOriginal); + ClickText.ClickWord clickWord = clickText.createPlaceholder(textPlaceholder, textOriginal); clickWord.click = jsonData.click; clickWord.hover = jsonData.hover; } diff --git a/src/main/java/su/nexmedia/engine/utils/NumberUT.java b/src/main/java/mc/promcteam/engine/utils/NumberUT.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/NumberUT.java rename to src/main/java/mc/promcteam/engine/utils/NumberUT.java index f20b36d..bf53968 100644 --- a/src/main/java/su/nexmedia/engine/utils/NumberUT.java +++ b/src/main/java/mc/promcteam/engine/utils/NumberUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.text.DecimalFormat; diff --git a/src/main/java/su/nexmedia/engine/utils/PlayerUT.java b/src/main/java/mc/promcteam/engine/utils/PlayerUT.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/PlayerUT.java rename to src/main/java/mc/promcteam/engine/utils/PlayerUT.java index b70a44e..04d0e7d 100644 --- a/src/main/java/su/nexmedia/engine/utils/PlayerUT.java +++ b/src/main/java/mc/promcteam/engine/utils/PlayerUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/src/main/java/su/nexmedia/engine/utils/Reflex.java b/src/main/java/mc/promcteam/engine/utils/Reflex.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/Reflex.java rename to src/main/java/mc/promcteam/engine/utils/Reflex.java index 62e1daa..f3fba20 100644 --- a/src/main/java/su/nexmedia/engine/utils/Reflex.java +++ b/src/main/java/mc/promcteam/engine/utils/Reflex.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; +import mc.promcteam.engine.NexEngine; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/su/nexmedia/engine/utils/StringUT.java b/src/main/java/mc/promcteam/engine/utils/StringUT.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/StringUT.java rename to src/main/java/mc/promcteam/engine/utils/StringUT.java index 3bf2f5c..9f39a77 100644 --- a/src/main/java/su/nexmedia/engine/utils/StringUT.java +++ b/src/main/java/mc/promcteam/engine/utils/StringUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.util.ArrayList; import java.util.Arrays; @@ -9,13 +9,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.core.Version; import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.text.WordUtils; import org.bukkit.util.StringUtil; import org.jetbrains.annotations.NotNull; import net.md_5.bungee.api.ChatColor; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.core.Version; public class StringUT { diff --git a/src/main/java/su/nexmedia/engine/utils/TimeUT.java b/src/main/java/mc/promcteam/engine/utils/TimeUT.java similarity index 94% rename from src/main/java/su/nexmedia/engine/utils/TimeUT.java rename to src/main/java/mc/promcteam/engine/utils/TimeUT.java index 9a8d905..6825af6 100644 --- a/src/main/java/su/nexmedia/engine/utils/TimeUT.java +++ b/src/main/java/mc/promcteam/engine/utils/TimeUT.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.time.Instant; import java.time.LocalDateTime; @@ -6,11 +6,10 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.core.config.CoreLang; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.core.config.CoreLang; - public class TimeUT { private static final NexEngine ENGINE = NexEngine.get(); diff --git a/src/main/java/su/nexmedia/engine/utils/Zipper.java b/src/main/java/mc/promcteam/engine/utils/Zipper.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/Zipper.java rename to src/main/java/mc/promcteam/engine/utils/Zipper.java index 3152dba..6eed225 100644 --- a/src/main/java/su/nexmedia/engine/utils/Zipper.java +++ b/src/main/java/mc/promcteam/engine/utils/Zipper.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils; +package mc.promcteam.engine.utils; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/su/nexmedia/engine/utils/actions/ActionCategory.java b/src/main/java/mc/promcteam/engine/utils/actions/ActionCategory.java similarity index 61% rename from src/main/java/su/nexmedia/engine/utils/actions/ActionCategory.java rename to src/main/java/mc/promcteam/engine/utils/actions/ActionCategory.java index 1a8c65a..3f9cfd5 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/ActionCategory.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/ActionCategory.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions; +package mc.promcteam.engine.utils.actions; public enum ActionCategory { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/ActionManipulator.java b/src/main/java/mc/promcteam/engine/utils/actions/ActionManipulator.java similarity index 93% rename from src/main/java/su/nexmedia/engine/utils/actions/ActionManipulator.java rename to src/main/java/mc/promcteam/engine/utils/actions/ActionManipulator.java index a5fb95b..11e25ae 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/ActionManipulator.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/ActionManipulator.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions; +package mc.promcteam.engine.utils.actions; import java.util.ArrayList; import java.util.Collections; @@ -10,6 +10,9 @@ import java.util.Set; import java.util.function.UnaryOperator; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.config.api.JYML; +import mc.promcteam.engine.hooks.Hooks; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -17,15 +20,12 @@ import com.google.common.collect.Sets; import me.clip.placeholderapi.PlaceholderAPI; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.config.api.JYML; -import su.nexmedia.engine.hooks.Hooks; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.targets.ITargetSelector; -import su.nexmedia.engine.utils.constants.JStrings; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.targets.ITargetSelector; +import mc.promcteam.engine.utils.constants.JStrings; public class ActionManipulator { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/ActionSection.java b/src/main/java/mc/promcteam/engine/utils/actions/ActionSection.java similarity index 97% rename from src/main/java/su/nexmedia/engine/utils/actions/ActionSection.java rename to src/main/java/mc/promcteam/engine/utils/actions/ActionSection.java index 530e830..eb9708c 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/ActionSection.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/ActionSection.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions; +package mc.promcteam.engine.utils.actions; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/su/nexmedia/engine/utils/actions/ActionsManager.java b/src/main/java/mc/promcteam/engine/utils/actions/ActionsManager.java similarity index 72% rename from src/main/java/su/nexmedia/engine/utils/actions/ActionsManager.java rename to src/main/java/mc/promcteam/engine/utils/actions/ActionsManager.java index 7cb45a2..dd27592 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/ActionsManager.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/ActionsManager.java @@ -1,58 +1,58 @@ -package su.nexmedia.engine.utils.actions; +package mc.promcteam.engine.utils.actions; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.manager.IManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.manager.IManager; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.list.Action_ActionBar; -import su.nexmedia.engine.utils.actions.actions.list.Action_Broadcast; -import su.nexmedia.engine.utils.actions.actions.list.Action_Burn; -import su.nexmedia.engine.utils.actions.actions.list.Action_CommandConsole; -import su.nexmedia.engine.utils.actions.actions.list.Action_CommandOp; -import su.nexmedia.engine.utils.actions.actions.list.Action_CommandPlayer; -import su.nexmedia.engine.utils.actions.actions.list.Action_Damage; -import su.nexmedia.engine.utils.actions.actions.list.Action_Firework; -import su.nexmedia.engine.utils.actions.actions.list.Action_Goto; -import su.nexmedia.engine.utils.actions.actions.list.Action_Health; -import su.nexmedia.engine.utils.actions.actions.list.Action_Hook; -import su.nexmedia.engine.utils.actions.actions.list.Action_Hunger; -import su.nexmedia.engine.utils.actions.actions.list.Action_Lightning; -import su.nexmedia.engine.utils.actions.actions.list.Action_Message; -import su.nexmedia.engine.utils.actions.actions.list.Action_ParticleSimple; -import su.nexmedia.engine.utils.actions.actions.list.Action_Potion; -import su.nexmedia.engine.utils.actions.actions.list.Action_ProgressBar; -import su.nexmedia.engine.utils.actions.actions.list.Action_Projectile; -import su.nexmedia.engine.utils.actions.actions.list.Action_Saturation; -import su.nexmedia.engine.utils.actions.actions.list.Action_Sound; -import su.nexmedia.engine.utils.actions.actions.list.Action_Teleport; -import su.nexmedia.engine.utils.actions.actions.list.Action_Throw; -import su.nexmedia.engine.utils.actions.actions.list.Action_Titles; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.conditions.list.Condition_EntityHealth; -import su.nexmedia.engine.utils.actions.conditions.list.Condition_EntityType; -import su.nexmedia.engine.utils.actions.conditions.list.Condition_Permission; -import su.nexmedia.engine.utils.actions.conditions.list.Condition_VaultBalance; -import su.nexmedia.engine.utils.actions.conditions.list.Condition_WorldTime; -import su.nexmedia.engine.utils.actions.params.IParam; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.defaults.IParamBoolean; -import su.nexmedia.engine.utils.actions.params.defaults.IParamNumber; -import su.nexmedia.engine.utils.actions.params.defaults.IParamString; -import su.nexmedia.engine.utils.actions.params.list.AllowSelfParam; -import su.nexmedia.engine.utils.actions.params.list.AttackableParam; -import su.nexmedia.engine.utils.actions.params.list.LocationParam; -import su.nexmedia.engine.utils.actions.params.list.OffsetParam; -import su.nexmedia.engine.utils.actions.targets.ITargetSelector; -import su.nexmedia.engine.utils.actions.targets.list.Target_FromSight; -import su.nexmedia.engine.utils.actions.targets.list.Target_Radius; -import su.nexmedia.engine.utils.actions.targets.list.Target_Self; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.list.Action_ActionBar; +import mc.promcteam.engine.utils.actions.actions.list.Action_Broadcast; +import mc.promcteam.engine.utils.actions.actions.list.Action_Burn; +import mc.promcteam.engine.utils.actions.actions.list.Action_CommandConsole; +import mc.promcteam.engine.utils.actions.actions.list.Action_CommandOp; +import mc.promcteam.engine.utils.actions.actions.list.Action_CommandPlayer; +import mc.promcteam.engine.utils.actions.actions.list.Action_Damage; +import mc.promcteam.engine.utils.actions.actions.list.Action_Firework; +import mc.promcteam.engine.utils.actions.actions.list.Action_Goto; +import mc.promcteam.engine.utils.actions.actions.list.Action_Health; +import mc.promcteam.engine.utils.actions.actions.list.Action_Hook; +import mc.promcteam.engine.utils.actions.actions.list.Action_Hunger; +import mc.promcteam.engine.utils.actions.actions.list.Action_Lightning; +import mc.promcteam.engine.utils.actions.actions.list.Action_Message; +import mc.promcteam.engine.utils.actions.actions.list.Action_ParticleSimple; +import mc.promcteam.engine.utils.actions.actions.list.Action_Potion; +import mc.promcteam.engine.utils.actions.actions.list.Action_ProgressBar; +import mc.promcteam.engine.utils.actions.actions.list.Action_Projectile; +import mc.promcteam.engine.utils.actions.actions.list.Action_Saturation; +import mc.promcteam.engine.utils.actions.actions.list.Action_Sound; +import mc.promcteam.engine.utils.actions.actions.list.Action_Teleport; +import mc.promcteam.engine.utils.actions.actions.list.Action_Throw; +import mc.promcteam.engine.utils.actions.actions.list.Action_Titles; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.conditions.list.Condition_EntityHealth; +import mc.promcteam.engine.utils.actions.conditions.list.Condition_EntityType; +import mc.promcteam.engine.utils.actions.conditions.list.Condition_Permission; +import mc.promcteam.engine.utils.actions.conditions.list.Condition_VaultBalance; +import mc.promcteam.engine.utils.actions.conditions.list.Condition_WorldTime; +import mc.promcteam.engine.utils.actions.params.IParam; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.defaults.IParamBoolean; +import mc.promcteam.engine.utils.actions.params.defaults.IParamNumber; +import mc.promcteam.engine.utils.actions.params.defaults.IParamString; +import mc.promcteam.engine.utils.actions.params.list.AllowSelfParam; +import mc.promcteam.engine.utils.actions.params.list.AttackableParam; +import mc.promcteam.engine.utils.actions.params.list.LocationParam; +import mc.promcteam.engine.utils.actions.params.list.OffsetParam; +import mc.promcteam.engine.utils.actions.targets.ITargetSelector; +import mc.promcteam.engine.utils.actions.targets.list.Target_FromSight; +import mc.promcteam.engine.utils.actions.targets.list.Target_Radius; +import mc.promcteam.engine.utils.actions.targets.list.Target_Self; public class ActionsManager extends IManager { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/Parametized.java b/src/main/java/mc/promcteam/engine/utils/actions/Parametized.java similarity index 89% rename from src/main/java/su/nexmedia/engine/utils/actions/Parametized.java rename to src/main/java/mc/promcteam/engine/utils/actions/Parametized.java index ccb4b90..e63367e 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/Parametized.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/Parametized.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions; +package mc.promcteam.engine.utils.actions; import java.util.HashMap; import java.util.HashSet; @@ -7,12 +7,12 @@ import java.util.Set; import java.util.regex.Matcher; +import mc.promcteam.engine.NexPlugin; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.params.IParam; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamValue; +import mc.promcteam.engine.utils.actions.params.IParam; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamValue; public abstract class Parametized { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/IActionExecutor.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/IActionExecutor.java similarity index 86% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/IActionExecutor.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/IActionExecutor.java index ea580d2..0b905ea 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/IActionExecutor.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/IActionExecutor.java @@ -1,17 +1,17 @@ -package su.nexmedia.engine.utils.actions.actions; +package mc.promcteam.engine.utils.actions.actions; import java.util.HashSet; import java.util.Map; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.ActionManipulator; +import mc.promcteam.engine.utils.actions.Parametized; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.ActionManipulator; -import su.nexmedia.engine.utils.actions.Parametized; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public abstract class IActionExecutor extends Parametized { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/IActionType.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/IActionType.java similarity index 96% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/IActionType.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/IActionType.java index 73c0104..eeaed96 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/IActionType.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/IActionType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.actions; +package mc.promcteam.engine.utils.actions.actions; public class IActionType { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ActionBar.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ActionBar.java similarity index 75% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ActionBar.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ActionBar.java index 0ef8881..721edac 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ActionBar.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ActionBar.java @@ -1,19 +1,19 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.MsgUT; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.MsgUT; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_ActionBar extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Broadcast.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Broadcast.java similarity index 73% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Broadcast.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Broadcast.java index fdfcb13..3ffee0d 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Broadcast.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Broadcast.java @@ -1,16 +1,16 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Broadcast extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Burn.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Burn.java similarity index 73% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Burn.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Burn.java index 61bff07..d4889f5 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Burn.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Burn.java @@ -1,16 +1,16 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Burn extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandConsole.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandConsole.java similarity index 78% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandConsole.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandConsole.java index 7a4350b..6678214 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandConsole.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandConsole.java @@ -1,17 +1,17 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_CommandConsole extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandOp.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandOp.java similarity index 80% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandOp.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandOp.java index 54aa6c6..55eca10 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandOp.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandOp.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_CommandOp extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandPlayer.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandPlayer.java similarity index 79% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandPlayer.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandPlayer.java index dfba433..2ceb5c9 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_CommandPlayer.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_CommandPlayer.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_CommandPlayer extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Damage.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Damage.java similarity index 80% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Damage.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Damage.java index 8c1e38b..0058c60 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Damage.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Damage.java @@ -1,19 +1,19 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Projectile; import org.bukkit.projectiles.ProjectileSource; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Damage extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Firework.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Firework.java similarity index 69% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Firework.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Firework.java index a408f93..a3bd09c 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Firework.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Firework.java @@ -1,17 +1,17 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.random.Rnd; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.random.Rnd; public class Action_Firework extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Goto.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Goto.java similarity index 66% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Goto.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Goto.java index 7f10989..011e690 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Goto.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Goto.java @@ -1,16 +1,16 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Goto extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Health.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Health.java similarity index 75% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Health.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Health.java index b55873d..1c25a06 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Health.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Health.java @@ -1,20 +1,20 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.EntityUT; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.EntityUT; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Health extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Hook.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Hook.java similarity index 85% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Hook.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Hook.java index 4fd9948..8ed22dc 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Hook.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Hook.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Hook extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Hunger.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Hunger.java similarity index 75% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Hunger.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Hunger.java index 67b8c64..b9093ba 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Hunger.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Hunger.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Hunger extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Lightning.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Lightning.java similarity index 69% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Lightning.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Lightning.java index 54532d8..0401f91 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Lightning.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Lightning.java @@ -1,16 +1,16 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Lightning extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Message.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Message.java similarity index 73% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Message.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Message.java index cbcf536..4c16ed0 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Message.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Message.java @@ -1,17 +1,17 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.MsgUT; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.MsgUT; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Message extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ParticleSimple.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ParticleSimple.java similarity index 80% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ParticleSimple.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ParticleSimple.java index d929950..b80bf99 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ParticleSimple.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ParticleSimple.java @@ -1,19 +1,19 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.EffectUT; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.EffectUT; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_ParticleSimple extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Potion.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Potion.java similarity index 81% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Potion.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Potion.java index a4fe6d0..ab3bccf 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Potion.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Potion.java @@ -1,19 +1,19 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Potion extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ProgressBar.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ProgressBar.java similarity index 89% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ProgressBar.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ProgressBar.java index f5b5d47..0adbef3 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_ProgressBar.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_ProgressBar.java @@ -1,21 +1,21 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.HashSet; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.StringUT; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_ProgressBar extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Projectile.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Projectile.java similarity index 88% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Projectile.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Projectile.java index 6a20a6d..b5ef6ef 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Projectile.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Projectile.java @@ -1,8 +1,9 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; @@ -11,11 +12,10 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Projectile extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Saturation.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Saturation.java similarity index 75% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Saturation.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Saturation.java index 7322673..3ab9437 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Saturation.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Saturation.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamValue; public class Action_Saturation extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Sound.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Sound.java similarity index 72% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Sound.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Sound.java index 3e5175a..68de1be 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Sound.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Sound.java @@ -1,19 +1,19 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.MsgUT; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.MsgUT; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Sound extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Teleport.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Teleport.java similarity index 83% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Teleport.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Teleport.java index 223a82f..4ef4f99 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Teleport.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Teleport.java @@ -1,19 +1,19 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.StringUT; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Teleport extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Throw.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Throw.java similarity index 85% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Throw.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Throw.java index 78c8546..b4477cd 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Throw.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Throw.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Throw extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Titles.java b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Titles.java similarity index 81% rename from src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Titles.java rename to src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Titles.java index f51df4d..68a7387 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/actions/list/Action_Titles.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/actions/list/Action_Titles.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.actions.list; +package mc.promcteam.engine.utils.actions.actions.list; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.actions.IActionExecutor; +import mc.promcteam.engine.utils.actions.actions.IActionType; +import mc.promcteam.engine.utils.actions.params.IParamResult; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.actions.IActionExecutor; -import su.nexmedia.engine.utils.actions.actions.IActionType; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Action_Titles extends IActionExecutor { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/api/IActioned.java b/src/main/java/mc/promcteam/engine/utils/actions/api/IActioned.java similarity index 54% rename from src/main/java/su/nexmedia/engine/utils/actions/api/IActioned.java rename to src/main/java/mc/promcteam/engine/utils/actions/api/IActioned.java index ea87801..e160b09 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/api/IActioned.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/api/IActioned.java @@ -1,9 +1,8 @@ -package su.nexmedia.engine.utils.actions.api; +package mc.promcteam.engine.utils.actions.api; +import mc.promcteam.engine.utils.actions.ActionManipulator; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.ActionManipulator; - public interface IActioned { @NotNull diff --git a/src/main/java/su/nexmedia/engine/utils/actions/conditions/IConditionType.java b/src/main/java/mc/promcteam/engine/utils/actions/conditions/IConditionType.java similarity index 85% rename from src/main/java/su/nexmedia/engine/utils/actions/conditions/IConditionType.java rename to src/main/java/mc/promcteam/engine/utils/actions/conditions/IConditionType.java index cb7dace..e627091 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/conditions/IConditionType.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/conditions/IConditionType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.conditions; +package mc.promcteam.engine.utils.actions.conditions; public class IConditionType { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/conditions/IConditionValidator.java b/src/main/java/mc/promcteam/engine/utils/actions/conditions/IConditionValidator.java similarity index 89% rename from src/main/java/su/nexmedia/engine/utils/actions/conditions/IConditionValidator.java rename to src/main/java/mc/promcteam/engine/utils/actions/conditions/IConditionValidator.java index 53450f0..d09cc2f 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/conditions/IConditionValidator.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/conditions/IConditionValidator.java @@ -1,20 +1,20 @@ -package su.nexmedia.engine.utils.actions.conditions; +package mc.promcteam.engine.utils.actions.conditions; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.function.Predicate; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.ActionManipulator; +import mc.promcteam.engine.utils.actions.Parametized; +import mc.promcteam.engine.utils.constants.JStrings; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.ActionManipulator; -import su.nexmedia.engine.utils.actions.Parametized; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.constants.JStrings; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public abstract class IConditionValidator extends Parametized { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_EntityHealth.java b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_EntityHealth.java similarity index 74% rename from src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_EntityHealth.java rename to src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_EntityHealth.java index 77c246a..35d236c 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_EntityHealth.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_EntityHealth.java @@ -1,23 +1,23 @@ -package su.nexmedia.engine.utils.actions.conditions.list; +package mc.promcteam.engine.utils.actions.conditions.list; import java.util.List; import java.util.Set; import java.util.function.Predicate; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.EntityUT; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.EntityUT; -import su.nexmedia.engine.utils.actions.conditions.IConditionType; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; -import su.nexmedia.engine.utils.actions.params.IParamValue.IOperator; +import mc.promcteam.engine.utils.actions.conditions.IConditionType; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamValue; +import mc.promcteam.engine.utils.actions.params.IParamValue.IOperator; public class Condition_EntityHealth extends IConditionValidator { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_EntityType.java b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_EntityType.java similarity index 74% rename from src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_EntityType.java rename to src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_EntityType.java index 12d499d..0c57d1b 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_EntityType.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_EntityType.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.conditions.list; +package mc.promcteam.engine.utils.actions.conditions.list; import java.util.List; import java.util.Set; import java.util.function.Predicate; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.conditions.IConditionType; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.conditions.IConditionType; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Condition_EntityType extends IConditionValidator { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_Permission.java b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_Permission.java similarity index 74% rename from src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_Permission.java rename to src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_Permission.java index 6ced081..baa7ac1 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_Permission.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_Permission.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.conditions.list; +package mc.promcteam.engine.utils.actions.conditions.list; import java.util.List; import java.util.Set; import java.util.function.Predicate; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.conditions.IConditionType; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.conditions.IConditionType; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public class Condition_Permission extends IConditionValidator { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_VaultBalance.java b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_VaultBalance.java similarity index 72% rename from src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_VaultBalance.java rename to src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_VaultBalance.java index bfab734..0231c67 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_VaultBalance.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_VaultBalance.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.conditions.list; +package mc.promcteam.engine.utils.actions.conditions.list; import java.util.List; import java.util.Set; @@ -6,19 +6,19 @@ import javax.annotation.Nullable; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.hooks.external.VaultHK; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.hooks.external.VaultHK; -import su.nexmedia.engine.utils.actions.conditions.IConditionType; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; -import su.nexmedia.engine.utils.actions.params.IParamValue.IOperator; +import mc.promcteam.engine.utils.actions.conditions.IConditionType; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamValue; +import mc.promcteam.engine.utils.actions.params.IParamValue.IOperator; public class Condition_VaultBalance extends IConditionValidator { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_WorldTime.java b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_WorldTime.java similarity index 76% rename from src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_WorldTime.java rename to src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_WorldTime.java index 1b8bcc7..e3aaebf 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/conditions/list/Condition_WorldTime.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/conditions/list/Condition_WorldTime.java @@ -1,20 +1,20 @@ -package su.nexmedia.engine.utils.actions.conditions.list; +package mc.promcteam.engine.utils.actions.conditions.list; import java.util.List; import java.util.Set; import java.util.function.Predicate; +import mc.promcteam.engine.NexPlugin; import org.bukkit.World; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.conditions.IConditionType; -import su.nexmedia.engine.utils.actions.conditions.IConditionValidator; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue.IOperator; +import mc.promcteam.engine.utils.actions.conditions.IConditionType; +import mc.promcteam.engine.utils.actions.conditions.IConditionValidator; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.IParamValue.IOperator; public class Condition_WorldTime extends IConditionValidator { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/IAutoValidated.java b/src/main/java/mc/promcteam/engine/utils/actions/params/IAutoValidated.java similarity index 82% rename from src/main/java/su/nexmedia/engine/utils/actions/params/IAutoValidated.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/IAutoValidated.java index bdcebd3..ef7314e 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/IAutoValidated.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/IAutoValidated.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.params; +package mc.promcteam.engine.utils.actions.params; import java.util.Set; diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/IParam.java b/src/main/java/mc/promcteam/engine/utils/actions/params/IParam.java similarity index 85% rename from src/main/java/su/nexmedia/engine/utils/actions/params/IParam.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/IParam.java index 42ff61b..00da3b5 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/IParam.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/IParam.java @@ -1,11 +1,10 @@ -package su.nexmedia.engine.utils.actions.params; +package mc.promcteam.engine.utils.actions.params; import java.util.regex.Pattern; +import mc.promcteam.engine.utils.actions.params.parser.IParamParser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.params.parser.IParamParser; - public abstract class IParam { protected final String key; diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/IParamResult.java b/src/main/java/mc/promcteam/engine/utils/actions/params/IParamResult.java similarity index 91% rename from src/main/java/su/nexmedia/engine/utils/actions/params/IParamResult.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/IParamResult.java index b71dd00..028d8da 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/IParamResult.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/IParamResult.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.params; +package mc.promcteam.engine.utils.actions.params; import java.util.Map; diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/IParamType.java b/src/main/java/mc/promcteam/engine/utils/actions/params/IParamType.java similarity index 95% rename from src/main/java/su/nexmedia/engine/utils/actions/params/IParamType.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/IParamType.java index 0b40464..c715df4 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/IParamType.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/IParamType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.params; +package mc.promcteam.engine.utils.actions.params; public class IParamType { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/IParamValue.java b/src/main/java/mc/promcteam/engine/utils/actions/params/IParamValue.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/actions/params/IParamValue.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/IParamValue.java index 7718af6..62ffa44 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/IParamValue.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/IParamValue.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.params; +package mc.promcteam.engine.utils.actions.params; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamBoolean.java b/src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamBoolean.java similarity index 60% rename from src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamBoolean.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamBoolean.java index 79f89fd..98e5a49 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamBoolean.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamBoolean.java @@ -1,10 +1,9 @@ -package su.nexmedia.engine.utils.actions.params.defaults; +package mc.promcteam.engine.utils.actions.params.defaults; +import mc.promcteam.engine.utils.actions.params.IParam; +import mc.promcteam.engine.utils.actions.params.parser.IParamParser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.params.IParam; -import su.nexmedia.engine.utils.actions.params.parser.IParamParser; - public class IParamBoolean extends IParam { public IParamBoolean(@NotNull String key, @NotNull String flag) { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamNumber.java b/src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamNumber.java similarity index 60% rename from src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamNumber.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamNumber.java index 0c1a64d..9ed8543 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamNumber.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamNumber.java @@ -1,9 +1,9 @@ -package su.nexmedia.engine.utils.actions.params.defaults; +package mc.promcteam.engine.utils.actions.params.defaults; +import mc.promcteam.engine.utils.actions.params.parser.IParamParser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.params.IParam; -import su.nexmedia.engine.utils.actions.params.parser.IParamParser; +import mc.promcteam.engine.utils.actions.params.IParam; public class IParamNumber extends IParam { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamString.java b/src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamString.java similarity index 59% rename from src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamString.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamString.java index b558539..fa7e835 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/defaults/IParamString.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/defaults/IParamString.java @@ -1,10 +1,9 @@ -package su.nexmedia.engine.utils.actions.params.defaults; +package mc.promcteam.engine.utils.actions.params.defaults; +import mc.promcteam.engine.utils.actions.params.IParam; +import mc.promcteam.engine.utils.actions.params.parser.IParamParser; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.params.IParam; -import su.nexmedia.engine.utils.actions.params.parser.IParamParser; - public class IParamString extends IParam { public IParamString(@NotNull String key, @NotNull String flag) { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/list/AllowSelfParam.java b/src/main/java/mc/promcteam/engine/utils/actions/params/list/AllowSelfParam.java similarity index 60% rename from src/main/java/su/nexmedia/engine/utils/actions/params/list/AllowSelfParam.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/list/AllowSelfParam.java index 8cd6ebd..423bda7 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/list/AllowSelfParam.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/list/AllowSelfParam.java @@ -1,14 +1,14 @@ -package su.nexmedia.engine.utils.actions.params.list; +package mc.promcteam.engine.utils.actions.params.list; import java.util.Set; +import mc.promcteam.engine.utils.actions.params.IAutoValidated; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.params.IAutoValidated; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; -import su.nexmedia.engine.utils.actions.params.defaults.IParamBoolean; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.defaults.IParamBoolean; public class AllowSelfParam extends IParamBoolean implements IAutoValidated { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/list/AttackableParam.java b/src/main/java/mc/promcteam/engine/utils/actions/params/list/AttackableParam.java similarity index 60% rename from src/main/java/su/nexmedia/engine/utils/actions/params/list/AttackableParam.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/list/AttackableParam.java index 0886099..3a56f13 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/list/AttackableParam.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/list/AttackableParam.java @@ -1,15 +1,15 @@ -package su.nexmedia.engine.utils.actions.params.list; +package mc.promcteam.engine.utils.actions.params.list; import java.util.Set; +import mc.promcteam.engine.hooks.Hooks; +import mc.promcteam.engine.utils.actions.params.IAutoValidated; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.hooks.Hooks; -import su.nexmedia.engine.utils.actions.params.IAutoValidated; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; -import su.nexmedia.engine.utils.actions.params.defaults.IParamBoolean; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.defaults.IParamBoolean; public class AttackableParam extends IParamBoolean implements IAutoValidated { diff --git a/src/main/java/mc/promcteam/engine/utils/actions/params/list/LocationParam.java b/src/main/java/mc/promcteam/engine/utils/actions/params/list/LocationParam.java new file mode 100644 index 0000000..debe874 --- /dev/null +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/list/LocationParam.java @@ -0,0 +1,11 @@ +package mc.promcteam.engine.utils.actions.params.list; + +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.defaults.IParamString; + +public class LocationParam extends IParamString { + + public LocationParam() { + super(IParamType.LOCATION, "location"); + } +} diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/list/OffsetParam.java b/src/main/java/mc/promcteam/engine/utils/actions/params/list/OffsetParam.java similarity index 67% rename from src/main/java/su/nexmedia/engine/utils/actions/params/list/OffsetParam.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/list/OffsetParam.java index c43b734..b6b300b 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/list/OffsetParam.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/list/OffsetParam.java @@ -1,12 +1,12 @@ -package su.nexmedia.engine.utils.actions.params.list; +package mc.promcteam.engine.utils.actions.params.list; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.params.IParam; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.IParamValue; -import su.nexmedia.engine.utils.actions.params.parser.IParamParser; +import mc.promcteam.engine.utils.actions.params.IParam; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.params.parser.IParamParser; public class OffsetParam extends IParam { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/IParamParser.java b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/IParamParser.java similarity index 74% rename from src/main/java/su/nexmedia/engine/utils/actions/params/parser/IParamParser.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/parser/IParamParser.java index 9e234ab..ec9aec9 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/IParamParser.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/IParamParser.java @@ -1,9 +1,8 @@ -package su.nexmedia.engine.utils.actions.params.parser; +package mc.promcteam.engine.utils.actions.params.parser; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.params.IParamValue; - public interface IParamParser { public static final IParamParser BOOLEAN = new ParamBooleanParser(); diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamBooleanParser.java b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamBooleanParser.java similarity index 67% rename from src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamBooleanParser.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamBooleanParser.java index 29125c3..8b27098 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamBooleanParser.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamBooleanParser.java @@ -1,9 +1,8 @@ -package su.nexmedia.engine.utils.actions.params.parser; +package mc.promcteam.engine.utils.actions.params.parser; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.actions.params.IParamValue; - public class ParamBooleanParser implements IParamParser { @Override diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamNumberParser.java b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamNumberParser.java similarity index 61% rename from src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamNumberParser.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamNumberParser.java index 86f0681..4caa537 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamNumberParser.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamNumberParser.java @@ -1,20 +1,18 @@ -package su.nexmedia.engine.utils.actions.params.parser; +package mc.promcteam.engine.utils.actions.params.parser; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.params.IParamValue; -import su.nexmedia.engine.utils.actions.params.IParamValue.IOperator; - public class ParamNumberParser implements IParamParser { @Override @NotNull public IParamValue parseValue(@NotNull String str) { boolean perc = str.contains("%"); - IOperator oper = IOperator.parse(str); + IParamValue.IOperator oper = IParamValue.IOperator.parse(str); - str = IOperator.clean(str); + str = IParamValue.IOperator.clean(str); double amount = StringUT.getDouble(str.replace("%", ""), 0D, true); IParamValue val = new IParamValue((int)amount); diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamStringParser.java b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamStringParser.java similarity index 58% rename from src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamStringParser.java rename to src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamStringParser.java index 59634f9..b25bb65 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/parser/ParamStringParser.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/params/parser/ParamStringParser.java @@ -1,10 +1,9 @@ -package su.nexmedia.engine.utils.actions.params.parser; +package mc.promcteam.engine.utils.actions.params.parser; +import mc.promcteam.engine.utils.StringUT; +import mc.promcteam.engine.utils.actions.params.IParamValue; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.utils.StringUT; -import su.nexmedia.engine.utils.actions.params.IParamValue; - public class ParamStringParser implements IParamParser { @Override diff --git a/src/main/java/su/nexmedia/engine/utils/actions/targets/ITargetSelector.java b/src/main/java/mc/promcteam/engine/utils/actions/targets/ITargetSelector.java similarity index 78% rename from src/main/java/su/nexmedia/engine/utils/actions/targets/ITargetSelector.java rename to src/main/java/mc/promcteam/engine/utils/actions/targets/ITargetSelector.java index 67d5c25..f719cc2 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/targets/ITargetSelector.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/targets/ITargetSelector.java @@ -1,18 +1,18 @@ -package su.nexmedia.engine.utils.actions.targets; +package mc.promcteam.engine.utils.actions.targets; import java.util.Set; +import mc.promcteam.engine.NexPlugin; import org.bukkit.entity.Entity; import org.bukkit.entity.Projectile; import org.bukkit.projectiles.ProjectileSource; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.Parametized; -import su.nexmedia.engine.utils.actions.params.IAutoValidated; -import su.nexmedia.engine.utils.actions.params.IParam; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.Parametized; +import mc.promcteam.engine.utils.actions.params.IAutoValidated; +import mc.promcteam.engine.utils.actions.params.IParam; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; public abstract class ITargetSelector extends Parametized { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/targets/ITargetType.java b/src/main/java/mc/promcteam/engine/utils/actions/targets/ITargetType.java similarity index 78% rename from src/main/java/su/nexmedia/engine/utils/actions/targets/ITargetType.java rename to src/main/java/mc/promcteam/engine/utils/actions/targets/ITargetType.java index abefd7c..a36f1c5 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/targets/ITargetType.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/targets/ITargetType.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.actions.targets; +package mc.promcteam.engine.utils.actions.targets; public class ITargetType { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_FromSight.java b/src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_FromSight.java similarity index 82% rename from src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_FromSight.java rename to src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_FromSight.java index 9bc617e..3dac361 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_FromSight.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_FromSight.java @@ -1,9 +1,11 @@ -package su.nexmedia.engine.utils.actions.targets.list; +package mc.promcteam.engine.utils.actions.targets.list; import java.util.HashSet; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.targets.ITargetType; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Entity; @@ -11,11 +13,9 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.targets.ITargetSelector; -import su.nexmedia.engine.utils.actions.targets.ITargetType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.targets.ITargetSelector; public class Target_FromSight extends ITargetSelector { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_Radius.java b/src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_Radius.java similarity index 75% rename from src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_Radius.java rename to src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_Radius.java index 11dddea..07f0792 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_Radius.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_Radius.java @@ -1,17 +1,17 @@ -package su.nexmedia.engine.utils.actions.targets.list; +package mc.promcteam.engine.utils.actions.targets.list; import java.util.HashSet; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.targets.ITargetType; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.targets.ITargetSelector; -import su.nexmedia.engine.utils.actions.targets.ITargetType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.params.IParamType; +import mc.promcteam.engine.utils.actions.targets.ITargetSelector; public class Target_Radius extends ITargetSelector { diff --git a/src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_Self.java b/src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_Self.java similarity index 71% rename from src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_Self.java rename to src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_Self.java index 4d294c0..add2aae 100644 --- a/src/main/java/su/nexmedia/engine/utils/actions/targets/list/Target_Self.java +++ b/src/main/java/mc/promcteam/engine/utils/actions/targets/list/Target_Self.java @@ -1,16 +1,16 @@ -package su.nexmedia.engine.utils.actions.targets.list; +package mc.promcteam.engine.utils.actions.targets.list; import java.util.HashSet; import java.util.List; import java.util.Set; +import mc.promcteam.engine.NexPlugin; +import mc.promcteam.engine.utils.actions.targets.ITargetType; import org.bukkit.entity.Entity; import org.jetbrains.annotations.NotNull; -import su.nexmedia.engine.NexPlugin; -import su.nexmedia.engine.utils.actions.params.IParamResult; -import su.nexmedia.engine.utils.actions.targets.ITargetSelector; -import su.nexmedia.engine.utils.actions.targets.ITargetType; +import mc.promcteam.engine.utils.actions.params.IParamResult; +import mc.promcteam.engine.utils.actions.targets.ITargetSelector; public class Target_Self extends ITargetSelector { diff --git a/src/main/java/su/nexmedia/engine/utils/constants/JNumbers.java b/src/main/java/mc/promcteam/engine/utils/constants/JNumbers.java similarity index 66% rename from src/main/java/su/nexmedia/engine/utils/constants/JNumbers.java rename to src/main/java/mc/promcteam/engine/utils/constants/JNumbers.java index efe7a5e..726a8b8 100644 --- a/src/main/java/su/nexmedia/engine/utils/constants/JNumbers.java +++ b/src/main/java/mc/promcteam/engine/utils/constants/JNumbers.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.constants; +package mc.promcteam.engine.utils.constants; public class JNumbers { diff --git a/src/main/java/su/nexmedia/engine/utils/constants/JStrings.java b/src/main/java/mc/promcteam/engine/utils/constants/JStrings.java similarity index 87% rename from src/main/java/su/nexmedia/engine/utils/constants/JStrings.java rename to src/main/java/mc/promcteam/engine/utils/constants/JStrings.java index 7daca7a..cce4d69 100644 --- a/src/main/java/su/nexmedia/engine/utils/constants/JStrings.java +++ b/src/main/java/mc/promcteam/engine/utils/constants/JStrings.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.constants; +package mc.promcteam.engine.utils.constants; public class JStrings { diff --git a/src/main/java/su/nexmedia/engine/utils/craft/CraftManager.java b/src/main/java/mc/promcteam/engine/utils/craft/CraftManager.java similarity index 94% rename from src/main/java/su/nexmedia/engine/utils/craft/CraftManager.java rename to src/main/java/mc/promcteam/engine/utils/craft/CraftManager.java index 605a7bb..5588db1 100644 --- a/src/main/java/su/nexmedia/engine/utils/craft/CraftManager.java +++ b/src/main/java/mc/promcteam/engine/utils/craft/CraftManager.java @@ -1,9 +1,12 @@ -package su.nexmedia.engine.utils.craft; +package mc.promcteam.engine.utils.craft; import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.manager.api.Loadable; +import mc.promcteam.engine.utils.craft.api.IAbstractRecipe; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; import org.bukkit.inventory.FurnaceRecipe; @@ -13,10 +16,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.manager.api.Loadable; -import su.nexmedia.engine.utils.craft.api.IAbstractRecipe; - public class CraftManager implements Loadable { private NexEngine plugin; diff --git a/src/main/java/su/nexmedia/engine/utils/craft/api/IAbstractRecipe.java b/src/main/java/mc/promcteam/engine/utils/craft/api/IAbstractRecipe.java similarity index 93% rename from src/main/java/su/nexmedia/engine/utils/craft/api/IAbstractRecipe.java rename to src/main/java/mc/promcteam/engine/utils/craft/api/IAbstractRecipe.java index af0a3dd..cbc0ac4 100644 --- a/src/main/java/su/nexmedia/engine/utils/craft/api/IAbstractRecipe.java +++ b/src/main/java/mc/promcteam/engine/utils/craft/api/IAbstractRecipe.java @@ -1,13 +1,12 @@ -package su.nexmedia.engine.utils.craft.api; +package mc.promcteam.engine.utils.craft.api; +import mc.promcteam.engine.NexPlugin; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; - public abstract class IAbstractRecipe { protected final NexPlugin plugin; diff --git a/src/main/java/su/nexmedia/engine/utils/craft/api/ICraftRecipe.java b/src/main/java/mc/promcteam/engine/utils/craft/api/ICraftRecipe.java similarity index 96% rename from src/main/java/su/nexmedia/engine/utils/craft/api/ICraftRecipe.java rename to src/main/java/mc/promcteam/engine/utils/craft/api/ICraftRecipe.java index fcdf51c..4daf528 100644 --- a/src/main/java/su/nexmedia/engine/utils/craft/api/ICraftRecipe.java +++ b/src/main/java/mc/promcteam/engine/utils/craft/api/ICraftRecipe.java @@ -1,5 +1,6 @@ -package su.nexmedia.engine.utils.craft.api; +package mc.promcteam.engine.utils.craft.api; +import mc.promcteam.engine.NexPlugin; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; @@ -10,8 +11,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; - public class ICraftRecipe extends IAbstractRecipe { private boolean isShape; diff --git a/src/main/java/su/nexmedia/engine/utils/craft/api/IFurnaceRecipe.java b/src/main/java/mc/promcteam/engine/utils/craft/api/IFurnaceRecipe.java similarity index 95% rename from src/main/java/su/nexmedia/engine/utils/craft/api/IFurnaceRecipe.java rename to src/main/java/mc/promcteam/engine/utils/craft/api/IFurnaceRecipe.java index 0c3a5ac..49cee8b 100644 --- a/src/main/java/su/nexmedia/engine/utils/craft/api/IFurnaceRecipe.java +++ b/src/main/java/mc/promcteam/engine/utils/craft/api/IFurnaceRecipe.java @@ -1,5 +1,6 @@ -package su.nexmedia.engine.utils.craft.api; +package mc.promcteam.engine.utils.craft.api; +import mc.promcteam.engine.NexPlugin; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.inventory.FurnaceRecipe; @@ -9,8 +10,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.NexPlugin; - public class IFurnaceRecipe extends IAbstractRecipe { private ItemStack input; diff --git a/src/main/java/su/nexmedia/engine/utils/eval/Evaluator.java b/src/main/java/mc/promcteam/engine/utils/eval/Evaluator.java similarity index 96% rename from src/main/java/su/nexmedia/engine/utils/eval/Evaluator.java rename to src/main/java/mc/promcteam/engine/utils/eval/Evaluator.java index 73d9dbe..ce03706 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/Evaluator.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/Evaluator.java @@ -1,7 +1,7 @@ -package su.nexmedia.engine.utils.eval; +package mc.promcteam.engine.utils.eval; -import su.nexmedia.engine.NexEngine; -import su.nexmedia.engine.utils.eval.javaluator.DoubleEvaluator; +import mc.promcteam.engine.NexEngine; +import mc.promcteam.engine.utils.eval.javaluator.DoubleEvaluator; public class Evaluator { diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/AbstractEvaluator.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/AbstractEvaluator.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/AbstractEvaluator.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/AbstractEvaluator.java index 58a63d7..dac3d0e 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/AbstractEvaluator.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/AbstractEvaluator.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/AbstractVariableSet.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/AbstractVariableSet.java similarity index 92% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/AbstractVariableSet.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/AbstractVariableSet.java index 6f4e3fb..06f2f6d 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/AbstractVariableSet.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/AbstractVariableSet.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; /** An abstract variable set. *
Javaluator supports expression that contains variables (for example sin(x)). diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/BracketPair.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/BracketPair.java similarity index 96% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/BracketPair.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/BracketPair.java index ef5f37d..b73d3a2 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/BracketPair.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/BracketPair.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; /** A bracket pair. * @author Jean-Marc Astesana diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Constant.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Constant.java similarity index 95% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/Constant.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/Constant.java index 2d38eb2..7a242ef 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Constant.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Constant.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; /** * A constant in an expression. diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/DoubleEvaluator.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/DoubleEvaluator.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/DoubleEvaluator.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/DoubleEvaluator.java index 23ce7c0..d672f03 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/DoubleEvaluator.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/DoubleEvaluator.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; import java.text.NumberFormat; import java.text.ParsePosition; diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/EvaluationContext.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/EvaluationContext.java similarity index 88% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/EvaluationContext.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/EvaluationContext.java index 42af304..55c4644 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/EvaluationContext.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/EvaluationContext.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; public interface EvaluationContext { default public IllegalArgumentException getError(String msg){ diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Function.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Function.java similarity index 97% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/Function.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/Function.java index dcfde6c..cd785bb 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Function.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Function.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; /** A function. * @author Jean-Marc Astesana diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Operator.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Operator.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/Operator.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/Operator.java index d4cc522..700313a 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Operator.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Operator.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; /** An operator. * @author Jean-Marc Astesana diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Parameters.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Parameters.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/Parameters.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/Parameters.java index 3765b0d..834c6e3 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Parameters.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Parameters.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/StaticVariableSet.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/StaticVariableSet.java similarity index 95% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/StaticVariableSet.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/StaticVariableSet.java index 177f30a..7548023 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/StaticVariableSet.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/StaticVariableSet.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Token.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Token.java similarity index 98% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/Token.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/Token.java index c9a6f4e..c285a75 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Token.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Token.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; import java.util.Collections; diff --git a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Tokenizer.java b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Tokenizer.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/eval/javaluator/Tokenizer.java rename to src/main/java/mc/promcteam/engine/utils/eval/javaluator/Tokenizer.java index 176dab4..0b31828 100644 --- a/src/main/java/su/nexmedia/engine/utils/eval/javaluator/Tokenizer.java +++ b/src/main/java/mc/promcteam/engine/utils/eval/javaluator/Tokenizer.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.eval.javaluator; +package mc.promcteam.engine.utils.eval.javaluator; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/su/nexmedia/engine/utils/random/MTRandom.java b/src/main/java/mc/promcteam/engine/utils/random/MTRandom.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/random/MTRandom.java rename to src/main/java/mc/promcteam/engine/utils/random/MTRandom.java index 940ec91..5858272 100644 --- a/src/main/java/su/nexmedia/engine/utils/random/MTRandom.java +++ b/src/main/java/mc/promcteam/engine/utils/random/MTRandom.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.random; +package mc.promcteam.engine.utils.random; import java.util.Random; diff --git a/src/main/java/su/nexmedia/engine/utils/random/Rnd.java b/src/main/java/mc/promcteam/engine/utils/random/Rnd.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/random/Rnd.java rename to src/main/java/mc/promcteam/engine/utils/random/Rnd.java index 5f127dc..abee385 100644 --- a/src/main/java/su/nexmedia/engine/utils/random/Rnd.java +++ b/src/main/java/mc/promcteam/engine/utils/random/Rnd.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.random; +package mc.promcteam.engine.utils.random; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/su/nexmedia/engine/utils/reflection/ReflectionUtil.java b/src/main/java/mc/promcteam/engine/utils/reflection/ReflectionUtil.java similarity index 99% rename from src/main/java/su/nexmedia/engine/utils/reflection/ReflectionUtil.java rename to src/main/java/mc/promcteam/engine/utils/reflection/ReflectionUtil.java index 555f34e..da86839 100644 --- a/src/main/java/su/nexmedia/engine/utils/reflection/ReflectionUtil.java +++ b/src/main/java/mc/promcteam/engine/utils/reflection/ReflectionUtil.java @@ -1,4 +1,4 @@ -package su.nexmedia.engine.utils.reflection; +package mc.promcteam.engine.utils.reflection; import com.google.common.collect.Multimap; import com.mojang.authlib.GameProfile; @@ -13,9 +13,9 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import su.nexmedia.engine.utils.Reflex; -import su.nexmedia.engine.utils.constants.JNumbers; -import su.nexmedia.engine.utils.random.Rnd; +import mc.promcteam.engine.utils.Reflex; +import mc.promcteam.engine.utils.constants.JNumbers; +import mc.promcteam.engine.utils.random.Rnd; import java.io.*; import java.lang.reflect.Constructor; diff --git a/src/main/java/su/nexmedia/engine/config/api/ILangMsg.java b/src/main/java/su/nexmedia/engine/config/api/ILangMsg.java deleted file mode 100644 index a91af8d..0000000 --- a/src/main/java/su/nexmedia/engine/config/api/ILangMsg.java +++ /dev/null @@ -1,253 +0,0 @@ -package su.nexmedia.engine.config.api; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.function.UnaryOperator; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import su.nexmedia.engine.utils.CollectionsUT; -import su.nexmedia.engine.utils.MsgUT; -import su.nexmedia.engine.utils.StringUT; - -public class ILangMsg { - - private static final Pattern PATTERN_MESSAGE = Pattern.compile("(\\{message:)+(.)+?(\\})+(.*?)(\\})?"); - private static final String[] MESSAGE_ARGUMENTS = new String[] {"type", "prefix", "fadeIn", "stay", "fadeOut"}; - private static final Pattern[] PATTERN_ARGUMENTS = new Pattern[MESSAGE_ARGUMENTS.length]; - - static { - for (int i = 0; i < MESSAGE_ARGUMENTS.length; i++) { - PATTERN_ARGUMENTS[i] = Pattern.compile("(~)+(" + MESSAGE_ARGUMENTS[i] + ")+?(:)+(.*?)(;)"); - } - } - - private ILangTemplate template; - private String msgDefault; - private String msgColor; - private String path; - - private OutputType out = OutputType.CHAT; - private boolean isPrefix = true; - private int[] titlesTimes = new int[3]; - - public ILangMsg(@NotNull ILangTemplate template, @NotNull String msg) { - this.template = template; - this.msgDefault = msg; - this.setMsg(msg); - } - - ILangMsg(@NotNull ILangMsg from) { - this.template = from.template; - this.msgDefault = from.getDefaultMsg(); - this.msgColor = from.getMsg(); - this.path = from.getPath(); - this.out = from.out; - this.isPrefix = from.isPrefix; - this.titlesTimes = from.titlesTimes; - } - - void setPath(@NotNull String path) { - this.path = path.replace("_", "."); - } - - @NotNull - public String getPath() { - return this.path; - } - - public void setMsg(@NotNull String msg) { - // When TRUE, then 'msgColor' is already set by this 'msg' value. - if (!this.setArguments(msg)) { - this.msgColor = msg; - } - - // Do not replace colors for JSON message, otherwise it will be broken. - if (!MsgUT.isJSON(msg)) { - this.msgColor = StringUT.color(this.msgColor); - } - } - - boolean setArguments(@NotNull String msg) { - Matcher mArgs = PATTERN_MESSAGE.matcher(msg); - if (!mArgs.find()) return false; - - // String with only args - String extract = mArgs.group(0); - String arguments = extract.replace("{message:", "").replace("}", "").trim(); - this.msgColor = msg.replace(extract, ""); - - for (int i = 0; i < MESSAGE_ARGUMENTS.length; i++) { - // Search for flag of this parameter - String argType = MESSAGE_ARGUMENTS[i]; - Pattern pArgVal = PATTERN_ARGUMENTS[i]; - Matcher mArgVal = pArgVal.matcher(arguments); // TODO 200ms - - // Get the flag value - if (mArgVal.find()) { - // Extract only value from all flag string - String argValue = mArgVal.group(4).trim(); - switch (argType) { - case "type": { - this.out = CollectionsUT.getEnum(argValue, OutputType.class); - break; - } - case "prefix": { - this.isPrefix = Boolean.parseBoolean(argValue); - break; - } - case "fadeIn": { - this.titlesTimes[0] = StringUT.getInteger(argValue, -1); - break; - } - case "stay": { - this.titlesTimes[1] = StringUT.getInteger(argValue, -1); - if (this.titlesTimes[1] < 0) this.titlesTimes[1] = 10000; - break; - } - case "fadeOut": { - this.titlesTimes[2] = StringUT.getInteger(argValue, -1); - break; - } - } - } - } - return true; - } - - @NotNull - public String getDefaultMsg() { - return this.msgDefault; - } - - @NotNull - public String getMsgReady() { - return this.replaceDefaults().apply(this.msgColor); - } - - @NotNull - public String getMsg() { - return this.msgColor; - } - - @SuppressWarnings("unchecked") - @NotNull - public ILangMsg replace(@NotNull String var, @NotNull Object replacer) { - if (this.isEmpty()) return this; - if (replacer instanceof List) return this.replace(var, (List) replacer); - - return this.replace(str -> str.replace(var, String.valueOf(replacer))); - } - - @NotNull - public ILangMsg replace(@NotNull String var, @NotNull List replacer) { - if (this.isEmpty()) return this; - - StringBuilder builder = new StringBuilder(); - replacer.forEach(rep -> { - if (builder.length() > 0) builder.append("\\n"); - builder.append(rep.toString()); - }); - - return this.replace(str -> str.replace(var, builder.toString())); - } - - @NotNull - public ILangMsg replace(@NotNull UnaryOperator replacer) { - if (this.isEmpty()) return this; - - ILangMsg msgCopy = new ILangMsg(this); - msgCopy.msgColor = StringUT.color(replacer.apply(msgCopy.getMsg())); - return msgCopy; - } - - public boolean isEmpty() { - return (this.out == OutputType.NONE || this.getMsg().isEmpty()); - } - - public void broadcast() { - if (this.isEmpty()) return; - - for (Player player : Bukkit.getServer().getOnlinePlayers()) { - if (player != null) this.send(player); - } - this.send(Bukkit.getServer().getConsoleSender()); - } - - public void send(@NotNull CommandSender sender) { - if (this.isEmpty()) return; - - if (this.out == OutputType.CHAT) { - String prefix = isPrefix ? template.plugin.lang().Prefix.getMsgReady() : ""; - - this.asList().forEach(line -> { - MsgUT.sendWithJSON(sender, prefix + line); - }); - } - else if (sender instanceof Player) { - Player player = (Player) sender; - if (this.out == OutputType.ACTION_BAR) { - MsgUT.sendActionBar(player, this.getMsgReady()); - } - else if (this.out == OutputType.TITLES) { - List list = this.asList(); - if (list.isEmpty()) return; - - String title = list.get(0); - String subtitle = list.size() > 1 ? list.get(1) : ""; - player.sendTitle(title, subtitle, this.titlesTimes[0], this.titlesTimes[1], this.titlesTimes[2]); - } - } - } - - @NotNull - public List asList() { - String msg = this.getMsgReady(); - if (msg.isEmpty()) return Collections.emptyList(); - - List list = new ArrayList<>(); - for (String line : msg.split("\\\\n")) { - list.add(line.trim()); - } - return list; - } - - /** - * Replaces a raw '\n' new line splitter with a system one. - * @return A string with a system new line splitters. - */ - @NotNull - public String normalizeLines() { - StringBuilder text = new StringBuilder(""); - for (String line : this.asList()) { - if (text.length() > 0) text.append("\n"); - text.append(line); - } - return text.toString(); - } - - @NotNull - private UnaryOperator replaceDefaults() { - return str -> { - for (Map.Entry entry : this.template.getCustomPlaceholders().entrySet()) { - str = str.replace(entry.getKey(), entry.getValue()); - } - return str.replace("%plugin%", template.plugin.cfg().pluginName); - }; - } - - public static enum OutputType { - CHAT, - ACTION_BAR, - TITLES, - NONE, - ; - } -} \ No newline at end of file diff --git a/src/main/java/su/nexmedia/engine/utils/actions/params/list/LocationParam.java b/src/main/java/su/nexmedia/engine/utils/actions/params/list/LocationParam.java deleted file mode 100644 index ed08176..0000000 --- a/src/main/java/su/nexmedia/engine/utils/actions/params/list/LocationParam.java +++ /dev/null @@ -1,11 +0,0 @@ -package su.nexmedia.engine.utils.actions.params.list; - -import su.nexmedia.engine.utils.actions.params.IParamType; -import su.nexmedia.engine.utils.actions.params.defaults.IParamString; - -public class LocationParam extends IParamString { - - public LocationParam() { - super(IParamType.LOCATION, "location"); - } -} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d87f6e7..b50e4f2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ProMCCore -main: su.nexmedia.engine.NexEngine -version: 2.0.6 +main: com.promcteam.engine.NexEngine +version: %PROJECT_VERSION% description: ProRPG Core plugin authors: [Travja, goflish] softdepend: [Vault, WorldGuard, MythicMobs]