Namespace change

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
-group = 'Minetrax'
+group = 'com.xinecraft'
 version = '5.0.0'
 description = 'Minetrax'
 def targetJavaVersion = 11
@@ -62,7 +62,16 @@ tasks.withType(Javadoc).configureEach {
 }
 
 shadowJar {
-    relocate('org.bstats', 'com.xinecraft.bstats')
+    relocate('org.bstats', 'com.xinecraft.minetrax.bstats')
+}
+
+processResources {
+    def props = [version: version]
+    inputs.properties props
+    filteringCharset 'UTF-8'
+    filesMatching('plugin.yml') {
+        expand props
+    }
 }
 
 publishing {

src/main/java/com/xinecraft/Minetrax.java → src/main/java/com/xinecraft/minetrax/Minetrax.java

@@ -1,29 +1,29 @@
-package com.xinecraft;
+package com.xinecraft.minetrax;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.xinecraft.adapters.ItemStackGsonAdapter;
-import com.xinecraft.commands.AccountLinkCommand;
-import com.xinecraft.commands.PlayerWhoisCommand;
-import com.xinecraft.commands.WebSayCommand;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
-import com.xinecraft.hooks.chat.EpicCoreChatHook;
-import com.xinecraft.hooks.chat.VentureChatHook;
-import com.xinecraft.hooks.placeholderapi.MinetraxPlaceholderExpansion;
-import com.xinecraft.hooks.skinsrestorer.SkinsRestorerHook;
-import com.xinecraft.listeners.*;
-import com.xinecraft.log4j.ConsoleAppender;
-import com.xinecraft.log4j.ConsoleMessage;
-import com.xinecraft.tasks.AccountLinkReminderTask;
-import com.xinecraft.tasks.PlayerAfkAndWorldIntelTrackerTask;
-import com.xinecraft.tasks.PlayerIntelReportTask;
-import com.xinecraft.tasks.ServerIntelReportTask;
-import com.xinecraft.threads.ConsoleMessageQueueWorker;
-import com.xinecraft.threads.webquery.NettyWebQueryServer;
-import com.xinecraft.utils.PlayerIntelUtil;
-import com.xinecraft.utils.PluginUtil;
-import com.xinecraft.utils.UpdateChecker;
+import com.xinecraft.minetrax.adapters.ItemStackGsonAdapter;
+import com.xinecraft.minetrax.commands.AccountLinkCommand;
+import com.xinecraft.minetrax.commands.PlayerWhoisCommand;
+import com.xinecraft.minetrax.commands.WebSayCommand;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.hooks.chat.EpicCoreChatHook;
+import com.xinecraft.minetrax.hooks.chat.VentureChatHook;
+import com.xinecraft.minetrax.hooks.placeholderapi.MinetraxPlaceholderExpansion;
+import com.xinecraft.minetrax.hooks.skinsrestorer.SkinsRestorerHook;
+import com.xinecraft.minetrax.listeners.*;
+import com.xinecraft.minetrax.log4j.ConsoleAppender;
+import com.xinecraft.minetrax.log4j.ConsoleMessage;
+import com.xinecraft.minetrax.tasks.PlayerIntelReportTask;
+import com.xinecraft.minetrax.tasks.ServerIntelReportTask;
+import com.xinecraft.minetrax.threads.ConsoleMessageQueueWorker;
+import com.xinecraft.minetrax.threads.webquery.NettyWebQueryServer;
+import com.xinecraft.minetrax.utils.PluginUtil;
+import com.xinecraft.minetrax.utils.UpdateChecker;
+import com.xinecraft.minetrax.tasks.AccountLinkReminderTask;
+import com.xinecraft.minetrax.tasks.PlayerAfkAndWorldIntelTrackerTask;
+import com.xinecraft.minetrax.utils.PlayerIntelUtil;
 import lombok.Getter;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;

src/main/java/com/xinecraft/adapters/ItemStackGsonAdapter.java → src/main/java/com/xinecraft/minetrax/adapters/ItemStackGsonAdapter.java

@@ -1,4 +1,4 @@
-package com.xinecraft.adapters;
+package com.xinecraft.minetrax.adapters;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

src/main/java/com/xinecraft/commands/AccountLinkCommand.java → src/main/java/com/xinecraft/minetrax/commands/AccountLinkCommand.java

@@ -1,9 +1,9 @@
-package com.xinecraft.commands;
+package com.xinecraft.minetrax.commands;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.xinecraft.Minetrax;
-import com.xinecraft.utils.HttpUtil;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.utils.HttpUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;

src/main/java/com/xinecraft/commands/PlayerWhoisCommand.java → src/main/java/com/xinecraft/minetrax/commands/PlayerWhoisCommand.java

@@ -1,8 +1,8 @@
-package com.xinecraft.commands;
+package com.xinecraft.minetrax.commands;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.utils.LoggingUtil;
-import com.xinecraft.utils.WhoisUtil;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.utils.LoggingUtil;
+import com.xinecraft.minetrax.utils.WhoisUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/xinecraft/minetrax/commands/ServerStatsCommand.java

@@ -0,0 +1,4 @@
+package com.xinecraft.minetrax.commands;
+
+public class ServerStatsCommand {
+}

src/main/java/com/xinecraft/commands/WebSayCommand.java → src/main/java/com/xinecraft/minetrax/commands/WebSayCommand.java

@@ -1,6 +1,6 @@
-package com.xinecraft.commands;
+package com.xinecraft.minetrax.commands;
 
-import com.xinecraft.Minetrax;
+import com.xinecraft.minetrax.Minetrax;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/com/xinecraft/data/CountryData.java → src/main/java/com/xinecraft/minetrax/data/CountryData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/PlayerData.java → src/main/java/com/xinecraft/minetrax/data/PlayerData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/PlayerDeathData.java → src/main/java/com/xinecraft/minetrax/data/PlayerDeathData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/PlayerPvpKillData.java → src/main/java/com/xinecraft/minetrax/data/PlayerPvpKillData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/PlayerRankData.java → src/main/java/com/xinecraft/minetrax/data/PlayerRankData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/PlayerSessionIntelData.java → src/main/java/com/xinecraft/minetrax/data/PlayerSessionIntelData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/PlayerWorldStatsIntelData.java → src/main/java/com/xinecraft/minetrax/data/PlayerWorldStatsIntelData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/ServerIntelData.java → src/main/java/com/xinecraft/minetrax/data/ServerIntelData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/data/WorldData.java → src/main/java/com/xinecraft/minetrax/data/WorldData.java

@@ -1,4 +1,4 @@
-package com.xinecraft.data;
+package com.xinecraft.minetrax.data;
 
 import lombok.Data;
 

src/main/java/com/xinecraft/hooks/chat/EpicCoreChatHook.java → src/main/java/com/xinecraft/minetrax/hooks/chat/EpicCoreChatHook.java

@@ -1,7 +1,7 @@
-package com.xinecraft.hooks.chat;
+package com.xinecraft.minetrax.hooks.chat;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.utils.HttpUtil;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.utils.HttpUtil;
 import io.signality.Modules.Chat.EpicCoreChatEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

src/main/java/com/xinecraft/hooks/chat/VentureChatHook.java → src/main/java/com/xinecraft/minetrax/hooks/chat/VentureChatHook.java

@@ -1,7 +1,7 @@
-package com.xinecraft.hooks.chat;
+package com.xinecraft.minetrax.hooks.chat;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.utils.HttpUtil;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.utils.HttpUtil;
 import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
 import mineverse.Aust1n46.chat.api.events.VentureChatEvent;
 import mineverse.Aust1n46.chat.channel.ChatChannel;

src/main/java/com/xinecraft/hooks/placeholderapi/MinetraxPlaceholderExpansion.java → src/main/java/com/xinecraft/minetrax/hooks/placeholderapi/MinetraxPlaceholderExpansion.java

@@ -1,7 +1,7 @@
-package com.xinecraft.hooks.placeholderapi;
+package com.xinecraft.minetrax.hooks.placeholderapi;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/xinecraft/hooks/skinsrestorer/SkinsRestorerHook.java → src/main/java/com/xinecraft/minetrax/hooks/skinsrestorer/SkinsRestorerHook.java

@@ -1,9 +1,9 @@
-package com.xinecraft.hooks.skinsrestorer;
+package com.xinecraft.minetrax.hooks.skinsrestorer;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
-import com.xinecraft.utils.LoggingUtil;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.utils.LoggingUtil;
 import net.skinsrestorer.api.PropertyUtils;
 import net.skinsrestorer.api.event.SkinApplyEvent;
 import net.skinsrestorer.api.property.SkinProperty;

src/main/java/com/xinecraft/listeners/BlockBreakListener.java → src/main/java/com/xinecraft/minetrax/listeners/BlockBreakListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/BlockPlaceListener.java → src/main/java/com/xinecraft/minetrax/listeners/BlockPlaceListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/CraftItemListener.java → src/main/java/com/xinecraft/minetrax/listeners/CraftItemListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/xinecraft/listeners/EnchantItemListener.java → src/main/java/com/xinecraft/minetrax/listeners/EnchantItemListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/EntityDeathEventListener.java → src/main/java/com/xinecraft/minetrax/listeners/EntityDeathEventListener.java

@@ -1,14 +1,14 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerDeathData;
-import com.xinecraft.data.PlayerPvpKillData;
-import com.xinecraft.data.PlayerSessionIntelData;
-import com.xinecraft.utils.HttpUtil;
-import com.xinecraft.utils.LoggingUtil;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerDeathData;
+import com.xinecraft.minetrax.data.PlayerPvpKillData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.utils.HttpUtil;
+import com.xinecraft.minetrax.utils.LoggingUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/xinecraft/listeners/EntityPickupItemListener.java → src/main/java/com/xinecraft/minetrax/listeners/EntityPickupItemListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/FishCatchListener.java → src/main/java/com/xinecraft/minetrax/listeners/FishCatchListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/PlayerAdvancementDoneListener.java → src/main/java/com/xinecraft/minetrax/listeners/PlayerAdvancementDoneListener.java

@@ -1,6 +1,6 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.utils.LoggingUtil;
+import com.xinecraft.minetrax.utils.LoggingUtil;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

src/main/java/com/xinecraft/listeners/PlayerBedEnterListener.java → src/main/java/com/xinecraft/minetrax/listeners/PlayerBedEnterListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/PlayerChatListener.java → src/main/java/com/xinecraft/minetrax/listeners/PlayerChatListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.utils.HttpUtil;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.utils.HttpUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/PlayerCommandListener.java → src/main/java/com/xinecraft/minetrax/listeners/PlayerCommandListener.java

@@ -1,7 +1,7 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/xinecraft/listeners/PlayerDamageListener.java → src/main/java/com/xinecraft/minetrax/listeners/PlayerDamageListener.java

@@ -1,8 +1,8 @@
-package com.xinecraft.listeners;
+package com.xinecraft.minetrax.listeners;
 
-import com.xinecraft.Minetrax;
-import com.xinecraft.data.PlayerData;
-import com.xinecraft.data.PlayerSessionIntelData;
+import com.xinecraft.minetrax.Minetrax;
+import com.xinecraft.minetrax.data.PlayerData;
+import com.xinecraft.minetrax.data.PlayerSessionIntelData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;