Skip to content

Commit

Permalink
Change naming conventions for side-by-side use with NexEngine
Browse files Browse the repository at this point in the history
  • Loading branch information
Travja committed Jun 23, 2021
1 parent a9d5008 commit 9680b95
Show file tree
Hide file tree
Showing 185 changed files with 1,058 additions and 1,066 deletions.
27 changes: 26 additions & 1 deletion pom.xml
Expand Up @@ -6,7 +6,7 @@

<groupId>mc.promcteam</groupId>
<artifactId>ProMCCore</artifactId>
<version>1.0-ALPHA</version>
<version>1.0.1-ALPHA</version>
<build>
<plugins>
<plugin>
Expand All @@ -17,6 +17,31 @@
<target>8</target>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<basedir>${project.build.directory}</basedir>
<includes>
<include>**/*.yml</include>
</includes>
<replacements>
<replacement>
<token>%PROJECT_VERSION%</token>
<value>${project.version}</value>
</replacement>
</replacements>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
@@ -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<P extends NexDataPlugin<P, U>, U extends IAbstractUser<P>> extends NexPlugin<P> {

protected IUserManager<P, U> userManager;
Expand Down
@@ -1,32 +1,32 @@
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;
import org.bukkit.event.server.PluginEnableEvent;
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<NexEngine> implements Listener {

Expand Down
@@ -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;
Expand All @@ -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<P extends NexPlugin<P>> extends JavaPlugin implements Loggable {

Expand Down
@@ -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<P extends NexPlugin<P>> implements Loadable {

Expand Down
@@ -1,4 +1,4 @@
package su.nexmedia.engine.commands;
package mc.promcteam.engine.commands;

import java.lang.reflect.Method;
import java.util.Arrays;
Expand All @@ -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 {

Expand Down
@@ -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<P extends NexPlugin<P>> {

Expand Down
@@ -1,4 +1,4 @@
package su.nexmedia.engine.commands.api;
package mc.promcteam.engine.commands.api;

import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -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;
Expand All @@ -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<P extends NexPlugin<P>> extends IAbstractCommand<P> implements CommandExecutor, TabExecutor {

Expand Down
@@ -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<P extends NexPlugin<P>> extends IAbstractCommand<P> {

protected IGeneralCommand<P> parent;
Expand Down
@@ -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<P extends NexPlugin<P>> extends ISubCommand<P> {

Expand Down
@@ -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<NexEngine> {

Expand Down
@@ -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<P extends NexPlugin<P>> extends ISubCommand<P> {

Expand Down
@@ -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<P extends NexPlugin<P>> extends ISubCommand<P> {

Expand Down
@@ -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<P extends NexPlugin<P>> extends IGeneralCommand<P> {

public MainCommand(@NotNull P plugin) {
Expand Down
@@ -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<P extends NexPlugin<P>> extends ISubCommand<P> {

Expand Down
@@ -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<P extends NexPlugin<P>> {

@NotNull private P plugin;
Expand Down

0 comments on commit 9680b95

Please sign in to comment.