Use new naming conventions for Core

magemonkeystudio · Jun 23, 2021 · bee7b4a · bee7b4a
1 parent c80a8d5
commit bee7b4a
Show file tree

Hide file tree

Showing 197 changed files with 635 additions and 657 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,6 +14,36 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <plugins>
+            <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>
+
     <repositories>
         <repository>
             <id>spigot-repo</id>
@@ -42,7 +72,7 @@
         <dependency>
             <groupId>mc.promcteam</groupId>
             <artifactId>ProMCCore</artifactId>
-            <version>1.0-ALPHA</version>
+            <version>1.0.1-ALPHA</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/su/nightexpress/quantumrpg/QuantumRPG.java b/src/main/java/su/nightexpress/quantumrpg/QuantumRPG.java
@@ -1,9 +1,9 @@
 package su.nightexpress.quantumrpg;
 
 import org.jetbrains.annotations.NotNull;
-import su.nexmedia.engine.NexDataPlugin;
-import su.nexmedia.engine.commands.api.IGeneralCommand;
-import su.nexmedia.engine.hooks.Hooks;
+import mc.promcteam.engine.NexDataPlugin;
+import mc.promcteam.engine.commands.api.IGeneralCommand;
+import mc.promcteam.engine.hooks.Hooks;
 import su.nightexpress.quantumrpg.command.BuffCommand;
 import su.nightexpress.quantumrpg.command.ModifyCommand;
 import su.nightexpress.quantumrpg.command.SetCommand;
@@ -194,7 +194,6 @@ public void registerHooks() {
         }
         this.registerHook(EHook.PWING_RACES, PwingRacesHK.class);
         this.registerHook(EHook.SKILL_API, SkillAPIHK.class);
-        this.registerHook(EHook.CITIZENS, CitizensHK.class);
 //		this.registerHook(EHook.RACES_OF_THANA, RacesOfThanaHK.class);
 //		this.registerHook(EHook.SKILLS, SkillsProHK.class);
     }

diff --git a/src/main/java/su/nightexpress/quantumrpg/api/event/RPGDamageEvent.java b/src/main/java/su/nightexpress/quantumrpg/api/event/RPGDamageEvent.java
@@ -8,7 +8,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import su.nexmedia.engine.manager.api.event.ICancellableEvent;
+import mc.promcteam.engine.manager.api.event.ICancellableEvent;
 import su.nightexpress.quantumrpg.manager.damage.DamageMeta;
 import su.nightexpress.quantumrpg.modules.list.arrows.ArrowManager.QArrow;
 import su.nightexpress.quantumrpg.stats.EntityStats;

diff --git a/src/main/java/su/nightexpress/quantumrpg/api/event/RPGItemDamageEvent.java b/src/main/java/su/nightexpress/quantumrpg/api/event/RPGItemDamageEvent.java
@@ -3,7 +3,7 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import su.nexmedia.engine.manager.api.event.ICancellableEvent;
+import mc.promcteam.engine.manager.api.event.ICancellableEvent;
 
 public class RPGItemDamageEvent extends ICancellableEvent {
 

diff --git a/src/main/java/su/nightexpress/quantumrpg/command/BuffCommand.java b/src/main/java/su/nightexpress/quantumrpg/command/BuffCommand.java
@@ -9,9 +9,9 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import su.nexmedia.engine.commands.api.ISubCommand;
-import su.nexmedia.engine.utils.PlayerUT;
-import su.nexmedia.engine.utils.TimeUT;
+import mc.promcteam.engine.commands.api.ISubCommand;
+import mc.promcteam.engine.utils.PlayerUT;
+import mc.promcteam.engine.utils.TimeUT;
 import su.nightexpress.quantumrpg.Perms;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.data.api.RPGUser;

diff --git a/src/main/java/su/nightexpress/quantumrpg/command/ModifyCommand.java b/src/main/java/su/nightexpress/quantumrpg/command/ModifyCommand.java
@@ -15,10 +15,10 @@
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 
-import su.nexmedia.engine.commands.api.ISubCommand;
-import su.nexmedia.engine.utils.CollectionsUT;
-import su.nexmedia.engine.utils.ItemUT;
-import su.nexmedia.engine.utils.StringUT;
+import mc.promcteam.engine.commands.api.ISubCommand;
+import mc.promcteam.engine.utils.CollectionsUT;
+import mc.promcteam.engine.utils.ItemUT;
+import mc.promcteam.engine.utils.StringUT;
 import su.nightexpress.quantumrpg.Perms;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.utils.ItemUtils;

diff --git a/src/main/java/su/nightexpress/quantumrpg/command/SetCommand.java b/src/main/java/su/nightexpress/quantumrpg/command/SetCommand.java
@@ -9,10 +9,10 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import su.nexmedia.engine.commands.api.ISubCommand;
-import su.nexmedia.engine.utils.CollectionsUT;
-import su.nexmedia.engine.utils.ItemUT;
-import su.nexmedia.engine.utils.StringUT;
+import mc.promcteam.engine.commands.api.ISubCommand;
+import mc.promcteam.engine.utils.CollectionsUT;
+import mc.promcteam.engine.utils.ItemUT;
+import mc.promcteam.engine.utils.StringUT;
 import su.nightexpress.quantumrpg.Perms;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.stats.items.ItemStats;

diff --git a/src/main/java/su/nightexpress/quantumrpg/config/Config.java b/src/main/java/su/nightexpress/quantumrpg/config/Config.java
@@ -12,11 +12,11 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import su.nexmedia.engine.config.api.IConfigTemplate;
-import su.nexmedia.engine.config.api.JYML;
-import su.nexmedia.engine.utils.StringUT;
-import su.nexmedia.engine.utils.actions.ActionManipulator;
-import su.nexmedia.engine.utils.constants.JStrings;
+import mc.promcteam.engine.config.api.IConfigTemplate;
+import mc.promcteam.engine.config.api.JYML;
+import mc.promcteam.engine.utils.StringUT;
+import mc.promcteam.engine.utils.actions.ActionManipulator;
+import mc.promcteam.engine.utils.constants.JStrings;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.stats.items.ItemStats;
 import su.nightexpress.quantumrpg.stats.items.attributes.AmmoAttribute;

diff --git a/src/main/java/su/nightexpress/quantumrpg/config/EngineCfg.java b/src/main/java/su/nightexpress/quantumrpg/config/EngineCfg.java
@@ -8,9 +8,9 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import su.nexmedia.engine.config.api.JYML;
-import su.nexmedia.engine.hooks.NHook;
-import su.nexmedia.engine.utils.StringUT;
+import mc.promcteam.engine.config.api.JYML;
+import mc.promcteam.engine.hooks.NHook;
+import mc.promcteam.engine.utils.StringUT;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.hooks.HookClass;
 import su.nightexpress.quantumrpg.hooks.HookLevel;

diff --git a/src/main/java/su/nightexpress/quantumrpg/config/Lang.java b/src/main/java/su/nightexpress/quantumrpg/config/Lang.java
@@ -2,9 +2,9 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import su.nexmedia.engine.config.api.ILangMsg;
-import su.nexmedia.engine.core.config.CoreLang;
-import su.nexmedia.engine.manager.types.ClickType;
+import mc.promcteam.engine.config.api.ILangMsg;
+import mc.promcteam.engine.core.config.CoreLang;
+import mc.promcteam.engine.manager.types.ClickType;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.data.api.UserEntityNamesMode;
 import su.nightexpress.quantumrpg.modules.list.classes.object.ClassAttributeType;

diff --git a/src/main/java/su/nightexpress/quantumrpg/data/RPGUserData.java b/src/main/java/su/nightexpress/quantumrpg/data/RPGUserData.java
@@ -11,8 +11,8 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
-import su.nexmedia.engine.data.DataTypes;
-import su.nexmedia.engine.data.IDataHandler;
+import mc.promcteam.engine.data.DataTypes;
+import mc.promcteam.engine.data.IDataHandler;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.data.api.RPGUser;
 import su.nightexpress.quantumrpg.data.api.UserProfile;

diff --git a/src/main/java/su/nightexpress/quantumrpg/data/UserManager.java b/src/main/java/su/nightexpress/quantumrpg/data/UserManager.java
@@ -3,7 +3,7 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import su.nexmedia.engine.data.users.IUserManager;
+import mc.promcteam.engine.data.users.IUserManager;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.data.api.RPGUser;
 

diff --git a/src/main/java/su/nightexpress/quantumrpg/data/api/RPGUser.java b/src/main/java/su/nightexpress/quantumrpg/data/api/RPGUser.java
@@ -8,8 +8,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import su.nexmedia.engine.data.users.IAbstractUser;
-import su.nexmedia.engine.utils.constants.JStrings;
+import mc.promcteam.engine.data.users.IAbstractUser;
+import mc.promcteam.engine.utils.constants.JStrings;
 import su.nightexpress.quantumrpg.QuantumRPG;
 
 public class RPGUser extends IAbstractUser<QuantumRPG> {

diff --git a/src/main/java/su/nightexpress/quantumrpg/data/api/UserProfile.java b/src/main/java/su/nightexpress/quantumrpg/data/api/UserProfile.java
@@ -11,8 +11,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import su.nexmedia.engine.utils.ItemUT;
-import su.nexmedia.engine.utils.constants.JStrings;
+import mc.promcteam.engine.utils.ItemUT;
+import mc.promcteam.engine.utils.constants.JStrings;
 import su.nightexpress.quantumrpg.manager.effects.buffs.SavedBuff;
 import su.nightexpress.quantumrpg.modules.list.classes.api.UserClassData;
 import su.nightexpress.quantumrpg.stats.items.api.ItemLoreStat;

diff --git a/src/main/java/su/nightexpress/quantumrpg/data/api/serialize/UserProfileDeserializer.java b/src/main/java/su/nightexpress/quantumrpg/data/api/serialize/UserProfileDeserializer.java
@@ -2,8 +2,8 @@
 
 import com.google.gson.*;
 import org.bukkit.inventory.ItemStack;
-import su.nexmedia.engine.utils.CollectionsUT;
-import su.nexmedia.engine.utils.ItemUT;
+import mc.promcteam.engine.utils.CollectionsUT;
+import mc.promcteam.engine.utils.ItemUT;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.api.QuantumAPI;
 import su.nightexpress.quantumrpg.data.api.UserEntityNamesMode;

diff --git a/src/main/java/su/nightexpress/quantumrpg/data/api/serialize/UserProfileSerializer.java b/src/main/java/su/nightexpress/quantumrpg/data/api/serialize/UserProfileSerializer.java
@@ -15,8 +15,8 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
-import su.nexmedia.engine.utils.CollectionsUT;
-import su.nexmedia.engine.utils.ItemUT;
+import mc.promcteam.engine.utils.CollectionsUT;
+import mc.promcteam.engine.utils.ItemUT;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.api.QuantumAPI;
 import su.nightexpress.quantumrpg.data.api.UserEntityNamesMode;

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/CitizensHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/CitizensHK.java
diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/CrackShotHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/CrackShotHK.java
@@ -5,8 +5,8 @@
 
 import com.shampaggon.crackshot.CSDirector;
 
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
 import su.nightexpress.quantumrpg.QuantumRPG;
 
 public class CrackShotHK extends NHook<QuantumRPG> {

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/LorinthsRpgMobsHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/LorinthsRpgMobsHK.java
@@ -4,8 +4,8 @@
 import org.jetbrains.annotations.NotNull;
 
 import me.lorinth.rpgmobs.LorinthsRpgMobs;
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.hooks.HookMobLevel;
 

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/MagicHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/MagicHK.java
@@ -5,8 +5,8 @@
 
 import com.elmakers.mine.bukkit.api.magic.MagicAPI;
 
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
 import su.nightexpress.quantumrpg.QuantumRPG;
 
 public class MagicHK extends NHook<QuantumRPG> {

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/McmmoHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/McmmoHK.java
@@ -5,8 +5,8 @@
 
 import com.gmail.nossr50.api.ExperienceAPI;
 
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.hooks.HookLevel;
 

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/MyPetHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/MyPetHK.java
@@ -6,8 +6,8 @@
 import org.jetbrains.annotations.Nullable;
 
 import de.Keyle.MyPet.api.entity.MyPetBukkitEntity;
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
 import su.nightexpress.quantumrpg.QuantumRPG;
 
 public class MyPetHK extends NHook<QuantumRPG> {

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/MythicMobsHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/MythicMobsHK.java
@@ -6,8 +6,8 @@
 import io.lumine.xikage.mythicmobs.MythicMobs;
 import io.lumine.xikage.mythicmobs.mobs.ActiveMob;
 import io.lumine.xikage.mythicmobs.mobs.MythicMob;
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.hooks.HookMobLevel;
 

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/PlaceholderAPIHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/PlaceholderAPIHK.java
@@ -1,14 +1,13 @@
 package su.nightexpress.quantumrpg.hooks.external;
 
 import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.expansion.ExpansionManager;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
-import su.nexmedia.engine.utils.NumberUT;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
+import mc.promcteam.engine.utils.NumberUT;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.modules.list.classes.ClassManager;
 import su.nightexpress.quantumrpg.modules.list.classes.api.UserClassData;

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/PwingRacesHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/PwingRacesHK.java
@@ -7,8 +7,8 @@
 import net.pwing.races.api.race.Race;
 import net.pwing.races.api.race.RaceManager;
 import net.pwing.races.api.race.RacePlayer;
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.hooks.HookClass;
 import su.nightexpress.quantumrpg.hooks.HookLevel;

diff --git a/src/main/java/su/nightexpress/quantumrpg/hooks/external/SkillAPIHK.java b/src/main/java/su/nightexpress/quantumrpg/hooks/external/SkillAPIHK.java
@@ -10,9 +10,9 @@
 import com.sucy.skill.api.event.PlayerManaGainEvent;
 import com.sucy.skill.api.player.PlayerData;
 
-import su.nexmedia.engine.hooks.HookState;
-import su.nexmedia.engine.hooks.NHook;
-import su.nexmedia.engine.utils.StringUT;
+import mc.promcteam.engine.hooks.HookState;
+import mc.promcteam.engine.hooks.NHook;
+import mc.promcteam.engine.utils.StringUT;
 import su.nightexpress.quantumrpg.QuantumRPG;
 import su.nightexpress.quantumrpg.config.EngineCfg;
 import su.nightexpress.quantumrpg.hooks.HookClass;