From 37e6f031a6100c59d364522828fa9b1ab3326daa Mon Sep 17 00:00:00 2001 From: ineanto Date: Wed, 6 Dec 2023 19:35:34 +0100 Subject: [PATCH] refactor: cleanup for rc1 --- pom.xml | 4 +-- .../nicko/NickoBukkit.java | 26 ++++++++--------- .../nicko/anvil/AnvilManager.java | 18 ++++++------ .../nicko/appearance/ActionResult.java | 2 +- .../nicko/appearance/AppearanceManager.java | 18 ++++++------ .../nicko/command/NickoCommand.java | 8 +++--- .../nicko/config/Configuration.java | 2 +- .../nicko/config/ConfigurationManager.java | 2 +- .../nicko/config/DataSourceConfiguration.java | 2 +- .../nicko/config/DefaultDataSources.java | 2 +- .../config/SQLDataSourceConfiguration.java | 2 +- .../nicko/event/PlayerJoinListener.java | 18 ++++++------ .../nicko/event/PlayerQuitListener.java | 6 ++-- .../nicko/gui/AdminGUI.java | 14 +++++----- .../nicko/gui/CacheManagementGUI.java | 14 +++++----- .../nicko/gui/ChoiceGUI.java | 12 ++++---- .../nicko/gui/HomeGUI.java | 20 ++++++------- .../nicko/gui/InvalidateSkinGUI.java | 18 ++++++------ .../nicko/gui/PlayerCheckGUI.java | 14 +++++----- .../nicko/gui/SettingsGUI.java | 14 +++++----- .../nicko/gui/items/ItemDefaults.java | 6 ++-- .../gui/items/admin/ManageCacheItem.java | 12 ++++---- .../gui/items/admin/ManagePlayerItem.java | 8 +++--- .../gui/items/admin/cache/CacheEntryItem.java | 18 ++++++------ .../admin/cache/CacheStatisticsItem.java | 10 +++---- .../admin/cache/InvalidateCacheItem.java | 8 +++--- .../items/admin/cache/InvalidateSkinItem.java | 8 +++--- .../admin/check/PlayerInformationItem.java | 14 +++++----- .../gui/items/appearance/ChangeBothItem.java | 8 +++--- .../gui/items/appearance/ChangeNameItem.java | 8 +++--- .../gui/items/appearance/ChangeSkinItem.java | 12 ++++---- .../nicko/gui/items/common/GoBackItem.java | 6 ++-- .../gui/items/common/ScrollDownItem.java | 8 +++--- .../nicko/gui/items/common/ScrollUpItem.java | 8 +++--- .../gui/items/common/choice/CancelItem.java | 6 ++-- .../items/common/choice/ChoiceCallback.java | 2 +- .../gui/items/common/choice/ConfirmItem.java | 6 ++-- .../nicko/gui/items/home/AdminAccessItem.java | 8 +++--- .../nicko/gui/items/home/ExitItem.java | 7 ++--- .../nicko/gui/items/home/ResetItem.java | 10 +++---- .../gui/items/home/SettingsAccessItem.java | 8 +++--- .../items/settings/BungeeCordCyclingItem.java | 14 +++++----- .../items/settings/LanguageCyclingItem.java | 18 ++++++------ .../{atnrch => ineanto}/nicko/i18n/I18N.java | 6 ++-- .../nicko/i18n/I18NDict.java | 2 +- .../nicko/i18n/ItemTranslation.java | 2 +- .../nicko/i18n/Locale.java | 2 +- .../nicko/i18n/LocaleFileManager.java | 4 +-- .../nicko/mojang/MojangAPI.java | 2 +- .../nicko/mojang/MojangSkin.java | 2 +- .../nicko/mojang/MojangUtils.java | 2 +- .../nicko/placeholder/NickoExpansion.java | 6 ++-- .../nicko/profile/NickoProfile.java | 28 +++---------------- .../nicko/storage/Cache.java | 6 ++-- .../nicko/storage/CacheProvider.java | 2 +- .../nicko/storage/PlayerDataStore.java | 24 ++++++++-------- .../nicko/storage/Storage.java | 6 ++-- .../nicko/storage/StorageProvider.java | 2 +- .../nicko/storage/json/JSONStorage.java | 14 +++++----- .../storage/json/JSONStorageProvider.java | 4 +-- .../nicko/storage/map/MapCache.java | 10 +++---- .../nicko/storage/map/MapCacheProvider.java | 6 ++-- .../nicko/storage/mariadb/MariaDBStorage.java | 14 +++++----- .../mariadb/MariaDBStorageProvider.java | 8 +++--- .../nicko/storage/mysql/MySQLStorage.java | 14 +++++----- .../storage/mysql/MySQLStorageProvider.java | 8 +++--- .../nicko/storage/name/PlayerNameStore.java | 2 +- .../nicko/storage/redis/RedisCache.java | 12 ++++---- .../storage/redis/RedisCacheProvider.java | 8 +++--- .../nicko/wrapper/AbstractPacket.java | 2 +- .../WrapperPlayServerEntityDestroy.java | 2 +- .../wrapper/WrapperPlayServerRespawn.java | 2 +- .../wrapper/WrapperPlayServerSpawnEntity.java | 2 +- .../WrapperPlayerServerPlayerInfo.java | 2 +- .../WrapperPlayerServerPlayerInfoRemove.java | 2 +- src/main/resources/plugin.yml | 4 +-- .../atnrch/nicko/test/NickoPluginTest.java | 6 ++-- .../nicko/test/config/ConfigurationTest.java | 4 +-- .../nicko/test/i18n/ItemTranslationTest.java | 14 +++++----- .../nicko/test/i18n/TranslationTest.java | 13 ++++----- .../nicko/test/storage/BrokenSQLTest.java | 12 ++++---- .../nicko/test/storage/SQLStorageTest.java | 16 +++++------ .../nicko/test/storage/map/MapCacheTest.java | 9 +++--- .../test/storage/redis/RedisCacheTest.java | 14 +++++----- 84 files changed, 353 insertions(+), 376 deletions(-) rename src/main/java/xyz/{atnrch => ineanto}/nicko/NickoBukkit.java (90%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/anvil/AnvilManager.java (92%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/appearance/ActionResult.java (94%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/appearance/AppearanceManager.java (95%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/command/NickoCommand.java (86%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/config/Configuration.java (97%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/config/ConfigurationManager.java (98%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/config/DataSourceConfiguration.java (97%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/config/DefaultDataSources.java (92%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/config/SQLDataSourceConfiguration.java (93%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/event/PlayerJoinListener.java (83%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/event/PlayerQuitListener.java (82%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/AdminGUI.java (81%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/CacheManagementGUI.java (81%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/ChoiceGUI.java (81%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/HomeGUI.java (79%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/InvalidateSkinGUI.java (84%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/PlayerCheckGUI.java (85%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/SettingsGUI.java (82%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/ItemDefaults.java (90%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/admin/ManageCacheItem.java (87%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/admin/ManagePlayerItem.java (81%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/admin/cache/CacheEntryItem.java (85%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/admin/cache/CacheStatisticsItem.java (82%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/admin/cache/InvalidateCacheItem.java (88%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/admin/cache/InvalidateSkinItem.java (84%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/admin/check/PlayerInformationItem.java (86%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/appearance/ChangeBothItem.java (85%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/appearance/ChangeNameItem.java (85%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/appearance/ChangeSkinItem.java (84%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/common/GoBackItem.java (87%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/common/ScrollDownItem.java (83%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/common/ScrollUpItem.java (82%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/common/choice/CancelItem.java (86%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/common/choice/ChoiceCallback.java (61%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/common/choice/ConfirmItem.java (86%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/home/AdminAccessItem.java (85%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/home/ExitItem.java (84%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/home/ResetItem.java (89%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/home/SettingsAccessItem.java (85%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/settings/BungeeCordCyclingItem.java (88%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/gui/items/settings/LanguageCyclingItem.java (89%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/i18n/I18N.java (97%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/i18n/I18NDict.java (99%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/i18n/ItemTranslation.java (92%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/i18n/Locale.java (95%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/i18n/LocaleFileManager.java (96%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/mojang/MojangAPI.java (99%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/mojang/MojangSkin.java (95%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/mojang/MojangUtils.java (96%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/placeholder/NickoExpansion.java (94%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/profile/NickoProfile.java (72%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/Cache.java (80%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/CacheProvider.java (69%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/PlayerDataStore.java (84%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/Storage.java (80%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/StorageProvider.java (69%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/json/JSONStorage.java (90%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/json/JSONStorageProvider.java (80%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/map/MapCache.java (84%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/map/MapCacheProvider.java (77%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/mariadb/MariaDBStorage.java (94%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/mariadb/MariaDBStorageProvider.java (93%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/mysql/MySQLStorage.java (94%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/mysql/MySQLStorageProvider.java (93%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/name/PlayerNameStore.java (94%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/redis/RedisCache.java (87%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/storage/redis/RedisCacheProvider.java (83%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/wrapper/AbstractPacket.java (98%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/wrapper/WrapperPlayServerEntityDestroy.java (97%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/wrapper/WrapperPlayServerRespawn.java (99%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/wrapper/WrapperPlayServerSpawnEntity.java (98%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/wrapper/WrapperPlayerServerPlayerInfo.java (97%) rename src/main/java/xyz/{atnrch => ineanto}/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java (95%) diff --git a/pom.xml b/pom.xml index 468a730..ca6669d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - xyz.atnrch + xyz.ineanto nicko - 1.0-SNAPSHOT + 1.0-RC1 Nicko diff --git a/src/main/java/xyz/atnrch/nicko/NickoBukkit.java b/src/main/java/xyz/ineanto/nicko/NickoBukkit.java similarity index 90% rename from src/main/java/xyz/atnrch/nicko/NickoBukkit.java rename to src/main/java/xyz/ineanto/nicko/NickoBukkit.java index c6ff4c1..a2dd590 100644 --- a/src/main/java/xyz/atnrch/nicko/NickoBukkit.java +++ b/src/main/java/xyz/ineanto/nicko/NickoBukkit.java @@ -1,21 +1,21 @@ -package xyz.atnrch.nicko; +package xyz.ineanto.nicko; import com.comphenix.protocol.utility.MinecraftVersion; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.java.JavaPlugin; -import xyz.atnrch.nicko.command.NickoCommand; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.ConfigurationManager; -import xyz.atnrch.nicko.event.PlayerJoinListener; -import xyz.atnrch.nicko.event.PlayerQuitListener; -import xyz.atnrch.nicko.i18n.Locale; -import xyz.atnrch.nicko.i18n.LocaleFileManager; -import xyz.atnrch.nicko.mojang.MojangAPI; -import xyz.atnrch.nicko.placeholder.NickoExpansion; -import xyz.atnrch.nicko.storage.PlayerDataStore; -import xyz.atnrch.nicko.storage.name.PlayerNameStore; +import xyz.ineanto.nicko.command.NickoCommand; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.ConfigurationManager; +import xyz.ineanto.nicko.event.PlayerJoinListener; +import xyz.ineanto.nicko.event.PlayerQuitListener; +import xyz.ineanto.nicko.i18n.Locale; +import xyz.ineanto.nicko.i18n.LocaleFileManager; +import xyz.ineanto.nicko.mojang.MojangAPI; +import xyz.ineanto.nicko.placeholder.NickoExpansion; +import xyz.ineanto.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.storage.name.PlayerNameStore; import xyz.xenondevs.invui.gui.structure.Structure; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SimpleItem; @@ -115,7 +115,7 @@ public class NickoBukkit extends JavaPlugin { getServer().getPluginManager().registerEvents(new PlayerQuitListener(), this); } - getLogger().info("Nicko (Bukkit) has been enabled."); + getLogger().info("Nicko has been enabled."); } @Override diff --git a/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java b/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java similarity index 92% rename from src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java rename to src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java index 0e7d16f..15dcabf 100644 --- a/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java +++ b/src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java @@ -1,18 +1,18 @@ -package xyz.atnrch.nicko.anvil; +package xyz.ineanto.nicko.anvil; import net.wesjd.anvilgui.AnvilGUI; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.appearance.AppearanceManager; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.mojang.MojangUtils; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.appearance.AppearanceManager; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.mojang.MojangUtils; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; import java.util.Collections; import java.util.List; diff --git a/src/main/java/xyz/atnrch/nicko/appearance/ActionResult.java b/src/main/java/xyz/ineanto/nicko/appearance/ActionResult.java similarity index 94% rename from src/main/java/xyz/atnrch/nicko/appearance/ActionResult.java rename to src/main/java/xyz/ineanto/nicko/appearance/ActionResult.java index c527832..18984c1 100644 --- a/src/main/java/xyz/atnrch/nicko/appearance/ActionResult.java +++ b/src/main/java/xyz/ineanto/nicko/appearance/ActionResult.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.appearance; +package xyz.ineanto.nicko.appearance; public class ActionResult { private final String errorKey; diff --git a/src/main/java/xyz/atnrch/nicko/appearance/AppearanceManager.java b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java similarity index 95% rename from src/main/java/xyz/atnrch/nicko/appearance/AppearanceManager.java rename to src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java index 185beae..f18f8e9 100644 --- a/src/main/java/xyz/atnrch/nicko/appearance/AppearanceManager.java +++ b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.appearance; +package xyz.ineanto.nicko.appearance; import com.comphenix.protocol.utility.MinecraftVersion; import com.comphenix.protocol.wrappers.*; @@ -9,14 +9,14 @@ import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.mojang.MojangAPI; -import xyz.atnrch.nicko.mojang.MojangSkin; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; -import xyz.atnrch.nicko.storage.name.PlayerNameStore; -import xyz.atnrch.nicko.wrapper.*; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.mojang.MojangAPI; +import xyz.ineanto.nicko.mojang.MojangSkin; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.storage.name.PlayerNameStore; +import xyz.ineanto.nicko.wrapper.*; import java.io.IOException; import java.util.EnumSet; diff --git a/src/main/java/xyz/atnrch/nicko/command/NickoCommand.java b/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java similarity index 86% rename from src/main/java/xyz/atnrch/nicko/command/NickoCommand.java rename to src/main/java/xyz/ineanto/nicko/command/NickoCommand.java index 9d07c9b..bb23afd 100644 --- a/src/main/java/xyz/atnrch/nicko/command/NickoCommand.java +++ b/src/main/java/xyz/ineanto/nicko/command/NickoCommand.java @@ -1,13 +1,13 @@ -package xyz.atnrch.nicko.command; +package xyz.ineanto.nicko.command; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import xyz.atnrch.nicko.gui.HomeGUI; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.HomeGUI; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; public class NickoCommand implements CommandExecutor { @Override diff --git a/src/main/java/xyz/atnrch/nicko/config/Configuration.java b/src/main/java/xyz/ineanto/nicko/config/Configuration.java similarity index 97% rename from src/main/java/xyz/atnrch/nicko/config/Configuration.java rename to src/main/java/xyz/ineanto/nicko/config/Configuration.java index 9fdef97..048c6d2 100644 --- a/src/main/java/xyz/atnrch/nicko/config/Configuration.java +++ b/src/main/java/xyz/ineanto/nicko/config/Configuration.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.config; +package xyz.ineanto.nicko.config; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/xyz/atnrch/nicko/config/ConfigurationManager.java b/src/main/java/xyz/ineanto/nicko/config/ConfigurationManager.java similarity index 98% rename from src/main/java/xyz/atnrch/nicko/config/ConfigurationManager.java rename to src/main/java/xyz/ineanto/nicko/config/ConfigurationManager.java index f322668..0824ee5 100644 --- a/src/main/java/xyz/atnrch/nicko/config/ConfigurationManager.java +++ b/src/main/java/xyz/ineanto/nicko/config/ConfigurationManager.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.config; +package xyz.ineanto.nicko.config; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java b/src/main/java/xyz/ineanto/nicko/config/DataSourceConfiguration.java similarity index 97% rename from src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java rename to src/main/java/xyz/ineanto/nicko/config/DataSourceConfiguration.java index 20509df..6d00ceb 100644 --- a/src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java +++ b/src/main/java/xyz/ineanto/nicko/config/DataSourceConfiguration.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.config; +package xyz.ineanto.nicko.config; public class DataSourceConfiguration { private final boolean enabled; diff --git a/src/main/java/xyz/atnrch/nicko/config/DefaultDataSources.java b/src/main/java/xyz/ineanto/nicko/config/DefaultDataSources.java similarity index 92% rename from src/main/java/xyz/atnrch/nicko/config/DefaultDataSources.java rename to src/main/java/xyz/ineanto/nicko/config/DefaultDataSources.java index 076ff54..715bda2 100644 --- a/src/main/java/xyz/atnrch/nicko/config/DefaultDataSources.java +++ b/src/main/java/xyz/ineanto/nicko/config/DefaultDataSources.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.config; +package xyz.ineanto.nicko.config; public class DefaultDataSources { public static final DataSourceConfiguration REDIS_EMPTY = new DataSourceConfiguration(false, "127.0.0.1", 6379, "", ""); diff --git a/src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java b/src/main/java/xyz/ineanto/nicko/config/SQLDataSourceConfiguration.java similarity index 93% rename from src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java rename to src/main/java/xyz/ineanto/nicko/config/SQLDataSourceConfiguration.java index 7e62a1f..583981d 100644 --- a/src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java +++ b/src/main/java/xyz/ineanto/nicko/config/SQLDataSourceConfiguration.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.config; +package xyz.ineanto.nicko.config; public class SQLDataSourceConfiguration extends DataSourceConfiguration { private final boolean mariadb; diff --git a/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java b/src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java similarity index 83% rename from src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java rename to src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java index 4038733..c3b6925 100644 --- a/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java +++ b/src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.event; +package xyz.ineanto.nicko.event; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -6,14 +6,14 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.appearance.AppearanceManager; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; -import xyz.atnrch.nicko.storage.name.PlayerNameStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.appearance.AppearanceManager; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.storage.name.PlayerNameStore; import java.util.Optional; diff --git a/src/main/java/xyz/atnrch/nicko/event/PlayerQuitListener.java b/src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java similarity index 82% rename from src/main/java/xyz/atnrch/nicko/event/PlayerQuitListener.java rename to src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java index 6da9607..8c5647d 100644 --- a/src/main/java/xyz/atnrch/nicko/event/PlayerQuitListener.java +++ b/src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java @@ -1,7 +1,7 @@ -package xyz.atnrch.nicko.event; +package xyz.ineanto.nicko.event; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.appearance.ActionResult; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/xyz/atnrch/nicko/gui/AdminGUI.java b/src/main/java/xyz/ineanto/nicko/gui/AdminGUI.java similarity index 81% rename from src/main/java/xyz/atnrch/nicko/gui/AdminGUI.java rename to src/main/java/xyz/ineanto/nicko/gui/AdminGUI.java index 4d605ee..1828ec4 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/AdminGUI.java +++ b/src/main/java/xyz/ineanto/nicko/gui/AdminGUI.java @@ -1,12 +1,12 @@ -package xyz.atnrch.nicko.gui; +package xyz.ineanto.nicko.gui; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.gui.items.ItemDefaults; -import xyz.atnrch.nicko.gui.items.admin.ManageCacheItem; -import xyz.atnrch.nicko.gui.items.admin.ManagePlayerItem; -import xyz.atnrch.nicko.gui.items.common.GoBackItem; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.items.ItemDefaults; +import xyz.ineanto.nicko.gui.items.admin.ManageCacheItem; +import xyz.ineanto.nicko.gui.items.admin.ManagePlayerItem; +import xyz.ineanto.nicko.gui.items.common.GoBackItem; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.item.impl.SimpleItem; import xyz.xenondevs.invui.window.Window; diff --git a/src/main/java/xyz/atnrch/nicko/gui/CacheManagementGUI.java b/src/main/java/xyz/ineanto/nicko/gui/CacheManagementGUI.java similarity index 81% rename from src/main/java/xyz/atnrch/nicko/gui/CacheManagementGUI.java rename to src/main/java/xyz/ineanto/nicko/gui/CacheManagementGUI.java index 5c081f9..14d2812 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/CacheManagementGUI.java +++ b/src/main/java/xyz/ineanto/nicko/gui/CacheManagementGUI.java @@ -1,12 +1,12 @@ -package xyz.atnrch.nicko.gui; +package xyz.ineanto.nicko.gui; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.gui.items.admin.cache.CacheStatisticsItem; -import xyz.atnrch.nicko.gui.items.admin.cache.InvalidateCacheItem; -import xyz.atnrch.nicko.gui.items.admin.cache.InvalidateSkinItem; -import xyz.atnrch.nicko.gui.items.common.GoBackItem; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.items.admin.cache.CacheStatisticsItem; +import xyz.ineanto.nicko.gui.items.admin.cache.InvalidateCacheItem; +import xyz.ineanto.nicko.gui.items.admin.cache.InvalidateSkinItem; +import xyz.ineanto.nicko.gui.items.common.GoBackItem; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.window.Window; diff --git a/src/main/java/xyz/atnrch/nicko/gui/ChoiceGUI.java b/src/main/java/xyz/ineanto/nicko/gui/ChoiceGUI.java similarity index 81% rename from src/main/java/xyz/atnrch/nicko/gui/ChoiceGUI.java rename to src/main/java/xyz/ineanto/nicko/gui/ChoiceGUI.java index 90e31dd..3a2e045 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/ChoiceGUI.java +++ b/src/main/java/xyz/ineanto/nicko/gui/ChoiceGUI.java @@ -1,12 +1,12 @@ -package xyz.atnrch.nicko.gui; +package xyz.ineanto.nicko.gui; import org.bukkit.Material; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.gui.items.common.choice.CancelItem; -import xyz.atnrch.nicko.gui.items.common.choice.ChoiceCallback; -import xyz.atnrch.nicko.gui.items.common.choice.ConfirmItem; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.items.common.choice.CancelItem; +import xyz.ineanto.nicko.gui.items.common.choice.ChoiceCallback; +import xyz.ineanto.nicko.gui.items.common.choice.ConfirmItem; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SimpleItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/HomeGUI.java b/src/main/java/xyz/ineanto/nicko/gui/HomeGUI.java similarity index 79% rename from src/main/java/xyz/atnrch/nicko/gui/HomeGUI.java rename to src/main/java/xyz/ineanto/nicko/gui/HomeGUI.java index 9303f45..b0c8612 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/HomeGUI.java +++ b/src/main/java/xyz/ineanto/nicko/gui/HomeGUI.java @@ -1,15 +1,15 @@ -package xyz.atnrch.nicko.gui; +package xyz.ineanto.nicko.gui; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.gui.items.appearance.ChangeBothItem; -import xyz.atnrch.nicko.gui.items.appearance.ChangeNameItem; -import xyz.atnrch.nicko.gui.items.appearance.ChangeSkinItem; -import xyz.atnrch.nicko.gui.items.home.AdminAccessItem; -import xyz.atnrch.nicko.gui.items.home.ExitItem; -import xyz.atnrch.nicko.gui.items.home.ResetItem; -import xyz.atnrch.nicko.gui.items.home.SettingsAccessItem; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.items.appearance.ChangeBothItem; +import xyz.ineanto.nicko.gui.items.appearance.ChangeNameItem; +import xyz.ineanto.nicko.gui.items.appearance.ChangeSkinItem; +import xyz.ineanto.nicko.gui.items.home.AdminAccessItem; +import xyz.ineanto.nicko.gui.items.home.ExitItem; +import xyz.ineanto.nicko.gui.items.home.ResetItem; +import xyz.ineanto.nicko.gui.items.home.SettingsAccessItem; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.window.Window; diff --git a/src/main/java/xyz/atnrch/nicko/gui/InvalidateSkinGUI.java b/src/main/java/xyz/ineanto/nicko/gui/InvalidateSkinGUI.java similarity index 84% rename from src/main/java/xyz/atnrch/nicko/gui/InvalidateSkinGUI.java rename to src/main/java/xyz/ineanto/nicko/gui/InvalidateSkinGUI.java index f79842a..da49bc7 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/InvalidateSkinGUI.java +++ b/src/main/java/xyz/ineanto/nicko/gui/InvalidateSkinGUI.java @@ -1,17 +1,17 @@ -package xyz.atnrch.nicko.gui; +package xyz.ineanto.nicko.gui; -import xyz.atnrch.nicko.gui.items.common.GoBackItem; -import xyz.atnrch.nicko.gui.items.common.ScrollUpItem; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.mojang.MojangSkin; +import xyz.ineanto.nicko.gui.items.common.GoBackItem; +import xyz.ineanto.nicko.gui.items.common.ScrollUpItem; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.mojang.MojangSkin; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.gui.structure.Markers; import xyz.xenondevs.invui.item.Item; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.gui.items.admin.cache.CacheEntryItem; -import xyz.atnrch.nicko.gui.items.common.ScrollDownItem; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.gui.items.admin.cache.CacheEntryItem; +import xyz.ineanto.nicko.gui.items.common.ScrollDownItem; import org.bukkit.entity.Player; import xyz.xenondevs.invui.window.Window; diff --git a/src/main/java/xyz/atnrch/nicko/gui/PlayerCheckGUI.java b/src/main/java/xyz/ineanto/nicko/gui/PlayerCheckGUI.java similarity index 85% rename from src/main/java/xyz/atnrch/nicko/gui/PlayerCheckGUI.java rename to src/main/java/xyz/ineanto/nicko/gui/PlayerCheckGUI.java index 5326d6d..4775213 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/PlayerCheckGUI.java +++ b/src/main/java/xyz/ineanto/nicko/gui/PlayerCheckGUI.java @@ -1,14 +1,14 @@ -package xyz.atnrch.nicko.gui; +package xyz.ineanto.nicko.gui; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.gui.items.admin.check.PlayerInformationItem; -import xyz.atnrch.nicko.gui.items.common.GoBackItem; -import xyz.atnrch.nicko.gui.items.common.ScrollDownItem; -import xyz.atnrch.nicko.gui.items.common.ScrollUpItem; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.items.admin.check.PlayerInformationItem; +import xyz.ineanto.nicko.gui.items.common.GoBackItem; +import xyz.ineanto.nicko.gui.items.common.ScrollDownItem; +import xyz.ineanto.nicko.gui.items.common.ScrollUpItem; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.gui.structure.Markers; diff --git a/src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java b/src/main/java/xyz/ineanto/nicko/gui/SettingsGUI.java similarity index 82% rename from src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java rename to src/main/java/xyz/ineanto/nicko/gui/SettingsGUI.java index e44bbea..6086cad 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java +++ b/src/main/java/xyz/ineanto/nicko/gui/SettingsGUI.java @@ -1,12 +1,12 @@ -package xyz.atnrch.nicko.gui; +package xyz.ineanto.nicko.gui; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.gui.items.ItemDefaults; -import xyz.atnrch.nicko.gui.items.common.GoBackItem; -import xyz.atnrch.nicko.gui.items.settings.BungeeCordCyclingItem; -import xyz.atnrch.nicko.gui.items.settings.LanguageCyclingItem; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.items.ItemDefaults; +import xyz.ineanto.nicko.gui.items.common.GoBackItem; +import xyz.ineanto.nicko.gui.items.settings.BungeeCordCyclingItem; +import xyz.ineanto.nicko.gui.items.settings.LanguageCyclingItem; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.item.impl.SimpleItem; import xyz.xenondevs.invui.window.Window; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/ItemDefaults.java b/src/main/java/xyz/ineanto/nicko/gui/items/ItemDefaults.java similarity index 90% rename from src/main/java/xyz/atnrch/nicko/gui/items/ItemDefaults.java rename to src/main/java/xyz/ineanto/nicko/gui/items/ItemDefaults.java index 0f0864e..88ed8f5 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/ItemDefaults.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/ItemDefaults.java @@ -1,8 +1,8 @@ -package xyz.atnrch.nicko.gui.items; +package xyz.ineanto.nicko.gui.items; import org.bukkit.Material; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.AbstractItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/ManageCacheItem.java similarity index 87% rename from src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/admin/ManageCacheItem.java index a233745..81a48cb 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/ManageCacheItem.java @@ -1,15 +1,15 @@ -package xyz.atnrch.nicko.gui.items.admin; +package xyz.ineanto.nicko.gui.items.admin; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.gui.CacheManagementGUI; -import xyz.atnrch.nicko.gui.items.ItemDefaults; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.gui.CacheManagementGUI; +import xyz.ineanto.nicko.gui.items.ItemDefaults; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.impl.AsyncItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManagePlayerItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/ManagePlayerItem.java similarity index 81% rename from src/main/java/xyz/atnrch/nicko/gui/items/admin/ManagePlayerItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/admin/ManagePlayerItem.java index 947577f..ffe3732 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManagePlayerItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/ManagePlayerItem.java @@ -1,10 +1,10 @@ -package xyz.atnrch.nicko.gui.items.admin; +package xyz.ineanto.nicko.gui.items.admin; import org.bukkit.Material; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.gui.PlayerCheckGUI; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.PlayerCheckGUI; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheEntryItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheEntryItem.java similarity index 85% rename from src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheEntryItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheEntryItem.java index 2d6d194..28b9cf9 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheEntryItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheEntryItem.java @@ -1,18 +1,18 @@ -package xyz.atnrch.nicko.gui.items.admin.cache; +package xyz.ineanto.nicko.gui.items.admin.cache; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.gui.ChoiceGUI; -import xyz.atnrch.nicko.gui.InvalidateSkinGUI; -import xyz.atnrch.nicko.gui.items.ItemDefaults; -import xyz.atnrch.nicko.gui.items.common.choice.ChoiceCallback; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.mojang.MojangAPI; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.gui.ChoiceGUI; +import xyz.ineanto.nicko.gui.InvalidateSkinGUI; +import xyz.ineanto.nicko.gui.items.ItemDefaults; +import xyz.ineanto.nicko.gui.items.common.choice.ChoiceCallback; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.mojang.MojangAPI; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.impl.AsyncItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheStatisticsItem.java similarity index 82% rename from src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheStatisticsItem.java index 8df1db6..71feec5 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheStatisticsItem.java @@ -1,13 +1,13 @@ -package xyz.atnrch.nicko.gui.items.admin.cache; +package xyz.ineanto.nicko.gui.items.admin.cache; import com.google.common.cache.CacheStats; import com.google.common.cache.LoadingCache; import org.bukkit.Material; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.mojang.MojangSkin; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.mojang.MojangSkin; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java similarity index 88% rename from src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java index 40c7b89..b2196af 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.gui.items.admin.cache; +package xyz.ineanto.nicko.gui.items.admin.cache; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateSkinItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateSkinItem.java similarity index 84% rename from src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateSkinItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateSkinItem.java index 8f2d7d7..cbf690c 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateSkinItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateSkinItem.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.gui.items.admin.cache; +package xyz.ineanto.nicko.gui.items.admin.cache; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.gui.InvalidateSkinGUI; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.InvalidateSkinGUI; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/check/PlayerInformationItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/admin/check/PlayerInformationItem.java similarity index 86% rename from src/main/java/xyz/atnrch/nicko/gui/items/admin/check/PlayerInformationItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/admin/check/PlayerInformationItem.java index 0f2b6a6..429fa1b 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/check/PlayerInformationItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/admin/check/PlayerInformationItem.java @@ -1,14 +1,14 @@ -package xyz.atnrch.nicko.gui.items.admin.check; +package xyz.ineanto.nicko.gui.items.admin.check; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.gui.items.ItemDefaults; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.gui.items.ItemDefaults; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.impl.AsyncItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeBothItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java similarity index 85% rename from src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeBothItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java index 3863585..0308eef 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeBothItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.gui.items.appearance; +package xyz.ineanto.nicko.gui.items.appearance; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.anvil.AnvilManager; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.anvil.AnvilManager; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java similarity index 85% rename from src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java index c553ec6..0f83859 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.gui.items.appearance; +package xyz.ineanto.nicko.gui.items.appearance; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.anvil.AnvilManager; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.anvil.AnvilManager; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java similarity index 84% rename from src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java index 91c9404..7e6e865 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java @@ -1,12 +1,12 @@ -package xyz.atnrch.nicko.gui.items.appearance; +package xyz.ineanto.nicko.gui.items.appearance; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.anvil.AnvilManager; -import xyz.atnrch.nicko.gui.items.ItemDefaults; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.anvil.AnvilManager; +import xyz.ineanto.nicko.gui.items.ItemDefaults; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.util.MojangApiUtils; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/common/GoBackItem.java similarity index 87% rename from src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/common/GoBackItem.java index 16df2d5..afd1e3d 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/common/GoBackItem.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.gui.items.common; +package xyz.ineanto.nicko.gui.items.common; import org.bukkit.Material; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollDownItem.java similarity index 83% rename from src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollDownItem.java index 9e6f636..b9c382c 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollDownItem.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.gui.items.common; +package xyz.ineanto.nicko.gui.items.common; import org.bukkit.Material; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.ItemTranslation; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.ItemTranslation; import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.builder.ItemBuilder; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollUpItem.java similarity index 82% rename from src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollUpItem.java index 06e457d..9aedd45 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollUpItem.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.gui.items.common; +package xyz.ineanto.nicko.gui.items.common; import org.bukkit.Material; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.ItemTranslation; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.ItemTranslation; import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.builder.ItemBuilder; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/choice/CancelItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/common/choice/CancelItem.java similarity index 86% rename from src/main/java/xyz/atnrch/nicko/gui/items/common/choice/CancelItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/common/choice/CancelItem.java index ee9965a..257b2ae 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/common/choice/CancelItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/common/choice/CancelItem.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.gui.items.common.choice; +package xyz.ineanto.nicko.gui.items.common.choice; import org.bukkit.Material; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ChoiceCallback.java b/src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ChoiceCallback.java similarity index 61% rename from src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ChoiceCallback.java rename to src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ChoiceCallback.java index e1e3f84..ebe70fa 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ChoiceCallback.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ChoiceCallback.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.gui.items.common.choice; +package xyz.ineanto.nicko.gui.items.common.choice; public interface ChoiceCallback { void onConfirm(); diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ConfirmItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ConfirmItem.java similarity index 86% rename from src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ConfirmItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ConfirmItem.java index 3116706..397b839 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ConfirmItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ConfirmItem.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.gui.items.common.choice; +package xyz.ineanto.nicko.gui.items.common.choice; import org.bukkit.Material; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/home/AdminAccessItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/AdminAccessItem.java similarity index 85% rename from src/main/java/xyz/atnrch/nicko/gui/items/home/AdminAccessItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/home/AdminAccessItem.java index 590075a..a0b0873 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/home/AdminAccessItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/AdminAccessItem.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.gui.items.home; +package xyz.ineanto.nicko.gui.items.home; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.gui.AdminGUI; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.AdminGUI; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/ExitItem.java similarity index 84% rename from src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/home/ExitItem.java index 8e11b3d..c78a230 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/ExitItem.java @@ -1,11 +1,10 @@ -package xyz.atnrch.nicko.gui.items.home; +package xyz.ineanto.nicko.gui.items.home; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.ItemTranslation; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java similarity index 89% rename from src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java index a717914..c1c4523 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java @@ -1,12 +1,12 @@ -package xyz.atnrch.nicko.gui.items.home; +package xyz.ineanto.nicko.gui.items.home; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.appearance.AppearanceManager; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.appearance.AppearanceManager; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.profile.NickoProfile; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/home/SettingsAccessItem.java similarity index 85% rename from src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/home/SettingsAccessItem.java index aa4630e..06aa368 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/home/SettingsAccessItem.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.gui.items.home; +package xyz.ineanto.nicko.gui.items.home; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import xyz.atnrch.nicko.gui.SettingsGUI; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.gui.SettingsGUI; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.SuppliedItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/settings/BungeeCordCyclingItem.java similarity index 88% rename from src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/settings/BungeeCordCyclingItem.java index c644d3b..e62a7d0 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/settings/BungeeCordCyclingItem.java @@ -1,14 +1,14 @@ -package xyz.atnrch.nicko.gui.items.settings; +package xyz.ineanto.nicko.gui.items.settings; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.ItemTranslation; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.ItemTranslation; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.AbstractItem; diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java b/src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java similarity index 89% rename from src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java rename to src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java index 8024244..3d6fc7a 100644 --- a/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java +++ b/src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java @@ -1,16 +1,16 @@ -package xyz.atnrch.nicko.gui.items.settings; +package xyz.ineanto.nicko.gui.items.settings; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.gui.SettingsGUI; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.ItemTranslation; -import xyz.atnrch.nicko.i18n.Locale; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.gui.SettingsGUI; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.ItemTranslation; +import xyz.ineanto.nicko.i18n.Locale; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.impl.AbstractItem; diff --git a/src/main/java/xyz/atnrch/nicko/i18n/I18N.java b/src/main/java/xyz/ineanto/nicko/i18n/I18N.java similarity index 97% rename from src/main/java/xyz/atnrch/nicko/i18n/I18N.java rename to src/main/java/xyz/ineanto/nicko/i18n/I18N.java index ed4bd53..28cc27a 100644 --- a/src/main/java/xyz/atnrch/nicko/i18n/I18N.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/I18N.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.i18n; +package xyz.ineanto.nicko.i18n; import com.github.jsixface.YamlConfig; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.profile.NickoProfile; import xyz.xenondevs.invui.item.builder.AbstractItemBuilder; import java.io.InputStream; diff --git a/src/main/java/xyz/atnrch/nicko/i18n/I18NDict.java b/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java similarity index 99% rename from src/main/java/xyz/atnrch/nicko/i18n/I18NDict.java rename to src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java index 54b2d8c..d80c9ff 100644 --- a/src/main/java/xyz/atnrch/nicko/i18n/I18NDict.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.i18n; +package xyz.ineanto.nicko.i18n; public class I18NDict { public static class Error { diff --git a/src/main/java/xyz/atnrch/nicko/i18n/ItemTranslation.java b/src/main/java/xyz/ineanto/nicko/i18n/ItemTranslation.java similarity index 92% rename from src/main/java/xyz/atnrch/nicko/i18n/ItemTranslation.java rename to src/main/java/xyz/ineanto/nicko/i18n/ItemTranslation.java index 035724e..3d07aad 100644 --- a/src/main/java/xyz/atnrch/nicko/i18n/ItemTranslation.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/ItemTranslation.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.i18n; +package xyz.ineanto.nicko.i18n; import java.util.ArrayList; diff --git a/src/main/java/xyz/atnrch/nicko/i18n/Locale.java b/src/main/java/xyz/ineanto/nicko/i18n/Locale.java similarity index 95% rename from src/main/java/xyz/atnrch/nicko/i18n/Locale.java rename to src/main/java/xyz/ineanto/nicko/i18n/Locale.java index 607b54c..8821142 100644 --- a/src/main/java/xyz/atnrch/nicko/i18n/Locale.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/Locale.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.i18n; +package xyz.ineanto.nicko.i18n; import java.io.Serializable; diff --git a/src/main/java/xyz/atnrch/nicko/i18n/LocaleFileManager.java b/src/main/java/xyz/ineanto/nicko/i18n/LocaleFileManager.java similarity index 96% rename from src/main/java/xyz/atnrch/nicko/i18n/LocaleFileManager.java rename to src/main/java/xyz/ineanto/nicko/i18n/LocaleFileManager.java index 4ffb155..31518e5 100644 --- a/src/main/java/xyz/atnrch/nicko/i18n/LocaleFileManager.java +++ b/src/main/java/xyz/ineanto/nicko/i18n/LocaleFileManager.java @@ -1,7 +1,7 @@ -package xyz.atnrch.nicko.i18n; +package xyz.ineanto.nicko.i18n; import com.github.jsixface.YamlConfig; -import xyz.atnrch.nicko.NickoBukkit; +import xyz.ineanto.nicko.NickoBukkit; import xyz.xenondevs.invui.util.IOUtils; import java.io.*; diff --git a/src/main/java/xyz/atnrch/nicko/mojang/MojangAPI.java b/src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java similarity index 99% rename from src/main/java/xyz/atnrch/nicko/mojang/MojangAPI.java rename to src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java index 5630015..55144fa 100644 --- a/src/main/java/xyz/atnrch/nicko/mojang/MojangAPI.java +++ b/src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.mojang; +package xyz.ineanto.nicko.mojang; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/src/main/java/xyz/atnrch/nicko/mojang/MojangSkin.java b/src/main/java/xyz/ineanto/nicko/mojang/MojangSkin.java similarity index 95% rename from src/main/java/xyz/atnrch/nicko/mojang/MojangSkin.java rename to src/main/java/xyz/ineanto/nicko/mojang/MojangSkin.java index 2033147..bf8f342 100644 --- a/src/main/java/xyz/atnrch/nicko/mojang/MojangSkin.java +++ b/src/main/java/xyz/ineanto/nicko/mojang/MojangSkin.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.mojang; +package xyz.ineanto.nicko.mojang; import com.google.gson.JsonObject; diff --git a/src/main/java/xyz/atnrch/nicko/mojang/MojangUtils.java b/src/main/java/xyz/ineanto/nicko/mojang/MojangUtils.java similarity index 96% rename from src/main/java/xyz/atnrch/nicko/mojang/MojangUtils.java rename to src/main/java/xyz/ineanto/nicko/mojang/MojangUtils.java index 6845392..6ed3606 100644 --- a/src/main/java/xyz/atnrch/nicko/mojang/MojangUtils.java +++ b/src/main/java/xyz/ineanto/nicko/mojang/MojangUtils.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.mojang; +package xyz.ineanto.nicko.mojang; import java.util.UUID; import java.util.regex.Pattern; diff --git a/src/main/java/xyz/atnrch/nicko/placeholder/NickoExpansion.java b/src/main/java/xyz/ineanto/nicko/placeholder/NickoExpansion.java similarity index 94% rename from src/main/java/xyz/atnrch/nicko/placeholder/NickoExpansion.java rename to src/main/java/xyz/ineanto/nicko/placeholder/NickoExpansion.java index 1754509..03c6839 100644 --- a/src/main/java/xyz/atnrch/nicko/placeholder/NickoExpansion.java +++ b/src/main/java/xyz/ineanto/nicko/placeholder/NickoExpansion.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.placeholder; +package xyz.ineanto.nicko.placeholder; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.profile.NickoProfile; import java.util.Optional; diff --git a/src/main/java/xyz/atnrch/nicko/profile/NickoProfile.java b/src/main/java/xyz/ineanto/nicko/profile/NickoProfile.java similarity index 72% rename from src/main/java/xyz/atnrch/nicko/profile/NickoProfile.java rename to src/main/java/xyz/ineanto/nicko/profile/NickoProfile.java index 05a544b..0dd8b6c 100644 --- a/src/main/java/xyz/atnrch/nicko/profile/NickoProfile.java +++ b/src/main/java/xyz/ineanto/nicko/profile/NickoProfile.java @@ -1,10 +1,9 @@ -package xyz.atnrch.nicko.profile; +package xyz.ineanto.nicko.profile; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.i18n.Locale; -import xyz.atnrch.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.i18n.Locale; +import xyz.ineanto.nicko.storage.PlayerDataStore; import java.util.Optional; import java.util.UUID; @@ -13,8 +12,6 @@ public class NickoProfile implements Cloneable { public static final PlayerDataStore dataStore = NickoBukkit.getInstance().getDataStore(); public static final NickoProfile EMPTY_PROFILE = new NickoProfile(null, null, Locale.ENGLISH, true); - private transient final Player player; - private String name; private String skin; private Locale locale; @@ -25,23 +22,6 @@ public class NickoProfile implements Cloneable { this.skin = skin; this.locale = locale; this.bungeecordTransfer = bungeecordTransfer; - this.player = null; - } - - public NickoProfile(Player player, String name, String skin, Locale locale, boolean bungeecordTransfer) { - this.player = player; - this.name = name; - this.skin = skin; - this.locale = locale; - this.bungeecordTransfer = bungeecordTransfer; - } - - public NickoProfile(UUID uuid, String name, String skin, Locale locale, boolean bungeecordTransfer) { - this.name = name; - this.skin = skin; - this.locale = locale; - this.bungeecordTransfer = bungeecordTransfer; - this.player = Bukkit.getPlayer(uuid); } public static Optional get(Player player) { diff --git a/src/main/java/xyz/atnrch/nicko/storage/Cache.java b/src/main/java/xyz/ineanto/nicko/storage/Cache.java similarity index 80% rename from src/main/java/xyz/atnrch/nicko/storage/Cache.java rename to src/main/java/xyz/ineanto/nicko/storage/Cache.java index e771324..1b2616d 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/Cache.java +++ b/src/main/java/xyz/ineanto/nicko/storage/Cache.java @@ -1,7 +1,7 @@ -package xyz.atnrch.nicko.storage; +package xyz.ineanto.nicko.storage; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.profile.NickoProfile; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/xyz/atnrch/nicko/storage/CacheProvider.java b/src/main/java/xyz/ineanto/nicko/storage/CacheProvider.java similarity index 69% rename from src/main/java/xyz/atnrch/nicko/storage/CacheProvider.java rename to src/main/java/xyz/ineanto/nicko/storage/CacheProvider.java index e0f19cd..3597ac5 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/CacheProvider.java +++ b/src/main/java/xyz/ineanto/nicko/storage/CacheProvider.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.storage; +package xyz.ineanto.nicko.storage; public interface CacheProvider { boolean init(); diff --git a/src/main/java/xyz/atnrch/nicko/storage/PlayerDataStore.java b/src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java similarity index 84% rename from src/main/java/xyz/atnrch/nicko/storage/PlayerDataStore.java rename to src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java index bf7c719..56e151c 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/PlayerDataStore.java +++ b/src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java @@ -1,17 +1,17 @@ -package xyz.atnrch.nicko.storage; +package xyz.ineanto.nicko.storage; import org.bukkit.entity.Player; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.mojang.MojangAPI; -import xyz.atnrch.nicko.mojang.MojangUtils; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.json.JSONStorage; -import xyz.atnrch.nicko.storage.map.MapCache; -import xyz.atnrch.nicko.storage.mariadb.MariaDBStorage; -import xyz.atnrch.nicko.storage.mysql.MySQLStorage; -import xyz.atnrch.nicko.storage.redis.RedisCache; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.mojang.MojangAPI; +import xyz.ineanto.nicko.mojang.MojangUtils; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.json.JSONStorage; +import xyz.ineanto.nicko.storage.map.MapCache; +import xyz.ineanto.nicko.storage.mariadb.MariaDBStorage; +import xyz.ineanto.nicko.storage.mysql.MySQLStorage; +import xyz.ineanto.nicko.storage.redis.RedisCache; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/xyz/atnrch/nicko/storage/Storage.java b/src/main/java/xyz/ineanto/nicko/storage/Storage.java similarity index 80% rename from src/main/java/xyz/atnrch/nicko/storage/Storage.java rename to src/main/java/xyz/ineanto/nicko/storage/Storage.java index d9c6743..9cac04a 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/Storage.java +++ b/src/main/java/xyz/ineanto/nicko/storage/Storage.java @@ -1,7 +1,7 @@ -package xyz.atnrch.nicko.storage; +package xyz.ineanto.nicko.storage; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.profile.NickoProfile; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/xyz/atnrch/nicko/storage/StorageProvider.java b/src/main/java/xyz/ineanto/nicko/storage/StorageProvider.java similarity index 69% rename from src/main/java/xyz/atnrch/nicko/storage/StorageProvider.java rename to src/main/java/xyz/ineanto/nicko/storage/StorageProvider.java index c12b930..3981771 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/StorageProvider.java +++ b/src/main/java/xyz/ineanto/nicko/storage/StorageProvider.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.storage; +package xyz.ineanto.nicko.storage; public interface StorageProvider { boolean init(); diff --git a/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorage.java b/src/main/java/xyz/ineanto/nicko/storage/json/JSONStorage.java similarity index 90% rename from src/main/java/xyz/atnrch/nicko/storage/json/JSONStorage.java rename to src/main/java/xyz/ineanto/nicko/storage/json/JSONStorage.java index 747a739..1bf1837 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorage.java +++ b/src/main/java/xyz/ineanto/nicko/storage/json/JSONStorage.java @@ -1,13 +1,13 @@ -package xyz.atnrch.nicko.storage.json; +package xyz.ineanto.nicko.storage.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.storage.Storage; -import xyz.atnrch.nicko.storage.StorageProvider; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.storage.Storage; +import xyz.ineanto.nicko.storage.StorageProvider; import java.io.*; import java.util.Optional; diff --git a/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorageProvider.java b/src/main/java/xyz/ineanto/nicko/storage/json/JSONStorageProvider.java similarity index 80% rename from src/main/java/xyz/atnrch/nicko/storage/json/JSONStorageProvider.java rename to src/main/java/xyz/ineanto/nicko/storage/json/JSONStorageProvider.java index 2d58096..c2976f3 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/json/JSONStorageProvider.java +++ b/src/main/java/xyz/ineanto/nicko/storage/json/JSONStorageProvider.java @@ -1,6 +1,6 @@ -package xyz.atnrch.nicko.storage.json; +package xyz.ineanto.nicko.storage.json; -import xyz.atnrch.nicko.storage.StorageProvider; +import xyz.ineanto.nicko.storage.StorageProvider; import java.io.File; diff --git a/src/main/java/xyz/atnrch/nicko/storage/map/MapCache.java b/src/main/java/xyz/ineanto/nicko/storage/map/MapCache.java similarity index 84% rename from src/main/java/xyz/atnrch/nicko/storage/map/MapCache.java rename to src/main/java/xyz/ineanto/nicko/storage/map/MapCache.java index c573457..ebc3a88 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/map/MapCache.java +++ b/src/main/java/xyz/ineanto/nicko/storage/map/MapCache.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.storage.map; +package xyz.ineanto.nicko.storage.map; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.Cache; -import xyz.atnrch.nicko.storage.CacheProvider; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.Cache; +import xyz.ineanto.nicko.storage.CacheProvider; import java.util.HashMap; import java.util.Optional; diff --git a/src/main/java/xyz/atnrch/nicko/storage/map/MapCacheProvider.java b/src/main/java/xyz/ineanto/nicko/storage/map/MapCacheProvider.java similarity index 77% rename from src/main/java/xyz/atnrch/nicko/storage/map/MapCacheProvider.java rename to src/main/java/xyz/ineanto/nicko/storage/map/MapCacheProvider.java index 3a83100..bfb85bd 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/map/MapCacheProvider.java +++ b/src/main/java/xyz/ineanto/nicko/storage/map/MapCacheProvider.java @@ -1,7 +1,7 @@ -package xyz.atnrch.nicko.storage.map; +package xyz.ineanto.nicko.storage.map; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.CacheProvider; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.CacheProvider; import java.util.HashMap; import java.util.UUID; diff --git a/src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorage.java b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java similarity index 94% rename from src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorage.java rename to src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java index 6908612..57374d7 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorage.java +++ b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.storage.mariadb; +package xyz.ineanto.nicko.storage.mariadb; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.Locale; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.Storage; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.Locale; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.Storage; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorageProvider.java b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorageProvider.java similarity index 93% rename from src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorageProvider.java rename to src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorageProvider.java index 0c44ec5..ba3e37a 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorageProvider.java +++ b/src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorageProvider.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.storage.mariadb; +package xyz.ineanto.nicko.storage.mariadb; import org.mariadb.jdbc.MariaDbDataSource; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; -import xyz.atnrch.nicko.storage.StorageProvider; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DataSourceConfiguration; +import xyz.ineanto.nicko.storage.StorageProvider; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorage.java b/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java similarity index 94% rename from src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorage.java rename to src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java index fb58b04..7b43630 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorage.java +++ b/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java @@ -1,11 +1,11 @@ -package xyz.atnrch.nicko.storage.mysql; +package xyz.ineanto.nicko.storage.mysql; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.Locale; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.Storage; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.Locale; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.Storage; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorageProvider.java b/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorageProvider.java similarity index 93% rename from src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorageProvider.java rename to src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorageProvider.java index 0df0978..2211189 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorageProvider.java +++ b/src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorageProvider.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.storage.mysql; +package xyz.ineanto.nicko.storage.mysql; import com.mysql.cj.jdbc.MysqlDataSource; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; -import xyz.atnrch.nicko.storage.StorageProvider; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DataSourceConfiguration; +import xyz.ineanto.nicko.storage.StorageProvider; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/xyz/atnrch/nicko/storage/name/PlayerNameStore.java b/src/main/java/xyz/ineanto/nicko/storage/name/PlayerNameStore.java similarity index 94% rename from src/main/java/xyz/atnrch/nicko/storage/name/PlayerNameStore.java rename to src/main/java/xyz/ineanto/nicko/storage/name/PlayerNameStore.java index 6dccd32..1e90b11 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/name/PlayerNameStore.java +++ b/src/main/java/xyz/ineanto/nicko/storage/name/PlayerNameStore.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.storage.name; +package xyz.ineanto.nicko.storage.name; import org.bukkit.entity.Player; diff --git a/src/main/java/xyz/atnrch/nicko/storage/redis/RedisCache.java b/src/main/java/xyz/ineanto/nicko/storage/redis/RedisCache.java similarity index 87% rename from src/main/java/xyz/atnrch/nicko/storage/redis/RedisCache.java rename to src/main/java/xyz/ineanto/nicko/storage/redis/RedisCache.java index 96bc57a..c768538 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/redis/RedisCache.java +++ b/src/main/java/xyz/ineanto/nicko/storage/redis/RedisCache.java @@ -1,13 +1,13 @@ -package xyz.atnrch.nicko.storage.redis; +package xyz.ineanto.nicko.storage.redis; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import redis.clients.jedis.Jedis; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.Cache; -import xyz.atnrch.nicko.storage.CacheProvider; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.Cache; +import xyz.ineanto.nicko.storage.CacheProvider; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/xyz/atnrch/nicko/storage/redis/RedisCacheProvider.java b/src/main/java/xyz/ineanto/nicko/storage/redis/RedisCacheProvider.java similarity index 83% rename from src/main/java/xyz/atnrch/nicko/storage/redis/RedisCacheProvider.java rename to src/main/java/xyz/ineanto/nicko/storage/redis/RedisCacheProvider.java index f4d5afe..7408326 100644 --- a/src/main/java/xyz/atnrch/nicko/storage/redis/RedisCacheProvider.java +++ b/src/main/java/xyz/ineanto/nicko/storage/redis/RedisCacheProvider.java @@ -1,9 +1,9 @@ -package xyz.atnrch.nicko.storage.redis; +package xyz.ineanto.nicko.storage.redis; import redis.clients.jedis.exceptions.JedisConnectionException; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; -import xyz.atnrch.nicko.storage.CacheProvider; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DataSourceConfiguration; +import xyz.ineanto.nicko.storage.CacheProvider; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; diff --git a/src/main/java/xyz/atnrch/nicko/wrapper/AbstractPacket.java b/src/main/java/xyz/ineanto/nicko/wrapper/AbstractPacket.java similarity index 98% rename from src/main/java/xyz/atnrch/nicko/wrapper/AbstractPacket.java rename to src/main/java/xyz/ineanto/nicko/wrapper/AbstractPacket.java index c1ff601..57b8598 100644 --- a/src/main/java/xyz/atnrch/nicko/wrapper/AbstractPacket.java +++ b/src/main/java/xyz/ineanto/nicko/wrapper/AbstractPacket.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package xyz.atnrch.nicko.wrapper; +package xyz.ineanto.nicko.wrapper; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolLibrary; diff --git a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerEntityDestroy.java b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerEntityDestroy.java similarity index 97% rename from src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerEntityDestroy.java rename to src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerEntityDestroy.java index 2699619..1af54f7 100644 --- a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerEntityDestroy.java +++ b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerEntityDestroy.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.wrapper; +package xyz.ineanto.nicko.wrapper; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; diff --git a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerRespawn.java b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerRespawn.java similarity index 99% rename from src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerRespawn.java rename to src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerRespawn.java index 3d0ed53..9082ad1 100644 --- a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerRespawn.java +++ b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerRespawn.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.wrapper; +package xyz.ineanto.nicko.wrapper; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.InternalStructure; diff --git a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerSpawnEntity.java b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerSpawnEntity.java similarity index 98% rename from src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerSpawnEntity.java rename to src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerSpawnEntity.java index 9e1b8fd..7f09a16 100644 --- a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerSpawnEntity.java +++ b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerSpawnEntity.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.wrapper; +package xyz.ineanto.nicko.wrapper; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; diff --git a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfo.java b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfo.java similarity index 97% rename from src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfo.java rename to src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfo.java index ccf7584..3347f98 100644 --- a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfo.java +++ b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfo.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.wrapper; +package xyz.ineanto.nicko.wrapper; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; diff --git a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java similarity index 95% rename from src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java rename to src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java index 0f3f355..a619249 100644 --- a/src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java +++ b/src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java @@ -1,4 +1,4 @@ -package xyz.atnrch.nicko.wrapper; +package xyz.ineanto.nicko.wrapper; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 15e88d5..6fc9aa8 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Nicko -main: xyz.atnrch.nicko.NickoBukkit -version: 1.0-SNAPSHOT +main: xyz.ineanto.nicko.NickoBukkit +version: 1.0-RC1 author: Ineanto description: "The feature packed, next generation disguise plugin for Minecraft." api-version: 1.14 diff --git a/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java b/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java index a0562e1..94e508f 100644 --- a/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java @@ -5,9 +5,9 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DefaultDataSources; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DefaultDataSources; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java b/src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java index 647740a..b334534 100644 --- a/src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java @@ -5,8 +5,8 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.config.Configuration; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.config.Configuration; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/xyz/atnrch/nicko/test/i18n/ItemTranslationTest.java b/src/test/java/xyz/atnrch/nicko/test/i18n/ItemTranslationTest.java index fc3a1b8..acc5c1c 100644 --- a/src/test/java/xyz/atnrch/nicko/test/i18n/ItemTranslationTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/i18n/ItemTranslationTest.java @@ -6,13 +6,13 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DefaultDataSources; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.ItemTranslation; -import xyz.atnrch.nicko.i18n.Locale; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DefaultDataSources; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.ItemTranslation; +import xyz.ineanto.nicko.i18n.Locale; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/xyz/atnrch/nicko/test/i18n/TranslationTest.java b/src/test/java/xyz/atnrch/nicko/test/i18n/TranslationTest.java index b8abd0b..dc4d7f4 100644 --- a/src/test/java/xyz/atnrch/nicko/test/i18n/TranslationTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/i18n/TranslationTest.java @@ -6,13 +6,12 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; -import xyz.atnrch.nicko.config.DefaultDataSources; -import xyz.atnrch.nicko.i18n.I18N; -import xyz.atnrch.nicko.i18n.I18NDict; -import xyz.atnrch.nicko.i18n.Locale; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DefaultDataSources; +import xyz.ineanto.nicko.i18n.I18N; +import xyz.ineanto.nicko.i18n.I18NDict; +import xyz.ineanto.nicko.i18n.Locale; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java index 13d2195..da8b09a 100644 --- a/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java @@ -7,12 +7,12 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DefaultDataSources; -import xyz.atnrch.nicko.config.SQLDataSourceConfiguration; -import xyz.atnrch.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DefaultDataSources; +import xyz.ineanto.nicko.config.SQLDataSourceConfiguration; +import xyz.ineanto.nicko.profile.NickoProfile; import java.util.Optional; diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java index 9defabb..7539591 100644 --- a/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java @@ -2,14 +2,14 @@ package xyz.atnrch.nicko.test.storage; import be.seeseemelk.mockbukkit.MockBukkit; import org.junit.jupiter.api.*; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DefaultDataSources; -import xyz.atnrch.nicko.config.SQLDataSourceConfiguration; -import xyz.atnrch.nicko.i18n.Locale; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DefaultDataSources; +import xyz.ineanto.nicko.config.SQLDataSourceConfiguration; +import xyz.ineanto.nicko.i18n.Locale; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; import java.util.Optional; import java.util.UUID; diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/map/MapCacheTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/map/MapCacheTest.java index a46bd0a..3f972bb 100644 --- a/src/test/java/xyz/atnrch/nicko/test/storage/map/MapCacheTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/storage/map/MapCacheTest.java @@ -3,11 +3,10 @@ package xyz.atnrch.nicko.test.storage.map; import be.seeseemelk.mockbukkit.MockBukkit; import be.seeseemelk.mockbukkit.ServerMock; import be.seeseemelk.mockbukkit.entity.PlayerMock; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; -import xyz.atnrch.nicko.config.DefaultDataSources; -import xyz.atnrch.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DefaultDataSources; +import xyz.ineanto.nicko.profile.NickoProfile; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/redis/RedisCacheTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/redis/RedisCacheTest.java index 19006de..fe49c52 100644 --- a/src/test/java/xyz/atnrch/nicko/test/storage/redis/RedisCacheTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/storage/redis/RedisCacheTest.java @@ -4,13 +4,13 @@ import be.seeseemelk.mockbukkit.MockBukkit; import be.seeseemelk.mockbukkit.ServerMock; import be.seeseemelk.mockbukkit.entity.PlayerMock; import org.junit.jupiter.api.*; -import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.appearance.ActionResult; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; -import xyz.atnrch.nicko.config.DefaultDataSources; -import xyz.atnrch.nicko.profile.NickoProfile; -import xyz.atnrch.nicko.storage.PlayerDataStore; +import xyz.ineanto.nicko.NickoBukkit; +import xyz.ineanto.nicko.appearance.ActionResult; +import xyz.ineanto.nicko.config.Configuration; +import xyz.ineanto.nicko.config.DataSourceConfiguration; +import xyz.ineanto.nicko.config.DefaultDataSources; +import xyz.ineanto.nicko.profile.NickoProfile; +import xyz.ineanto.nicko.storage.PlayerDataStore; import java.util.Optional;