From d2a1f1e7b17710b77af2ec431169f751220164a6 Mon Sep 17 00:00:00 2001 From: Xinecraft Date: Sun, 24 Mar 2024 05:10:37 +0530 Subject: [PATCH] Namespace change --- build.gradle | 13 +- .../commands/ServerStatsCommand.java | 4 - .../xinecraft/{ => minetrax}/Minetrax.java | 46 +-- .../adapters/ItemStackGsonAdapter.java | 2 +- .../commands/AccountLinkCommand.java | 6 +- .../commands/PlayerWhoisCommand.java | 8 +- .../minetrax/commands/ServerStatsCommand.java | 4 + .../commands/WebSayCommand.java | 4 +- .../{ => minetrax}/data/CountryData.java | 2 +- .../{ => minetrax}/data/PlayerData.java | 2 +- .../{ => minetrax}/data/PlayerDeathData.java | 2 +- .../data/PlayerPvpKillData.java | 2 +- .../{ => minetrax}/data/PlayerRankData.java | 2 +- .../data/PlayerSessionIntelData.java | 2 +- .../data/PlayerWorldStatsIntelData.java | 2 +- .../{ => minetrax}/data/ServerIntelData.java | 2 +- .../{ => minetrax}/data/WorldData.java | 2 +- .../hooks/chat/EpicCoreChatHook.java | 6 +- .../hooks/chat/VentureChatHook.java | 6 +- .../MinetraxPlaceholderExpansion.java | 6 +- .../skinsrestorer/SkinsRestorerHook.java | 10 +- .../listeners/BlockBreakListener.java | 8 +- .../listeners/BlockPlaceListener.java | 8 +- .../listeners/CraftItemListener.java | 8 +- .../listeners/EnchantItemListener.java | 8 +- .../listeners/EntityDeathEventListener.java | 16 +- .../listeners/EntityPickupItemListener.java | 8 +- .../listeners/FishCatchListener.java | 8 +- .../PlayerAdvancementDoneListener.java | 4 +- .../listeners/PlayerBedEnterListener.java | 8 +- .../listeners/PlayerChatListener.java | 8 +- .../listeners/PlayerCommandListener.java | 6 +- .../listeners/PlayerDamageListener.java | 8 +- .../listeners/PlayerDeathListener.java | 6 +- .../listeners/PlayerDropItemListener.java | 8 +- .../listeners/PlayerItemBreakListener.java | 8 +- .../listeners/PlayerItemConsumeListener.java | 8 +- .../listeners/PlayerJoinLeaveListener.java | 18 +- .../listeners/PlayerKickBanListener.java | 10 +- .../listeners/PlayerLoginListener.java | 6 +- .../listeners/PlayerMoveListener.java | 8 +- .../listeners/ProjectileLaunchListener.java | 8 +- .../listeners/RaidFinishListener.java | 8 +- .../listeners/ServerBroadcastListener.java | 8 +- .../{ => minetrax}/log4j/ConsoleAppender.java | 8 +- .../{ => minetrax}/log4j/ConsoleMessage.java | 2 +- .../tasks/AccountLinkReminderTask.java | 6 +- .../PlayerAfkAndWorldIntelTrackerTask.java | 10 +- .../tasks/PlayerIntelReportTask.java | 8 +- .../tasks/ServerIntelReportTask.java | 16 +- .../threads/ConsoleMessageQueueWorker.java | 8 +- .../threads/data/QueryRequestData.java | 2 +- .../threads/data/QueryResponseData.java | 2 +- .../threads/webquery/NettyWebQueryServer.java | 132 +++---- .../webquery/SimpleTCPChannelHandler.java | 44 +-- .../webquery/SimpleTCPChannelInitializer.java | 28 +- .../threads/webquery/WebQueryProtocol.java | 14 +- .../webquery/handlers/PlayerSkinHandler.java | 6 +- .../utils/AesEncryptionData.java | 2 +- .../{ => minetrax}/utils/AnsiColor.java | 2 +- .../{ => minetrax}/utils/CryptoUtil.java | 4 +- .../{ => minetrax}/utils/HttpUtil.java | 4 +- .../{ => minetrax}/utils/LoggingUtil.java | 42 +-- .../{ => minetrax}/utils/PlayerIntelUtil.java | 6 +- .../{ => minetrax}/utils/PluginUtil.java | 4 +- .../{ => minetrax}/utils/ReflectionUtil.java | 352 +++++++++--------- .../{ => minetrax}/utils/SystemUtil.java | 2 +- .../xinecraft/{ => minetrax}/utils/TPS.java | 2 +- .../{ => minetrax}/utils/TimeUtil.java | 2 +- .../{ => minetrax}/utils/UpdateChecker.java | 4 +- .../{ => minetrax}/utils/VersionUtil.java | 2 +- .../utils/WhoisResponseData.java | 2 +- .../{ => minetrax}/utils/WhoisUtil.java | 4 +- src/main/resources/plugin.yml | 4 +- 74 files changed, 530 insertions(+), 521 deletions(-) delete mode 100644 src/main/java/com/xinecraft/commands/ServerStatsCommand.java rename src/main/java/com/xinecraft/{ => minetrax}/Minetrax.java (92%) rename src/main/java/com/xinecraft/{ => minetrax}/adapters/ItemStackGsonAdapter.java (95%) rename src/main/java/com/xinecraft/{ => minetrax}/commands/AccountLinkCommand.java (97%) rename src/main/java/com/xinecraft/{ => minetrax}/commands/PlayerWhoisCommand.java (89%) create mode 100644 src/main/java/com/xinecraft/minetrax/commands/ServerStatsCommand.java rename src/main/java/com/xinecraft/{ => minetrax}/commands/WebSayCommand.java (91%) rename src/main/java/com/xinecraft/{ => minetrax}/data/CountryData.java (77%) rename src/main/java/com/xinecraft/{ => minetrax}/data/PlayerData.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/data/PlayerDeathData.java (91%) rename src/main/java/com/xinecraft/{ => minetrax}/data/PlayerPvpKillData.java (90%) rename src/main/java/com/xinecraft/{ => minetrax}/data/PlayerRankData.java (78%) rename src/main/java/com/xinecraft/{ => minetrax}/data/PlayerSessionIntelData.java (98%) rename src/main/java/com/xinecraft/{ => minetrax}/data/PlayerWorldStatsIntelData.java (89%) rename src/main/java/com/xinecraft/{ => minetrax}/data/ServerIntelData.java (94%) rename src/main/java/com/xinecraft/{ => minetrax}/data/WorldData.java (86%) rename src/main/java/com/xinecraft/{ => minetrax}/hooks/chat/EpicCoreChatHook.java (93%) rename src/main/java/com/xinecraft/{ => minetrax}/hooks/chat/VentureChatHook.java (94%) rename src/main/java/com/xinecraft/{ => minetrax}/hooks/placeholderapi/MinetraxPlaceholderExpansion.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/hooks/skinsrestorer/SkinsRestorerHook.java (84%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/BlockBreakListener.java (81%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/BlockPlaceListener.java (83%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/CraftItemListener.java (93%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/EnchantItemListener.java (81%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/EntityDeathEventListener.java (95%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/EntityPickupItemListener.java (83%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/FishCatchListener.java (85%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerAdvancementDoneListener.java (84%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerBedEnterListener.java (81%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerChatListener.java (91%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerCommandListener.java (83%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerDamageListener.java (88%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerDeathListener.java (93%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerDropItemListener.java (82%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerItemBreakListener.java (82%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerItemConsumeListener.java (83%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerJoinLeaveListener.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerKickBanListener.java (93%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerLoginListener.java (90%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/PlayerMoveListener.java (91%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/ProjectileLaunchListener.java (86%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/RaidFinishListener.java (84%) rename src/main/java/com/xinecraft/{ => minetrax}/listeners/ServerBroadcastListener.java (89%) rename src/main/java/com/xinecraft/{ => minetrax}/log4j/ConsoleAppender.java (94%) rename src/main/java/com/xinecraft/{ => minetrax}/log4j/ConsoleMessage.java (87%) rename src/main/java/com/xinecraft/{ => minetrax}/tasks/AccountLinkReminderTask.java (85%) rename src/main/java/com/xinecraft/{ => minetrax}/tasks/PlayerAfkAndWorldIntelTrackerTask.java (91%) rename src/main/java/com/xinecraft/{ => minetrax}/tasks/PlayerIntelReportTask.java (78%) rename src/main/java/com/xinecraft/{ => minetrax}/tasks/ServerIntelReportTask.java (90%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/ConsoleMessageQueueWorker.java (93%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/data/QueryRequestData.java (86%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/data/QueryResponseData.java (88%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/webquery/NettyWebQueryServer.java (94%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/webquery/SimpleTCPChannelHandler.java (86%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/webquery/SimpleTCPChannelInitializer.java (91%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/webquery/WebQueryProtocol.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/threads/webquery/handlers/PlayerSkinHandler.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/AesEncryptionData.java (88%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/AnsiColor.java (99%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/CryptoUtil.java (98%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/HttpUtil.java (99%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/LoggingUtil.java (86%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/PlayerIntelUtil.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/PluginUtil.java (98%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/ReflectionUtil.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/SystemUtil.java (98%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/TPS.java (98%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/TimeUtil.java (96%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/UpdateChecker.java (92%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/VersionUtil.java (99%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/WhoisResponseData.java (97%) rename src/main/java/com/xinecraft/{ => minetrax}/utils/WhoisUtil.java (99%) diff --git a/build.gradle b/build.gradle index 91a1993..6795f00 100644 --- a/build.gradle +++ b/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 { diff --git a/src/main/java/com/xinecraft/commands/ServerStatsCommand.java b/src/main/java/com/xinecraft/commands/ServerStatsCommand.java deleted file mode 100644 index 25bbf70..0000000 --- a/src/main/java/com/xinecraft/commands/ServerStatsCommand.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xinecraft.commands; - -public class ServerStatsCommand { -} diff --git a/src/main/java/com/xinecraft/Minetrax.java b/src/main/java/com/xinecraft/minetrax/Minetrax.java similarity index 92% rename from src/main/java/com/xinecraft/Minetrax.java rename to src/main/java/com/xinecraft/minetrax/Minetrax.java index 1ed6063..006a053 100644 --- a/src/main/java/com/xinecraft/Minetrax.java +++ b/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; diff --git a/src/main/java/com/xinecraft/adapters/ItemStackGsonAdapter.java b/src/main/java/com/xinecraft/minetrax/adapters/ItemStackGsonAdapter.java similarity index 95% rename from src/main/java/com/xinecraft/adapters/ItemStackGsonAdapter.java rename to src/main/java/com/xinecraft/minetrax/adapters/ItemStackGsonAdapter.java index bf744f9..dc5d756 100644 --- a/src/main/java/com/xinecraft/adapters/ItemStackGsonAdapter.java +++ b/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; diff --git a/src/main/java/com/xinecraft/commands/AccountLinkCommand.java b/src/main/java/com/xinecraft/minetrax/commands/AccountLinkCommand.java similarity index 97% rename from src/main/java/com/xinecraft/commands/AccountLinkCommand.java rename to src/main/java/com/xinecraft/minetrax/commands/AccountLinkCommand.java index e2d2c2d..fa06e3f 100644 --- a/src/main/java/com/xinecraft/commands/AccountLinkCommand.java +++ b/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; diff --git a/src/main/java/com/xinecraft/commands/PlayerWhoisCommand.java b/src/main/java/com/xinecraft/minetrax/commands/PlayerWhoisCommand.java similarity index 89% rename from src/main/java/com/xinecraft/commands/PlayerWhoisCommand.java rename to src/main/java/com/xinecraft/minetrax/commands/PlayerWhoisCommand.java index b266d07..39f6446 100644 --- a/src/main/java/com/xinecraft/commands/PlayerWhoisCommand.java +++ b/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; diff --git a/src/main/java/com/xinecraft/minetrax/commands/ServerStatsCommand.java b/src/main/java/com/xinecraft/minetrax/commands/ServerStatsCommand.java new file mode 100644 index 0000000..23c8e42 --- /dev/null +++ b/src/main/java/com/xinecraft/minetrax/commands/ServerStatsCommand.java @@ -0,0 +1,4 @@ +package com.xinecraft.minetrax.commands; + +public class ServerStatsCommand { +} diff --git a/src/main/java/com/xinecraft/commands/WebSayCommand.java b/src/main/java/com/xinecraft/minetrax/commands/WebSayCommand.java similarity index 91% rename from src/main/java/com/xinecraft/commands/WebSayCommand.java rename to src/main/java/com/xinecraft/minetrax/commands/WebSayCommand.java index 75e37e9..9fff274 100644 --- a/src/main/java/com/xinecraft/commands/WebSayCommand.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/CountryData.java b/src/main/java/com/xinecraft/minetrax/data/CountryData.java similarity index 77% rename from src/main/java/com/xinecraft/data/CountryData.java rename to src/main/java/com/xinecraft/minetrax/data/CountryData.java index d9b98f2..d6f6b68 100644 --- a/src/main/java/com/xinecraft/data/CountryData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/PlayerData.java b/src/main/java/com/xinecraft/minetrax/data/PlayerData.java similarity index 96% rename from src/main/java/com/xinecraft/data/PlayerData.java rename to src/main/java/com/xinecraft/minetrax/data/PlayerData.java index a4061f8..e47c47c 100644 --- a/src/main/java/com/xinecraft/data/PlayerData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/PlayerDeathData.java b/src/main/java/com/xinecraft/minetrax/data/PlayerDeathData.java similarity index 91% rename from src/main/java/com/xinecraft/data/PlayerDeathData.java rename to src/main/java/com/xinecraft/minetrax/data/PlayerDeathData.java index 2bf57b9..5c6949e 100644 --- a/src/main/java/com/xinecraft/data/PlayerDeathData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/PlayerPvpKillData.java b/src/main/java/com/xinecraft/minetrax/data/PlayerPvpKillData.java similarity index 90% rename from src/main/java/com/xinecraft/data/PlayerPvpKillData.java rename to src/main/java/com/xinecraft/minetrax/data/PlayerPvpKillData.java index 0437fd6..3318039 100644 --- a/src/main/java/com/xinecraft/data/PlayerPvpKillData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/PlayerRankData.java b/src/main/java/com/xinecraft/minetrax/data/PlayerRankData.java similarity index 78% rename from src/main/java/com/xinecraft/data/PlayerRankData.java rename to src/main/java/com/xinecraft/minetrax/data/PlayerRankData.java index e68add3..ccbfea0 100644 --- a/src/main/java/com/xinecraft/data/PlayerRankData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/PlayerSessionIntelData.java b/src/main/java/com/xinecraft/minetrax/data/PlayerSessionIntelData.java similarity index 98% rename from src/main/java/com/xinecraft/data/PlayerSessionIntelData.java rename to src/main/java/com/xinecraft/minetrax/data/PlayerSessionIntelData.java index 255db39..e55d685 100644 --- a/src/main/java/com/xinecraft/data/PlayerSessionIntelData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/PlayerWorldStatsIntelData.java b/src/main/java/com/xinecraft/minetrax/data/PlayerWorldStatsIntelData.java similarity index 89% rename from src/main/java/com/xinecraft/data/PlayerWorldStatsIntelData.java rename to src/main/java/com/xinecraft/minetrax/data/PlayerWorldStatsIntelData.java index 7f9e157..fb69747 100644 --- a/src/main/java/com/xinecraft/data/PlayerWorldStatsIntelData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/ServerIntelData.java b/src/main/java/com/xinecraft/minetrax/data/ServerIntelData.java similarity index 94% rename from src/main/java/com/xinecraft/data/ServerIntelData.java rename to src/main/java/com/xinecraft/minetrax/data/ServerIntelData.java index b247694..69b8269 100644 --- a/src/main/java/com/xinecraft/data/ServerIntelData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/data/WorldData.java b/src/main/java/com/xinecraft/minetrax/data/WorldData.java similarity index 86% rename from src/main/java/com/xinecraft/data/WorldData.java rename to src/main/java/com/xinecraft/minetrax/data/WorldData.java index 3fcf193..8e87405 100644 --- a/src/main/java/com/xinecraft/data/WorldData.java +++ b/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; diff --git a/src/main/java/com/xinecraft/hooks/chat/EpicCoreChatHook.java b/src/main/java/com/xinecraft/minetrax/hooks/chat/EpicCoreChatHook.java similarity index 93% rename from src/main/java/com/xinecraft/hooks/chat/EpicCoreChatHook.java rename to src/main/java/com/xinecraft/minetrax/hooks/chat/EpicCoreChatHook.java index 3d3f004..22ead6a 100644 --- a/src/main/java/com/xinecraft/hooks/chat/EpicCoreChatHook.java +++ b/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; diff --git a/src/main/java/com/xinecraft/hooks/chat/VentureChatHook.java b/src/main/java/com/xinecraft/minetrax/hooks/chat/VentureChatHook.java similarity index 94% rename from src/main/java/com/xinecraft/hooks/chat/VentureChatHook.java rename to src/main/java/com/xinecraft/minetrax/hooks/chat/VentureChatHook.java index ead5721..9c608cf 100644 --- a/src/main/java/com/xinecraft/hooks/chat/VentureChatHook.java +++ b/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; diff --git a/src/main/java/com/xinecraft/hooks/placeholderapi/MinetraxPlaceholderExpansion.java b/src/main/java/com/xinecraft/minetrax/hooks/placeholderapi/MinetraxPlaceholderExpansion.java similarity index 96% rename from src/main/java/com/xinecraft/hooks/placeholderapi/MinetraxPlaceholderExpansion.java rename to src/main/java/com/xinecraft/minetrax/hooks/placeholderapi/MinetraxPlaceholderExpansion.java index 5eb4aaa..b22554a 100644 --- a/src/main/java/com/xinecraft/hooks/placeholderapi/MinetraxPlaceholderExpansion.java +++ b/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; diff --git a/src/main/java/com/xinecraft/hooks/skinsrestorer/SkinsRestorerHook.java b/src/main/java/com/xinecraft/minetrax/hooks/skinsrestorer/SkinsRestorerHook.java similarity index 84% rename from src/main/java/com/xinecraft/hooks/skinsrestorer/SkinsRestorerHook.java rename to src/main/java/com/xinecraft/minetrax/hooks/skinsrestorer/SkinsRestorerHook.java index dca4ab7..31256fb 100644 --- a/src/main/java/com/xinecraft/hooks/skinsrestorer/SkinsRestorerHook.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/BlockBreakListener.java b/src/main/java/com/xinecraft/minetrax/listeners/BlockBreakListener.java similarity index 81% rename from src/main/java/com/xinecraft/listeners/BlockBreakListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/BlockBreakListener.java index 5addcb9..f5e4e15 100644 --- a/src/main/java/com/xinecraft/listeners/BlockBreakListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/BlockPlaceListener.java b/src/main/java/com/xinecraft/minetrax/listeners/BlockPlaceListener.java similarity index 83% rename from src/main/java/com/xinecraft/listeners/BlockPlaceListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/BlockPlaceListener.java index c0edf9a..cb17c9b 100644 --- a/src/main/java/com/xinecraft/listeners/BlockPlaceListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/CraftItemListener.java b/src/main/java/com/xinecraft/minetrax/listeners/CraftItemListener.java similarity index 93% rename from src/main/java/com/xinecraft/listeners/CraftItemListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/CraftItemListener.java index ef8d513..cdda8df 100644 --- a/src/main/java/com/xinecraft/listeners/CraftItemListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/EnchantItemListener.java b/src/main/java/com/xinecraft/minetrax/listeners/EnchantItemListener.java similarity index 81% rename from src/main/java/com/xinecraft/listeners/EnchantItemListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/EnchantItemListener.java index b459d6c..cc99e54 100644 --- a/src/main/java/com/xinecraft/listeners/EnchantItemListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/EntityDeathEventListener.java b/src/main/java/com/xinecraft/minetrax/listeners/EntityDeathEventListener.java similarity index 95% rename from src/main/java/com/xinecraft/listeners/EntityDeathEventListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/EntityDeathEventListener.java index c0efd13..068f0c3 100644 --- a/src/main/java/com/xinecraft/listeners/EntityDeathEventListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/EntityPickupItemListener.java b/src/main/java/com/xinecraft/minetrax/listeners/EntityPickupItemListener.java similarity index 83% rename from src/main/java/com/xinecraft/listeners/EntityPickupItemListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/EntityPickupItemListener.java index e70e5eb..fd79b85 100644 --- a/src/main/java/com/xinecraft/listeners/EntityPickupItemListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/FishCatchListener.java b/src/main/java/com/xinecraft/minetrax/listeners/FishCatchListener.java similarity index 85% rename from src/main/java/com/xinecraft/listeners/FishCatchListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/FishCatchListener.java index 72c6a53..69d4fa5 100644 --- a/src/main/java/com/xinecraft/listeners/FishCatchListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerAdvancementDoneListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerAdvancementDoneListener.java similarity index 84% rename from src/main/java/com/xinecraft/listeners/PlayerAdvancementDoneListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerAdvancementDoneListener.java index b6a9ed2..5beaf2b 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerAdvancementDoneListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerBedEnterListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerBedEnterListener.java similarity index 81% rename from src/main/java/com/xinecraft/listeners/PlayerBedEnterListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerBedEnterListener.java index 1ea1fe3..bb86497 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerBedEnterListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerChatListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerChatListener.java similarity index 91% rename from src/main/java/com/xinecraft/listeners/PlayerChatListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerChatListener.java index ff835a3..6af7024 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerChatListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerCommandListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerCommandListener.java similarity index 83% rename from src/main/java/com/xinecraft/listeners/PlayerCommandListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerCommandListener.java index b9a4162..917becd 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerCommandListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerDamageListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerDamageListener.java similarity index 88% rename from src/main/java/com/xinecraft/listeners/PlayerDamageListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerDamageListener.java index 290a6ca..58cd5bb 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerDamageListener.java +++ b/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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerDeathListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerDeathListener.java similarity index 93% rename from src/main/java/com/xinecraft/listeners/PlayerDeathListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerDeathListener.java index 04079ba..cb24d0c 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerDeathListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerDeathListener.java @@ -1,7 +1,7 @@ -package com.xinecraft.listeners; +package com.xinecraft.minetrax.listeners; -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.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/com/xinecraft/listeners/PlayerDropItemListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerDropItemListener.java similarity index 82% rename from src/main/java/com/xinecraft/listeners/PlayerDropItemListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerDropItemListener.java index f8438bd..319bbf6 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerDropItemListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerDropItemListener.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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerItemBreakListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerItemBreakListener.java similarity index 82% rename from src/main/java/com/xinecraft/listeners/PlayerItemBreakListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerItemBreakListener.java index a2e7f2a..5be4742 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerItemBreakListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerItemBreakListener.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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerItemConsumeListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerItemConsumeListener.java similarity index 83% rename from src/main/java/com/xinecraft/listeners/PlayerItemConsumeListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerItemConsumeListener.java index 95e339a..162b90b 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerItemConsumeListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerItemConsumeListener.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; diff --git a/src/main/java/com/xinecraft/listeners/PlayerJoinLeaveListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerJoinLeaveListener.java similarity index 96% rename from src/main/java/com/xinecraft/listeners/PlayerJoinLeaveListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerJoinLeaveListener.java index b247bf2..24deec2 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerJoinLeaveListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerJoinLeaveListener.java @@ -1,15 +1,15 @@ -package com.xinecraft.listeners; +package com.xinecraft.minetrax.listeners; import com.google.gson.Gson; import com.viaversion.viaversion.api.Via; -import com.xinecraft.Minetrax; -import com.xinecraft.data.PlayerData; -import com.xinecraft.data.PlayerSessionIntelData; -import com.xinecraft.data.PlayerWorldStatsIntelData; -import com.xinecraft.utils.HttpUtil; -import com.xinecraft.utils.LoggingUtil; -import com.xinecraft.utils.VersionUtil; -import com.xinecraft.utils.WhoisUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.PlayerData; +import com.xinecraft.minetrax.data.PlayerSessionIntelData; +import com.xinecraft.minetrax.data.PlayerWorldStatsIntelData; +import com.xinecraft.minetrax.utils.HttpUtil; +import com.xinecraft.minetrax.utils.LoggingUtil; +import com.xinecraft.minetrax.utils.VersionUtil; +import com.xinecraft.minetrax.utils.WhoisUtil; import net.skinsrestorer.api.PropertyUtils; import net.skinsrestorer.api.SkinsRestorer; import net.skinsrestorer.api.SkinsRestorerProvider; diff --git a/src/main/java/com/xinecraft/listeners/PlayerKickBanListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerKickBanListener.java similarity index 93% rename from src/main/java/com/xinecraft/listeners/PlayerKickBanListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerKickBanListener.java index 8852d54..22e4b1a 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerKickBanListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerKickBanListener.java @@ -1,9 +1,9 @@ -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.utils.HttpUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.PlayerData; +import com.xinecraft.minetrax.data.PlayerSessionIntelData; +import com.xinecraft.minetrax.utils.HttpUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/xinecraft/listeners/PlayerLoginListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerLoginListener.java similarity index 90% rename from src/main/java/com/xinecraft/listeners/PlayerLoginListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerLoginListener.java index 4c7e383..841b32c 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerLoginListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerLoginListener.java @@ -1,7 +1,7 @@ -package com.xinecraft.listeners; +package com.xinecraft.minetrax.listeners; -import com.xinecraft.Minetrax; -import com.xinecraft.utils.LoggingUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.utils.LoggingUtil; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/src/main/java/com/xinecraft/listeners/PlayerMoveListener.java b/src/main/java/com/xinecraft/minetrax/listeners/PlayerMoveListener.java similarity index 91% rename from src/main/java/com/xinecraft/listeners/PlayerMoveListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/PlayerMoveListener.java index d5e509b..549d3e6 100644 --- a/src/main/java/com/xinecraft/listeners/PlayerMoveListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/PlayerMoveListener.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.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/xinecraft/listeners/ProjectileLaunchListener.java b/src/main/java/com/xinecraft/minetrax/listeners/ProjectileLaunchListener.java similarity index 86% rename from src/main/java/com/xinecraft/listeners/ProjectileLaunchListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/ProjectileLaunchListener.java index 6f2780f..3506ef1 100644 --- a/src/main/java/com/xinecraft/listeners/ProjectileLaunchListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/ProjectileLaunchListener.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.entity.Trident; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/xinecraft/listeners/RaidFinishListener.java b/src/main/java/com/xinecraft/minetrax/listeners/RaidFinishListener.java similarity index 84% rename from src/main/java/com/xinecraft/listeners/RaidFinishListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/RaidFinishListener.java index 062eaf3..d655703 100644 --- a/src/main/java/com/xinecraft/listeners/RaidFinishListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/RaidFinishListener.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; diff --git a/src/main/java/com/xinecraft/listeners/ServerBroadcastListener.java b/src/main/java/com/xinecraft/minetrax/listeners/ServerBroadcastListener.java similarity index 89% rename from src/main/java/com/xinecraft/listeners/ServerBroadcastListener.java rename to src/main/java/com/xinecraft/minetrax/listeners/ServerBroadcastListener.java index dee580a..42a8f5b 100644 --- a/src/main/java/com/xinecraft/listeners/ServerBroadcastListener.java +++ b/src/main/java/com/xinecraft/minetrax/listeners/ServerBroadcastListener.java @@ -1,8 +1,8 @@ -package com.xinecraft.listeners; +package com.xinecraft.minetrax.listeners; -import com.xinecraft.Minetrax; -import com.xinecraft.utils.HttpUtil; -import com.xinecraft.utils.LoggingUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.utils.HttpUtil; +import com.xinecraft.minetrax.utils.LoggingUtil; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/com/xinecraft/log4j/ConsoleAppender.java b/src/main/java/com/xinecraft/minetrax/log4j/ConsoleAppender.java similarity index 94% rename from src/main/java/com/xinecraft/log4j/ConsoleAppender.java rename to src/main/java/com/xinecraft/minetrax/log4j/ConsoleAppender.java index abff3d7..083b9c2 100644 --- a/src/main/java/com/xinecraft/log4j/ConsoleAppender.java +++ b/src/main/java/com/xinecraft/minetrax/log4j/ConsoleAppender.java @@ -1,8 +1,8 @@ -package com.xinecraft.log4j; +package com.xinecraft.minetrax.log4j; -import com.xinecraft.Minetrax; -import com.xinecraft.utils.AnsiColor; -import com.xinecraft.utils.TimeUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.utils.AnsiColor; +import com.xinecraft.minetrax.utils.TimeUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; diff --git a/src/main/java/com/xinecraft/log4j/ConsoleMessage.java b/src/main/java/com/xinecraft/minetrax/log4j/ConsoleMessage.java similarity index 87% rename from src/main/java/com/xinecraft/log4j/ConsoleMessage.java rename to src/main/java/com/xinecraft/minetrax/log4j/ConsoleMessage.java index 9278f6e..b188ab7 100644 --- a/src/main/java/com/xinecraft/log4j/ConsoleMessage.java +++ b/src/main/java/com/xinecraft/minetrax/log4j/ConsoleMessage.java @@ -1,4 +1,4 @@ -package com.xinecraft.log4j; +package com.xinecraft.minetrax.log4j; import lombok.Data; diff --git a/src/main/java/com/xinecraft/tasks/AccountLinkReminderTask.java b/src/main/java/com/xinecraft/minetrax/tasks/AccountLinkReminderTask.java similarity index 85% rename from src/main/java/com/xinecraft/tasks/AccountLinkReminderTask.java rename to src/main/java/com/xinecraft/minetrax/tasks/AccountLinkReminderTask.java index ccb8a76..c1104ac 100644 --- a/src/main/java/com/xinecraft/tasks/AccountLinkReminderTask.java +++ b/src/main/java/com/xinecraft/minetrax/tasks/AccountLinkReminderTask.java @@ -1,7 +1,7 @@ -package com.xinecraft.tasks; +package com.xinecraft.minetrax.tasks; -import com.xinecraft.Minetrax; -import com.xinecraft.data.PlayerData; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.PlayerData; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/com/xinecraft/tasks/PlayerAfkAndWorldIntelTrackerTask.java b/src/main/java/com/xinecraft/minetrax/tasks/PlayerAfkAndWorldIntelTrackerTask.java similarity index 91% rename from src/main/java/com/xinecraft/tasks/PlayerAfkAndWorldIntelTrackerTask.java rename to src/main/java/com/xinecraft/minetrax/tasks/PlayerAfkAndWorldIntelTrackerTask.java index 3a0bfd6..41decd4 100644 --- a/src/main/java/com/xinecraft/tasks/PlayerAfkAndWorldIntelTrackerTask.java +++ b/src/main/java/com/xinecraft/minetrax/tasks/PlayerAfkAndWorldIntelTrackerTask.java @@ -1,9 +1,9 @@ -package com.xinecraft.tasks; +package com.xinecraft.minetrax.tasks; -import com.xinecraft.Minetrax; -import com.xinecraft.data.PlayerData; -import com.xinecraft.data.PlayerSessionIntelData; -import com.xinecraft.data.PlayerWorldStatsIntelData; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.PlayerData; +import com.xinecraft.minetrax.data.PlayerSessionIntelData; +import com.xinecraft.minetrax.data.PlayerWorldStatsIntelData; import org.bukkit.entity.Player; public class PlayerAfkAndWorldIntelTrackerTask implements Runnable { diff --git a/src/main/java/com/xinecraft/tasks/PlayerIntelReportTask.java b/src/main/java/com/xinecraft/minetrax/tasks/PlayerIntelReportTask.java similarity index 78% rename from src/main/java/com/xinecraft/tasks/PlayerIntelReportTask.java rename to src/main/java/com/xinecraft/minetrax/tasks/PlayerIntelReportTask.java index 57a10d8..ccfb2f8 100644 --- a/src/main/java/com/xinecraft/tasks/PlayerIntelReportTask.java +++ b/src/main/java/com/xinecraft/minetrax/tasks/PlayerIntelReportTask.java @@ -1,9 +1,9 @@ -package com.xinecraft.tasks; +package com.xinecraft.minetrax.tasks; import com.google.gson.Gson; -import com.xinecraft.Minetrax; -import com.xinecraft.data.PlayerSessionIntelData; -import com.xinecraft.utils.PlayerIntelUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.PlayerSessionIntelData; +import com.xinecraft.minetrax.utils.PlayerIntelUtil; import java.util.HashMap; diff --git a/src/main/java/com/xinecraft/tasks/ServerIntelReportTask.java b/src/main/java/com/xinecraft/minetrax/tasks/ServerIntelReportTask.java similarity index 90% rename from src/main/java/com/xinecraft/tasks/ServerIntelReportTask.java rename to src/main/java/com/xinecraft/minetrax/tasks/ServerIntelReportTask.java index 2cbfb20..54d329a 100644 --- a/src/main/java/com/xinecraft/tasks/ServerIntelReportTask.java +++ b/src/main/java/com/xinecraft/minetrax/tasks/ServerIntelReportTask.java @@ -1,14 +1,14 @@ -package com.xinecraft.tasks; +package com.xinecraft.minetrax.tasks; import com.google.gson.Gson; import com.sun.management.OperatingSystemMXBean; -import com.xinecraft.Minetrax; -import com.xinecraft.data.ServerIntelData; -import com.xinecraft.data.WorldData; -import com.xinecraft.utils.HttpUtil; -import com.xinecraft.utils.LoggingUtil; -import com.xinecraft.utils.SystemUtil; -import com.xinecraft.utils.TPS; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.ServerIntelData; +import com.xinecraft.minetrax.data.WorldData; +import com.xinecraft.minetrax.utils.HttpUtil; +import com.xinecraft.minetrax.utils.LoggingUtil; +import com.xinecraft.minetrax.utils.SystemUtil; +import com.xinecraft.minetrax.utils.TPS; import org.bukkit.World; import java.lang.management.ManagementFactory; diff --git a/src/main/java/com/xinecraft/threads/ConsoleMessageQueueWorker.java b/src/main/java/com/xinecraft/minetrax/threads/ConsoleMessageQueueWorker.java similarity index 93% rename from src/main/java/com/xinecraft/threads/ConsoleMessageQueueWorker.java rename to src/main/java/com/xinecraft/minetrax/threads/ConsoleMessageQueueWorker.java index 84010d4..1d63ff8 100644 --- a/src/main/java/com/xinecraft/threads/ConsoleMessageQueueWorker.java +++ b/src/main/java/com/xinecraft/minetrax/threads/ConsoleMessageQueueWorker.java @@ -1,8 +1,8 @@ -package com.xinecraft.threads; +package com.xinecraft.minetrax.threads; -import com.xinecraft.log4j.ConsoleMessage; -import com.xinecraft.Minetrax; -import com.xinecraft.utils.HttpUtil; +import com.xinecraft.minetrax.log4j.ConsoleMessage; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.utils.HttpUtil; import org.apache.commons.lang.StringUtils; import java.util.Deque; diff --git a/src/main/java/com/xinecraft/threads/data/QueryRequestData.java b/src/main/java/com/xinecraft/minetrax/threads/data/QueryRequestData.java similarity index 86% rename from src/main/java/com/xinecraft/threads/data/QueryRequestData.java rename to src/main/java/com/xinecraft/minetrax/threads/data/QueryRequestData.java index dad21ab..1c91cb3 100644 --- a/src/main/java/com/xinecraft/threads/data/QueryRequestData.java +++ b/src/main/java/com/xinecraft/minetrax/threads/data/QueryRequestData.java @@ -1,4 +1,4 @@ -package com.xinecraft.threads.data; +package com.xinecraft.minetrax.threads.data; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/src/main/java/com/xinecraft/threads/data/QueryResponseData.java b/src/main/java/com/xinecraft/minetrax/threads/data/QueryResponseData.java similarity index 88% rename from src/main/java/com/xinecraft/threads/data/QueryResponseData.java rename to src/main/java/com/xinecraft/minetrax/threads/data/QueryResponseData.java index 4fa45e4..192b8e4 100644 --- a/src/main/java/com/xinecraft/threads/data/QueryResponseData.java +++ b/src/main/java/com/xinecraft/minetrax/threads/data/QueryResponseData.java @@ -1,4 +1,4 @@ -package com.xinecraft.threads.data; +package com.xinecraft.minetrax.threads.data; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/src/main/java/com/xinecraft/threads/webquery/NettyWebQueryServer.java b/src/main/java/com/xinecraft/minetrax/threads/webquery/NettyWebQueryServer.java similarity index 94% rename from src/main/java/com/xinecraft/threads/webquery/NettyWebQueryServer.java rename to src/main/java/com/xinecraft/minetrax/threads/webquery/NettyWebQueryServer.java index d5ca3d6..6d17b29 100644 --- a/src/main/java/com/xinecraft/threads/webquery/NettyWebQueryServer.java +++ b/src/main/java/com/xinecraft/minetrax/threads/webquery/NettyWebQueryServer.java @@ -1,66 +1,66 @@ -package com.xinecraft.threads.webquery; - -import com.xinecraft.Minetrax; -import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioServerSocketChannel; -import org.bukkit.scheduler.BukkitRunnable; - -public class NettyWebQueryServer extends BukkitRunnable { - private int port; - private String host; - - private final EventLoopGroup bossGroup; - private final EventLoopGroup workerGroup; - private ChannelFuture serverChannelFuture; - - public NettyWebQueryServer(String host, int port) { - this.host = host; - this.port = port; - this.bossGroup = new NioEventLoopGroup(); - this.workerGroup = new NioEventLoopGroup(); - } - - @Override - public void run() { - try { - ServerBootstrap b = new ServerBootstrap(); - b.group(bossGroup, workerGroup) - .channel(NioServerSocketChannel.class) - .childHandler(new SimpleTCPChannelInitializer()) - .childOption(ChannelOption.SO_KEEPALIVE, true); - - // Bind and start to accept incoming connections. - if (host != null && !host.isEmpty()) - serverChannelFuture = b.bind(host, port).sync(); - else - serverChannelFuture = b.bind(port).sync(); - - if (serverChannelFuture.isSuccess()) { - Minetrax.getPlugin().getLogger().info("WebQuery Server started successfully on port " + port); - } - - // Wait until the server socket is closed. - // In this example, this does not happen, but you can do that to gracefully - // shut down your server. - serverChannelFuture.channel().closeFuture().sync(); - } catch (InterruptedException e) { - Minetrax.getPlugin().getLogger().warning("WebQuery Server interrupted: " + e.getMessage()); - Thread.currentThread().interrupt(); - } finally { - workerGroup.shutdownGracefully(); - bossGroup.shutdownGracefully(); - } - } - - public void shutdown() { - if (serverChannelFuture != null) { - serverChannelFuture.channel().close().syncUninterruptibly(); - } - workerGroup.shutdownGracefully().syncUninterruptibly(); - bossGroup.shutdownGracefully().syncUninterruptibly(); - } -} +package com.xinecraft.minetrax.threads.webquery; + +import com.xinecraft.minetrax.Minetrax; +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import org.bukkit.scheduler.BukkitRunnable; + +public class NettyWebQueryServer extends BukkitRunnable { + private int port; + private String host; + + private final EventLoopGroup bossGroup; + private final EventLoopGroup workerGroup; + private ChannelFuture serverChannelFuture; + + public NettyWebQueryServer(String host, int port) { + this.host = host; + this.port = port; + this.bossGroup = new NioEventLoopGroup(); + this.workerGroup = new NioEventLoopGroup(); + } + + @Override + public void run() { + try { + ServerBootstrap b = new ServerBootstrap(); + b.group(bossGroup, workerGroup) + .channel(NioServerSocketChannel.class) + .childHandler(new SimpleTCPChannelInitializer()) + .childOption(ChannelOption.SO_KEEPALIVE, true); + + // Bind and start to accept incoming connections. + if (host != null && !host.isEmpty()) + serverChannelFuture = b.bind(host, port).sync(); + else + serverChannelFuture = b.bind(port).sync(); + + if (serverChannelFuture.isSuccess()) { + Minetrax.getPlugin().getLogger().info("WebQuery Server started successfully on port " + port); + } + + // Wait until the server socket is closed. + // In this example, this does not happen, but you can do that to gracefully + // shut down your server. + serverChannelFuture.channel().closeFuture().sync(); + } catch (InterruptedException e) { + Minetrax.getPlugin().getLogger().warning("WebQuery Server interrupted: " + e.getMessage()); + Thread.currentThread().interrupt(); + } finally { + workerGroup.shutdownGracefully(); + bossGroup.shutdownGracefully(); + } + } + + public void shutdown() { + if (serverChannelFuture != null) { + serverChannelFuture.channel().close().syncUninterruptibly(); + } + workerGroup.shutdownGracefully().syncUninterruptibly(); + bossGroup.shutdownGracefully().syncUninterruptibly(); + } +} diff --git a/src/main/java/com/xinecraft/threads/webquery/SimpleTCPChannelHandler.java b/src/main/java/com/xinecraft/minetrax/threads/webquery/SimpleTCPChannelHandler.java similarity index 86% rename from src/main/java/com/xinecraft/threads/webquery/SimpleTCPChannelHandler.java rename to src/main/java/com/xinecraft/minetrax/threads/webquery/SimpleTCPChannelHandler.java index 044c469..43546ac 100644 --- a/src/main/java/com/xinecraft/threads/webquery/SimpleTCPChannelHandler.java +++ b/src/main/java/com/xinecraft/minetrax/threads/webquery/SimpleTCPChannelHandler.java @@ -1,23 +1,23 @@ -package com.xinecraft.threads.webquery; - -import com.xinecraft.utils.LoggingUtil; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; - -public class SimpleTCPChannelHandler extends SimpleChannelInboundHandler { - @Override - protected void channelRead0(ChannelHandlerContext ctx, String s) throws Exception { - String output; - try { - output = WebQueryProtocol.processInput(s); - } catch (Exception e) { - LoggingUtil.warning("Error processing input: " + e.getMessage()); - output = "err"; - } - if (output == null) { - output = "err"; - } - ctx.channel().writeAndFlush(output); - ctx.close(); - } +package com.xinecraft.minetrax.threads.webquery; + +import com.xinecraft.minetrax.utils.LoggingUtil; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + +public class SimpleTCPChannelHandler extends SimpleChannelInboundHandler { + @Override + protected void channelRead0(ChannelHandlerContext ctx, String s) throws Exception { + String output; + try { + output = WebQueryProtocol.processInput(s); + } catch (Exception e) { + LoggingUtil.warning("Error processing input: " + e.getMessage()); + output = "err"; + } + if (output == null) { + output = "err"; + } + ctx.channel().writeAndFlush(output); + ctx.close(); + } } \ No newline at end of file diff --git a/src/main/java/com/xinecraft/threads/webquery/SimpleTCPChannelInitializer.java b/src/main/java/com/xinecraft/minetrax/threads/webquery/SimpleTCPChannelInitializer.java similarity index 91% rename from src/main/java/com/xinecraft/threads/webquery/SimpleTCPChannelInitializer.java rename to src/main/java/com/xinecraft/minetrax/threads/webquery/SimpleTCPChannelInitializer.java index 55723f0..8d704f5 100644 --- a/src/main/java/com/xinecraft/threads/webquery/SimpleTCPChannelInitializer.java +++ b/src/main/java/com/xinecraft/minetrax/threads/webquery/SimpleTCPChannelInitializer.java @@ -1,14 +1,14 @@ -package com.xinecraft.threads.webquery; - -import io.netty.channel.ChannelInitializer; -import io.netty.channel.socket.SocketChannel; -import io.netty.handler.codec.string.StringDecoder; -import io.netty.handler.codec.string.StringEncoder; - -public class SimpleTCPChannelInitializer extends ChannelInitializer { - protected void initChannel(SocketChannel socketChannel) throws Exception { - socketChannel.pipeline().addLast(new StringEncoder()); - socketChannel.pipeline().addLast(new StringDecoder()); - socketChannel.pipeline().addLast(new SimpleTCPChannelHandler()); - } -} +package com.xinecraft.minetrax.threads.webquery; + +import io.netty.channel.ChannelInitializer; +import io.netty.channel.socket.SocketChannel; +import io.netty.handler.codec.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; + +public class SimpleTCPChannelInitializer extends ChannelInitializer { + protected void initChannel(SocketChannel socketChannel) throws Exception { + socketChannel.pipeline().addLast(new StringEncoder()); + socketChannel.pipeline().addLast(new StringDecoder()); + socketChannel.pipeline().addLast(new SimpleTCPChannelHandler()); + } +} diff --git a/src/main/java/com/xinecraft/threads/webquery/WebQueryProtocol.java b/src/main/java/com/xinecraft/minetrax/threads/webquery/WebQueryProtocol.java similarity index 96% rename from src/main/java/com/xinecraft/threads/webquery/WebQueryProtocol.java rename to src/main/java/com/xinecraft/minetrax/threads/webquery/WebQueryProtocol.java index 6897874..acee3a4 100644 --- a/src/main/java/com/xinecraft/threads/webquery/WebQueryProtocol.java +++ b/src/main/java/com/xinecraft/minetrax/threads/webquery/WebQueryProtocol.java @@ -1,14 +1,14 @@ -package com.xinecraft.threads.webquery; +package com.xinecraft.minetrax.threads.webquery; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.xinecraft.Minetrax; -import com.xinecraft.data.PlayerData; -import com.xinecraft.threads.data.QueryRequestData; -import com.xinecraft.threads.webquery.handlers.PlayerSkinHandler; -import com.xinecraft.utils.CryptoUtil; -import com.xinecraft.utils.LoggingUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.PlayerData; +import com.xinecraft.minetrax.threads.webquery.handlers.PlayerSkinHandler; +import com.xinecraft.minetrax.threads.data.QueryRequestData; +import com.xinecraft.minetrax.utils.CryptoUtil; +import com.xinecraft.minetrax.utils.LoggingUtil; import net.skinsrestorer.api.PropertyUtils; import net.skinsrestorer.api.SkinsRestorer; import net.skinsrestorer.api.property.SkinProperty; diff --git a/src/main/java/com/xinecraft/threads/webquery/handlers/PlayerSkinHandler.java b/src/main/java/com/xinecraft/minetrax/threads/webquery/handlers/PlayerSkinHandler.java similarity index 96% rename from src/main/java/com/xinecraft/threads/webquery/handlers/PlayerSkinHandler.java rename to src/main/java/com/xinecraft/minetrax/threads/webquery/handlers/PlayerSkinHandler.java index aa01712..4718ee4 100644 --- a/src/main/java/com/xinecraft/threads/webquery/handlers/PlayerSkinHandler.java +++ b/src/main/java/com/xinecraft/minetrax/threads/webquery/handlers/PlayerSkinHandler.java @@ -1,7 +1,7 @@ -package com.xinecraft.threads.webquery.handlers; +package com.xinecraft.minetrax.threads.webquery.handlers; -import com.xinecraft.Minetrax; -import com.xinecraft.utils.LoggingUtil; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.utils.LoggingUtil; import net.skinsrestorer.api.SkinsRestorer; import net.skinsrestorer.api.property.InputDataResult; import net.skinsrestorer.api.property.SkinProperty; diff --git a/src/main/java/com/xinecraft/utils/AesEncryptionData.java b/src/main/java/com/xinecraft/minetrax/utils/AesEncryptionData.java similarity index 88% rename from src/main/java/com/xinecraft/utils/AesEncryptionData.java rename to src/main/java/com/xinecraft/minetrax/utils/AesEncryptionData.java index 80544bf..0c04ae9 100644 --- a/src/main/java/com/xinecraft/utils/AesEncryptionData.java +++ b/src/main/java/com/xinecraft/minetrax/utils/AesEncryptionData.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import lombok.Data; diff --git a/src/main/java/com/xinecraft/utils/AnsiColor.java b/src/main/java/com/xinecraft/minetrax/utils/AnsiColor.java similarity index 99% rename from src/main/java/com/xinecraft/utils/AnsiColor.java rename to src/main/java/com/xinecraft/minetrax/utils/AnsiColor.java index a3e67aa..2152ddb 100644 --- a/src/main/java/com/xinecraft/utils/AnsiColor.java +++ b/src/main/java/com/xinecraft/minetrax/utils/AnsiColor.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/xinecraft/utils/CryptoUtil.java b/src/main/java/com/xinecraft/minetrax/utils/CryptoUtil.java similarity index 98% rename from src/main/java/com/xinecraft/utils/CryptoUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/CryptoUtil.java index 0e8528a..39101cd 100644 --- a/src/main/java/com/xinecraft/utils/CryptoUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/CryptoUtil.java @@ -1,7 +1,7 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import com.google.gson.Gson; -import com.xinecraft.Minetrax; +import com.xinecraft.minetrax.Minetrax; import org.apache.commons.codec.binary.Hex; import javax.crypto.Cipher; diff --git a/src/main/java/com/xinecraft/utils/HttpUtil.java b/src/main/java/com/xinecraft/minetrax/utils/HttpUtil.java similarity index 99% rename from src/main/java/com/xinecraft/utils/HttpUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/HttpUtil.java index ccb4968..99587c2 100644 --- a/src/main/java/com/xinecraft/utils/HttpUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/HttpUtil.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; /** * @file HttpUtil.java @@ -50,7 +50,7 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.xinecraft.Minetrax; +import com.xinecraft.minetrax.Minetrax; import java.io.*; import java.net.HttpURLConnection; diff --git a/src/main/java/com/xinecraft/utils/LoggingUtil.java b/src/main/java/com/xinecraft/minetrax/utils/LoggingUtil.java similarity index 86% rename from src/main/java/com/xinecraft/utils/LoggingUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/LoggingUtil.java index cac1b04..552a608 100644 --- a/src/main/java/com/xinecraft/utils/LoggingUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/LoggingUtil.java @@ -1,21 +1,21 @@ -package com.xinecraft.utils; - -import com.xinecraft.Minetrax; - -public class LoggingUtil { - public static void syslog(String message) { - if(Minetrax.getPlugin().getIsDebugMode()) { - System.out.println(message); - } - } - public static void info(String message) { - if(Minetrax.getPlugin().getIsDebugMode()) { - Minetrax.getPlugin().getLogger().info(message); - } - } - public static void warning(String message) { - if(Minetrax.getPlugin().getIsDebugMode()) { - Minetrax.getPlugin().getLogger().warning(message); - } - } -} +package com.xinecraft.minetrax.utils; + +import com.xinecraft.minetrax.Minetrax; + +public class LoggingUtil { + public static void syslog(String message) { + if(Minetrax.getPlugin().getIsDebugMode()) { + System.out.println(message); + } + } + public static void info(String message) { + if(Minetrax.getPlugin().getIsDebugMode()) { + Minetrax.getPlugin().getLogger().info(message); + } + } + public static void warning(String message) { + if(Minetrax.getPlugin().getIsDebugMode()) { + Minetrax.getPlugin().getLogger().warning(message); + } + } +} diff --git a/src/main/java/com/xinecraft/utils/PlayerIntelUtil.java b/src/main/java/com/xinecraft/minetrax/utils/PlayerIntelUtil.java similarity index 96% rename from src/main/java/com/xinecraft/utils/PlayerIntelUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/PlayerIntelUtil.java index fffc3eb..ea23ce5 100644 --- a/src/main/java/com/xinecraft/utils/PlayerIntelUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/PlayerIntelUtil.java @@ -1,8 +1,8 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import com.google.gson.Gson; -import com.xinecraft.Minetrax; -import com.xinecraft.data.PlayerSessionIntelData; +import com.xinecraft.minetrax.Minetrax; +import com.xinecraft.minetrax.data.PlayerSessionIntelData; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/com/xinecraft/utils/PluginUtil.java b/src/main/java/com/xinecraft/minetrax/utils/PluginUtil.java similarity index 98% rename from src/main/java/com/xinecraft/utils/PluginUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/PluginUtil.java index 507bc4c..ed61688 100644 --- a/src/main/java/com/xinecraft/utils/PluginUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/PluginUtil.java @@ -1,6 +1,6 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; -import com.xinecraft.Minetrax; +import com.xinecraft.minetrax.Minetrax; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.PluginCommand; diff --git a/src/main/java/com/xinecraft/utils/ReflectionUtil.java b/src/main/java/com/xinecraft/minetrax/utils/ReflectionUtil.java similarity index 96% rename from src/main/java/com/xinecraft/utils/ReflectionUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/ReflectionUtil.java index 1b0a597..b021f54 100644 --- a/src/main/java/com/xinecraft/utils/ReflectionUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/ReflectionUtil.java @@ -1,176 +1,176 @@ -package com.xinecraft.utils; - -import com.google.common.base.Preconditions; -import org.bukkit.Bukkit; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class ReflectionUtil { - - public static Class getNmsClass(String name) { - String className = "net.minecraft.server." + name; - if(getClass(className) != null) return getClass(className); - - className = "net.minecraft.server." + getVersion() + "." + name; - return getClass(className); - } - - public static Class getCbClass(String name) { - String className = "org.bukkit.craftbukkit." + getVersion() + "." + name; - return getClass(className); - } - - public static Class getUtilClass(String name) { - try { - return Class.forName(name); //Try before 1.8 first - } catch (ClassNotFoundException ex) { - try { - return Class.forName("net.minecraft.util." + name); //Not 1.8 - } catch (ClassNotFoundException ex2) { - return null; - } - } - } - - public static String getVersion() { - String packageName = Bukkit.getServer().getClass().getPackage().getName(); - return packageName.substring(packageName.lastIndexOf('.') + 1); - } - - public static Object getHandle(Object wrapper) { - Method getHandle = makeMethod(wrapper.getClass(), "getHandle"); - return callMethod(getHandle, wrapper); - } - - //Utils - public static Method makeMethod(Class clazz, String methodName, Class... paramaters) { - try { - return clazz.getDeclaredMethod(methodName, paramaters); - } catch (NoSuchMethodException ex) { - return null; - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - @SuppressWarnings("unchecked") - public static T callMethod(Method method, Object instance, Object... paramaters) { - if (method == null) throw new RuntimeException("No such method"); - method.setAccessible(true); - try { - return (T) method.invoke(instance, paramaters); - } catch (InvocationTargetException ex) { - throw new RuntimeException(ex.getCause()); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - @SuppressWarnings("unchecked") - public static Constructor makeConstructor(Class clazz, Class... paramaterTypes) { - try { - return (Constructor) clazz.getConstructor(paramaterTypes); - } catch (NoSuchMethodException ex) { - return null; - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - public static T callConstructor(Constructor constructor, Object... paramaters) { - if (constructor == null) throw new RuntimeException("No such constructor"); - constructor.setAccessible(true); - try { - return (T) constructor.newInstance(paramaters); - } catch (InvocationTargetException ex) { - throw new RuntimeException(ex.getCause()); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - public static Field makeField(Class clazz, String name) { - try { - return clazz.getDeclaredField(name); - } catch (NoSuchFieldException ex) { - return null; - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - @SuppressWarnings("unchecked") - public static T getField(Field field, Object instance) { - if (field == null) throw new RuntimeException("No such field"); - field.setAccessible(true); - try { - return (T) field.get(instance); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - public static void setField(Field field, Object instance, Object value) { - if (field == null) throw new RuntimeException("No such field"); - field.setAccessible(true); - try { - field.set(instance, value); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - public static Class getClass(String name) { - try { - return Class.forName(name); - } catch (ClassNotFoundException ex) { - return null; - } - } - - public static Class getClass(String name, Class superClass) { - try { - return Class.forName(name).asSubclass(superClass); - } catch (ClassCastException | ClassNotFoundException ex) { - return null; - } - } - - // Fuzzy reflection - - public static Field getOnlyField(Class toGetFrom, Class type) { - Field only = null; - for (Field field : toGetFrom.getDeclaredFields()) { - if (!type.isAssignableFrom(field.getClass())) continue; - Preconditions.checkArgument(only == null, "More than one field of type %s on %s: %s and %s", type.getSimpleName(), toGetFrom.getSimpleName(), field.getName(), only.getName()); - only = field; - } - return only; - } - - public static Method getOnlyMethod(Class toGetFrom, Class returnType, Class... paramSpec) { - Method only = null; - for (Method method : toGetFrom.getDeclaredMethods()) { - if (!returnType.isAssignableFrom(method.getReturnType())) continue; - if (!isParamsMatchSpec(method.getParameterTypes(), paramSpec)) continue; - Preconditions.checkArgument(only == null, "More than one method matching spec on %s" + ((only.getName().equals(method.getName())) ? "" : ": " + only.getName() + " " + method.getName()), toGetFrom.getSimpleName()); - only = method; - } - return only; - } - - public static boolean isParamsMatchSpec(Class[] parameters, Class... paramSpec) { - if (parameters.length > paramSpec.length) return false; - for (int i = 0; i < paramSpec.length; i++) { - Class spec = paramSpec[i]; - if (spec == null) continue; - Class parameter = parameters[i]; - if (!spec.isAssignableFrom(parameter)) return false; - } - return true; - } - -} +package com.xinecraft.minetrax.utils; + +import com.google.common.base.Preconditions; +import org.bukkit.Bukkit; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +public class ReflectionUtil { + + public static Class getNmsClass(String name) { + String className = "net.minecraft.server." + name; + if(getClass(className) != null) return getClass(className); + + className = "net.minecraft.server." + getVersion() + "." + name; + return getClass(className); + } + + public static Class getCbClass(String name) { + String className = "org.bukkit.craftbukkit." + getVersion() + "." + name; + return getClass(className); + } + + public static Class getUtilClass(String name) { + try { + return Class.forName(name); //Try before 1.8 first + } catch (ClassNotFoundException ex) { + try { + return Class.forName("net.minecraft.util." + name); //Not 1.8 + } catch (ClassNotFoundException ex2) { + return null; + } + } + } + + public static String getVersion() { + String packageName = Bukkit.getServer().getClass().getPackage().getName(); + return packageName.substring(packageName.lastIndexOf('.') + 1); + } + + public static Object getHandle(Object wrapper) { + Method getHandle = makeMethod(wrapper.getClass(), "getHandle"); + return callMethod(getHandle, wrapper); + } + + //Utils + public static Method makeMethod(Class clazz, String methodName, Class... paramaters) { + try { + return clazz.getDeclaredMethod(methodName, paramaters); + } catch (NoSuchMethodException ex) { + return null; + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + @SuppressWarnings("unchecked") + public static T callMethod(Method method, Object instance, Object... paramaters) { + if (method == null) throw new RuntimeException("No such method"); + method.setAccessible(true); + try { + return (T) method.invoke(instance, paramaters); + } catch (InvocationTargetException ex) { + throw new RuntimeException(ex.getCause()); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + @SuppressWarnings("unchecked") + public static Constructor makeConstructor(Class clazz, Class... paramaterTypes) { + try { + return (Constructor) clazz.getConstructor(paramaterTypes); + } catch (NoSuchMethodException ex) { + return null; + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public static T callConstructor(Constructor constructor, Object... paramaters) { + if (constructor == null) throw new RuntimeException("No such constructor"); + constructor.setAccessible(true); + try { + return (T) constructor.newInstance(paramaters); + } catch (InvocationTargetException ex) { + throw new RuntimeException(ex.getCause()); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public static Field makeField(Class clazz, String name) { + try { + return clazz.getDeclaredField(name); + } catch (NoSuchFieldException ex) { + return null; + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + @SuppressWarnings("unchecked") + public static T getField(Field field, Object instance) { + if (field == null) throw new RuntimeException("No such field"); + field.setAccessible(true); + try { + return (T) field.get(instance); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public static void setField(Field field, Object instance, Object value) { + if (field == null) throw new RuntimeException("No such field"); + field.setAccessible(true); + try { + field.set(instance, value); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public static Class getClass(String name) { + try { + return Class.forName(name); + } catch (ClassNotFoundException ex) { + return null; + } + } + + public static Class getClass(String name, Class superClass) { + try { + return Class.forName(name).asSubclass(superClass); + } catch (ClassCastException | ClassNotFoundException ex) { + return null; + } + } + + // Fuzzy reflection + + public static Field getOnlyField(Class toGetFrom, Class type) { + Field only = null; + for (Field field : toGetFrom.getDeclaredFields()) { + if (!type.isAssignableFrom(field.getClass())) continue; + Preconditions.checkArgument(only == null, "More than one field of type %s on %s: %s and %s", type.getSimpleName(), toGetFrom.getSimpleName(), field.getName(), only.getName()); + only = field; + } + return only; + } + + public static Method getOnlyMethod(Class toGetFrom, Class returnType, Class... paramSpec) { + Method only = null; + for (Method method : toGetFrom.getDeclaredMethods()) { + if (!returnType.isAssignableFrom(method.getReturnType())) continue; + if (!isParamsMatchSpec(method.getParameterTypes(), paramSpec)) continue; + Preconditions.checkArgument(only == null, "More than one method matching spec on %s" + ((only.getName().equals(method.getName())) ? "" : ": " + only.getName() + " " + method.getName()), toGetFrom.getSimpleName()); + only = method; + } + return only; + } + + public static boolean isParamsMatchSpec(Class[] parameters, Class... paramSpec) { + if (parameters.length > paramSpec.length) return false; + for (int i = 0; i < paramSpec.length; i++) { + Class spec = paramSpec[i]; + if (spec == null) continue; + Class parameter = parameters[i]; + if (!spec.isAssignableFrom(parameter)) return false; + } + return true; + } + +} diff --git a/src/main/java/com/xinecraft/utils/SystemUtil.java b/src/main/java/com/xinecraft/minetrax/utils/SystemUtil.java similarity index 98% rename from src/main/java/com/xinecraft/utils/SystemUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/SystemUtil.java index 5f5d99e..f15523c 100644 --- a/src/main/java/com/xinecraft/utils/SystemUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/SystemUtil.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import java.io.IOException; import java.lang.management.ManagementFactory; diff --git a/src/main/java/com/xinecraft/utils/TPS.java b/src/main/java/com/xinecraft/minetrax/utils/TPS.java similarity index 98% rename from src/main/java/com/xinecraft/utils/TPS.java rename to src/main/java/com/xinecraft/minetrax/utils/TPS.java index 449b9ef..11b2cdb 100644 --- a/src/main/java/com/xinecraft/utils/TPS.java +++ b/src/main/java/com/xinecraft/minetrax/utils/TPS.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import org.bukkit.Bukkit; diff --git a/src/main/java/com/xinecraft/utils/TimeUtil.java b/src/main/java/com/xinecraft/minetrax/utils/TimeUtil.java similarity index 96% rename from src/main/java/com/xinecraft/utils/TimeUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/TimeUtil.java index ce8eafd..de8e8f6 100644 --- a/src/main/java/com/xinecraft/utils/TimeUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/TimeUtil.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/xinecraft/utils/UpdateChecker.java b/src/main/java/com/xinecraft/minetrax/utils/UpdateChecker.java similarity index 92% rename from src/main/java/com/xinecraft/utils/UpdateChecker.java rename to src/main/java/com/xinecraft/minetrax/utils/UpdateChecker.java index 21a6a16..907a1e1 100644 --- a/src/main/java/com/xinecraft/utils/UpdateChecker.java +++ b/src/main/java/com/xinecraft/minetrax/utils/UpdateChecker.java @@ -1,6 +1,6 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; -import com.xinecraft.Minetrax; +import com.xinecraft.minetrax.Minetrax; import org.bukkit.Bukkit; import java.io.IOException; diff --git a/src/main/java/com/xinecraft/utils/VersionUtil.java b/src/main/java/com/xinecraft/minetrax/utils/VersionUtil.java similarity index 99% rename from src/main/java/com/xinecraft/utils/VersionUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/VersionUtil.java index 59e0240..445f8e7 100644 --- a/src/main/java/com/xinecraft/utils/VersionUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/VersionUtil.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/xinecraft/utils/WhoisResponseData.java b/src/main/java/com/xinecraft/minetrax/utils/WhoisResponseData.java similarity index 97% rename from src/main/java/com/xinecraft/utils/WhoisResponseData.java rename to src/main/java/com/xinecraft/minetrax/utils/WhoisResponseData.java index 53ab9d8..d5556e3 100644 --- a/src/main/java/com/xinecraft/utils/WhoisResponseData.java +++ b/src/main/java/com/xinecraft/minetrax/utils/WhoisResponseData.java @@ -1,4 +1,4 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/src/main/java/com/xinecraft/utils/WhoisUtil.java b/src/main/java/com/xinecraft/minetrax/utils/WhoisUtil.java similarity index 99% rename from src/main/java/com/xinecraft/utils/WhoisUtil.java rename to src/main/java/com/xinecraft/minetrax/utils/WhoisUtil.java index ca4d7a7..2afbf89 100644 --- a/src/main/java/com/xinecraft/utils/WhoisUtil.java +++ b/src/main/java/com/xinecraft/minetrax/utils/WhoisUtil.java @@ -1,7 +1,7 @@ -package com.xinecraft.utils; +package com.xinecraft.minetrax.utils; import com.google.gson.Gson; -import com.xinecraft.Minetrax; +import com.xinecraft.minetrax.Minetrax; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 0bcd672..9dd76ac 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Minetrax -version: ${project.version} -main: com.xinecraft.Minetrax +version: '${version}' +main: com.xinecraft.minetrax.Minetrax api-version: 1.13 authors: [ Xinecraft ] description: Minetrax Plugin