ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

refactor: cleanup for rc1

Browse source
This commit is contained in:
ineanto 2023-12-06 19:35:34 +01:00
parent 17345a6b5f
commit 37e6f031a6
84 changed files with 353 additions and 376 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>xyz.atnrch</groupId> <groupId>xyz.ineanto</groupId>
<artifactId>nicko</artifactId> <artifactId>nicko</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-RC1</version>
<name>Nicko</name> <name>Nicko</name>
<properties> <properties>

26
src/main/java/xyz/atnrch/nicko/NickoBukkit.java → src/main/java/xyz/ineanto/nicko/NickoBukkit.java
View file

@ -1,21 +1,21 @@
package xyz.atnrch.nicko; package xyz.ineanto.nicko;
import com.comphenix.protocol.utility.MinecraftVersion; import com.comphenix.protocol.utility.MinecraftVersion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import xyz.atnrch.nicko.command.NickoCommand; import xyz.ineanto.nicko.command.NickoCommand;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.ConfigurationManager; import xyz.ineanto.nicko.config.ConfigurationManager;
import xyz.atnrch.nicko.event.PlayerJoinListener; import xyz.ineanto.nicko.event.PlayerJoinListener;
import xyz.atnrch.nicko.event.PlayerQuitListener; import xyz.ineanto.nicko.event.PlayerQuitListener;
import xyz.atnrch.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.atnrch.nicko.i18n.LocaleFileManager; import xyz.ineanto.nicko.i18n.LocaleFileManager;
import xyz.atnrch.nicko.mojang.MojangAPI; import xyz.ineanto.nicko.mojang.MojangAPI;
import xyz.atnrch.nicko.placeholder.NickoExpansion; import xyz.ineanto.nicko.placeholder.NickoExpansion;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.atnrch.nicko.storage.name.PlayerNameStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore;
import xyz.xenondevs.invui.gui.structure.Structure; import xyz.xenondevs.invui.gui.structure.Structure;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SimpleItem; import xyz.xenondevs.invui.item.impl.SimpleItem;
@ -115,7 +115,7 @@ public class NickoBukkit extends JavaPlugin {
getServer().getPluginManager().registerEvents(new PlayerQuitListener(), this); getServer().getPluginManager().registerEvents(new PlayerQuitListener(), this);
} }
getLogger().info("Nicko (Bukkit) has been enabled."); getLogger().info("Nicko has been enabled.");
} }
@Override @Override

18
src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java → src/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java
View file

@ -1,18 +1,18 @@
package xyz.atnrch.nicko.anvil; package xyz.ineanto.nicko.anvil;
import net.wesjd.anvilgui.AnvilGUI; import net.wesjd.anvilgui.AnvilGUI;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.appearance.AppearanceManager; import xyz.ineanto.nicko.appearance.AppearanceManager;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.mojang.MojangUtils; import xyz.ineanto.nicko.mojang.MojangUtils;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

2
src/main/java/xyz/atnrch/nicko/appearance/ActionResult.java → src/main/java/xyz/ineanto/nicko/appearance/ActionResult.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.appearance; package xyz.ineanto.nicko.appearance;
public class ActionResult { public class ActionResult {
private final String errorKey; private final String errorKey;

18
src/main/java/xyz/atnrch/nicko/appearance/AppearanceManager.java → src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.appearance; package xyz.ineanto.nicko.appearance;
import com.comphenix.protocol.utility.MinecraftVersion; import com.comphenix.protocol.utility.MinecraftVersion;
import com.comphenix.protocol.wrappers.*; import com.comphenix.protocol.wrappers.*;
@ -9,14 +9,14 @@ import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.mojang.MojangAPI; import xyz.ineanto.nicko.mojang.MojangAPI;
import xyz.atnrch.nicko.mojang.MojangSkin; import xyz.ineanto.nicko.mojang.MojangSkin;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.atnrch.nicko.storage.name.PlayerNameStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore;
import xyz.atnrch.nicko.wrapper.*; import xyz.ineanto.nicko.wrapper.*;
import java.io.IOException; import java.io.IOException;
import java.util.EnumSet; import java.util.EnumSet;

8
src/main/java/xyz/atnrch/nicko/command/NickoCommand.java → src/main/java/xyz/ineanto/nicko/command/NickoCommand.java
View file

@ -1,13 +1,13 @@
package xyz.atnrch.nicko.command; package xyz.ineanto.nicko.command;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import xyz.atnrch.nicko.gui.HomeGUI; import xyz.ineanto.nicko.gui.HomeGUI;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
public class NickoCommand implements CommandExecutor { public class NickoCommand implements CommandExecutor {
@Override @Override

2
src/main/java/xyz/atnrch/nicko/config/Configuration.java → src/main/java/xyz/ineanto/nicko/config/Configuration.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.config; package xyz.ineanto.nicko.config;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/xyz/atnrch/nicko/config/ConfigurationManager.java → src/main/java/xyz/ineanto/nicko/config/ConfigurationManager.java
View file

@ -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.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;

2
src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java → src/main/java/xyz/ineanto/nicko/config/DataSourceConfiguration.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.config; package xyz.ineanto.nicko.config;
public class DataSourceConfiguration { public class DataSourceConfiguration {
private final boolean enabled; private final boolean enabled;

2
src/main/java/xyz/atnrch/nicko/config/DefaultDataSources.java → src/main/java/xyz/ineanto/nicko/config/DefaultDataSources.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.config; package xyz.ineanto.nicko.config;
public class DefaultDataSources { public class DefaultDataSources {
public static final DataSourceConfiguration REDIS_EMPTY = new DataSourceConfiguration(false, "127.0.0.1", 6379, "", ""); public static final DataSourceConfiguration REDIS_EMPTY = new DataSourceConfiguration(false, "127.0.0.1", 6379, "", "");

2
src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java → src/main/java/xyz/ineanto/nicko/config/SQLDataSourceConfiguration.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.config; package xyz.ineanto.nicko.config;
public class SQLDataSourceConfiguration extends DataSourceConfiguration { public class SQLDataSourceConfiguration extends DataSourceConfiguration {
private final boolean mariadb; private final boolean mariadb;

18
src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java → src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.event; package xyz.ineanto.nicko.event;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -6,14 +6,14 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.appearance.AppearanceManager; import xyz.ineanto.nicko.appearance.AppearanceManager;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.atnrch.nicko.storage.name.PlayerNameStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore;
import java.util.Optional; import java.util.Optional;

6
src/main/java/xyz/atnrch/nicko/event/PlayerQuitListener.java → src/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java
View file

@ -1,7 +1,7 @@
package xyz.atnrch.nicko.event; package xyz.ineanto.nicko.event;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;

14
src/main/java/xyz/atnrch/nicko/gui/AdminGUI.java → src/main/java/xyz/ineanto/nicko/gui/AdminGUI.java
View file

@ -1,12 +1,12 @@
package xyz.atnrch.nicko.gui; package xyz.ineanto.nicko.gui;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.gui.items.ItemDefaults; import xyz.ineanto.nicko.gui.items.ItemDefaults;
import xyz.atnrch.nicko.gui.items.admin.ManageCacheItem; import xyz.ineanto.nicko.gui.items.admin.ManageCacheItem;
import xyz.atnrch.nicko.gui.items.admin.ManagePlayerItem; import xyz.ineanto.nicko.gui.items.admin.ManagePlayerItem;
import xyz.atnrch.nicko.gui.items.common.GoBackItem; import xyz.ineanto.nicko.gui.items.common.GoBackItem;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.item.impl.SimpleItem; import xyz.xenondevs.invui.item.impl.SimpleItem;
import xyz.xenondevs.invui.window.Window; import xyz.xenondevs.invui.window.Window;

14
src/main/java/xyz/atnrch/nicko/gui/CacheManagementGUI.java → src/main/java/xyz/ineanto/nicko/gui/CacheManagementGUI.java
View file

@ -1,12 +1,12 @@
package xyz.atnrch.nicko.gui; package xyz.ineanto.nicko.gui;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.gui.items.admin.cache.CacheStatisticsItem; import xyz.ineanto.nicko.gui.items.admin.cache.CacheStatisticsItem;
import xyz.atnrch.nicko.gui.items.admin.cache.InvalidateCacheItem; import xyz.ineanto.nicko.gui.items.admin.cache.InvalidateCacheItem;
import xyz.atnrch.nicko.gui.items.admin.cache.InvalidateSkinItem; import xyz.ineanto.nicko.gui.items.admin.cache.InvalidateSkinItem;
import xyz.atnrch.nicko.gui.items.common.GoBackItem; import xyz.ineanto.nicko.gui.items.common.GoBackItem;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.window.Window; import xyz.xenondevs.invui.window.Window;

12
src/main/java/xyz/atnrch/nicko/gui/ChoiceGUI.java → src/main/java/xyz/ineanto/nicko/gui/ChoiceGUI.java
View file

@ -1,12 +1,12 @@
package xyz.atnrch.nicko.gui; package xyz.ineanto.nicko.gui;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.gui.items.common.choice.CancelItem; import xyz.ineanto.nicko.gui.items.common.choice.CancelItem;
import xyz.atnrch.nicko.gui.items.common.choice.ChoiceCallback; import xyz.ineanto.nicko.gui.items.common.choice.ChoiceCallback;
import xyz.atnrch.nicko.gui.items.common.choice.ConfirmItem; import xyz.ineanto.nicko.gui.items.common.choice.ConfirmItem;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SimpleItem; import xyz.xenondevs.invui.item.impl.SimpleItem;

20
src/main/java/xyz/atnrch/nicko/gui/HomeGUI.java → src/main/java/xyz/ineanto/nicko/gui/HomeGUI.java
View file

@ -1,15 +1,15 @@
package xyz.atnrch.nicko.gui; package xyz.ineanto.nicko.gui;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.gui.items.appearance.ChangeBothItem; import xyz.ineanto.nicko.gui.items.appearance.ChangeBothItem;
import xyz.atnrch.nicko.gui.items.appearance.ChangeNameItem; import xyz.ineanto.nicko.gui.items.appearance.ChangeNameItem;
import xyz.atnrch.nicko.gui.items.appearance.ChangeSkinItem; import xyz.ineanto.nicko.gui.items.appearance.ChangeSkinItem;
import xyz.atnrch.nicko.gui.items.home.AdminAccessItem; import xyz.ineanto.nicko.gui.items.home.AdminAccessItem;
import xyz.atnrch.nicko.gui.items.home.ExitItem; import xyz.ineanto.nicko.gui.items.home.ExitItem;
import xyz.atnrch.nicko.gui.items.home.ResetItem; import xyz.ineanto.nicko.gui.items.home.ResetItem;
import xyz.atnrch.nicko.gui.items.home.SettingsAccessItem; import xyz.ineanto.nicko.gui.items.home.SettingsAccessItem;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.window.Window; import xyz.xenondevs.invui.window.Window;

18
src/main/java/xyz/atnrch/nicko/gui/InvalidateSkinGUI.java → src/main/java/xyz/ineanto/nicko/gui/InvalidateSkinGUI.java
View file

@ -1,17 +1,17 @@
package xyz.atnrch.nicko.gui; package xyz.ineanto.nicko.gui;
import xyz.atnrch.nicko.gui.items.common.GoBackItem; import xyz.ineanto.nicko.gui.items.common.GoBackItem;
import xyz.atnrch.nicko.gui.items.common.ScrollUpItem; import xyz.ineanto.nicko.gui.items.common.ScrollUpItem;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.mojang.MojangSkin; import xyz.ineanto.nicko.mojang.MojangSkin;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.gui.ScrollGui;
import xyz.xenondevs.invui.gui.structure.Markers; import xyz.xenondevs.invui.gui.structure.Markers;
import xyz.xenondevs.invui.item.Item; import xyz.xenondevs.invui.item.Item;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.gui.items.admin.cache.CacheEntryItem; import xyz.ineanto.nicko.gui.items.admin.cache.CacheEntryItem;
import xyz.atnrch.nicko.gui.items.common.ScrollDownItem; import xyz.ineanto.nicko.gui.items.common.ScrollDownItem;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.xenondevs.invui.window.Window; import xyz.xenondevs.invui.window.Window;

14
src/main/java/xyz/atnrch/nicko/gui/PlayerCheckGUI.java → src/main/java/xyz/ineanto/nicko/gui/PlayerCheckGUI.java
View file

@ -1,14 +1,14 @@
package xyz.atnrch.nicko.gui; package xyz.ineanto.nicko.gui;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.gui.items.admin.check.PlayerInformationItem; import xyz.ineanto.nicko.gui.items.admin.check.PlayerInformationItem;
import xyz.atnrch.nicko.gui.items.common.GoBackItem; import xyz.ineanto.nicko.gui.items.common.GoBackItem;
import xyz.atnrch.nicko.gui.items.common.ScrollDownItem; import xyz.ineanto.nicko.gui.items.common.ScrollDownItem;
import xyz.atnrch.nicko.gui.items.common.ScrollUpItem; import xyz.ineanto.nicko.gui.items.common.ScrollUpItem;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.gui.ScrollGui;
import xyz.xenondevs.invui.gui.structure.Markers; import xyz.xenondevs.invui.gui.structure.Markers;

14
src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java → src/main/java/xyz/ineanto/nicko/gui/SettingsGUI.java
View file

@ -1,12 +1,12 @@
package xyz.atnrch.nicko.gui; package xyz.ineanto.nicko.gui;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.gui.items.ItemDefaults; import xyz.ineanto.nicko.gui.items.ItemDefaults;
import xyz.atnrch.nicko.gui.items.common.GoBackItem; import xyz.ineanto.nicko.gui.items.common.GoBackItem;
import xyz.atnrch.nicko.gui.items.settings.BungeeCordCyclingItem; import xyz.ineanto.nicko.gui.items.settings.BungeeCordCyclingItem;
import xyz.atnrch.nicko.gui.items.settings.LanguageCyclingItem; import xyz.ineanto.nicko.gui.items.settings.LanguageCyclingItem;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.item.impl.SimpleItem; import xyz.xenondevs.invui.item.impl.SimpleItem;
import xyz.xenondevs.invui.window.Window; import xyz.xenondevs.invui.window.Window;

6
src/main/java/xyz/atnrch/nicko/gui/items/ItemDefaults.java → src/main/java/xyz/ineanto/nicko/gui/items/ItemDefaults.java
View file

@ -1,8 +1,8 @@
package xyz.atnrch.nicko.gui.items; package xyz.ineanto.nicko.gui.items;
import org.bukkit.Material; import org.bukkit.Material;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.AbstractItemBuilder; import xyz.xenondevs.invui.item.builder.AbstractItemBuilder;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder;

12
src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java → src/main/java/xyz/ineanto/nicko/gui/items/admin/ManageCacheItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.gui.CacheManagementGUI; import xyz.ineanto.nicko.gui.CacheManagementGUI;
import xyz.atnrch.nicko.gui.items.ItemDefaults; import xyz.ineanto.nicko.gui.items.ItemDefaults;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder;
import xyz.xenondevs.invui.item.impl.AsyncItem; import xyz.xenondevs.invui.item.impl.AsyncItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/admin/ManagePlayerItem.java → src/main/java/xyz/ineanto/nicko/gui/items/admin/ManagePlayerItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.gui.PlayerCheckGUI; import xyz.ineanto.nicko.gui.PlayerCheckGUI;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

18
src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheEntryItem.java → src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheEntryItem.java vendored
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.gui.ChoiceGUI; import xyz.ineanto.nicko.gui.ChoiceGUI;
import xyz.atnrch.nicko.gui.InvalidateSkinGUI; import xyz.ineanto.nicko.gui.InvalidateSkinGUI;
import xyz.atnrch.nicko.gui.items.ItemDefaults; import xyz.ineanto.nicko.gui.items.ItemDefaults;
import xyz.atnrch.nicko.gui.items.common.choice.ChoiceCallback; import xyz.ineanto.nicko.gui.items.common.choice.ChoiceCallback;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.mojang.MojangAPI; import xyz.ineanto.nicko.mojang.MojangAPI;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder;
import xyz.xenondevs.invui.item.impl.AsyncItem; import xyz.xenondevs.invui.item.impl.AsyncItem;

10
src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java → src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheStatisticsItem.java vendored
View file

@ -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.CacheStats;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.mojang.MojangSkin; import xyz.ineanto.nicko.mojang.MojangSkin;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java → src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java vendored
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateSkinItem.java → src/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateSkinItem.java vendored
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.gui.InvalidateSkinGUI; import xyz.ineanto.nicko.gui.InvalidateSkinGUI;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

14
src/main/java/xyz/atnrch/nicko/gui/items/admin/check/PlayerInformationItem.java → src/main/java/xyz/ineanto/nicko/gui/items/admin/check/PlayerInformationItem.java
View file

@ -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.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.gui.items.ItemDefaults; import xyz.ineanto.nicko.gui.items.ItemDefaults;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder;
import xyz.xenondevs.invui.item.impl.AsyncItem; import xyz.xenondevs.invui.item.impl.AsyncItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeBothItem.java → src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.anvil.AnvilManager; import xyz.ineanto.nicko.anvil.AnvilManager;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java → src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.anvil.AnvilManager; import xyz.ineanto.nicko.anvil.AnvilManager;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

12
src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java → src/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java
View file

@ -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.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.anvil.AnvilManager; import xyz.ineanto.nicko.anvil.AnvilManager;
import xyz.atnrch.nicko.gui.items.ItemDefaults; import xyz.ineanto.nicko.gui.items.ItemDefaults;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.SkullBuilder; import xyz.xenondevs.invui.item.builder.SkullBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;
import xyz.xenondevs.invui.util.MojangApiUtils; import xyz.xenondevs.invui.util.MojangApiUtils;

6
src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java → src/main/java/xyz/ineanto/nicko/gui/items/common/GoBackItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java → src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollDownItem.java
View file

@ -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.Material;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.ItemTranslation; import xyz.ineanto.nicko.i18n.ItemTranslation;
import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.gui.ScrollGui;
import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.ItemProvider;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;

8
src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java → src/main/java/xyz/ineanto/nicko/gui/items/common/ScrollUpItem.java
View file

@ -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.Material;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.ItemTranslation; import xyz.ineanto.nicko.i18n.ItemTranslation;
import xyz.xenondevs.invui.gui.ScrollGui; import xyz.xenondevs.invui.gui.ScrollGui;
import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.ItemProvider;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;

6
src/main/java/xyz/atnrch/nicko/gui/items/common/choice/CancelItem.java → src/main/java/xyz/ineanto/nicko/gui/items/common/choice/CancelItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

2
src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ChoiceCallback.java → src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ChoiceCallback.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.gui.items.common.choice; package xyz.ineanto.nicko.gui.items.common.choice;
public interface ChoiceCallback { public interface ChoiceCallback {
void onConfirm(); void onConfirm();

6
src/main/java/xyz/atnrch/nicko/gui/items/common/choice/ConfirmItem.java → src/main/java/xyz/ineanto/nicko/gui/items/common/choice/ConfirmItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/home/AdminAccessItem.java → src/main/java/xyz/ineanto/nicko/gui/items/home/AdminAccessItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.gui.AdminGUI; import xyz.ineanto.nicko.gui.AdminGUI;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

7
src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java → src/main/java/xyz/ineanto/nicko/gui/items/home/ExitItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.ItemTranslation;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

10
src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java → src/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.appearance.AppearanceManager; import xyz.ineanto.nicko.appearance.AppearanceManager;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

8
src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java → src/main/java/xyz/ineanto/nicko/gui/items/home/SettingsAccessItem.java
View file

@ -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.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import xyz.atnrch.nicko.gui.SettingsGUI; import xyz.ineanto.nicko.gui.SettingsGUI;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.SuppliedItem; import xyz.xenondevs.invui.item.impl.SuppliedItem;

14
src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java → src/main/java/xyz/ineanto/nicko/gui/items/settings/BungeeCordCyclingItem.java
View file

@ -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.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.ItemTranslation; import xyz.ineanto.nicko.i18n.ItemTranslation;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.ItemProvider;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.AbstractItem; import xyz.xenondevs.invui.item.impl.AbstractItem;

18
src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java → src/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java
View file

@ -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.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.gui.SettingsGUI; import xyz.ineanto.nicko.gui.SettingsGUI;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.ItemTranslation; import xyz.ineanto.nicko.i18n.ItemTranslation;
import xyz.atnrch.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.ItemProvider;
import xyz.xenondevs.invui.item.builder.ItemBuilder; import xyz.xenondevs.invui.item.builder.ItemBuilder;
import xyz.xenondevs.invui.item.impl.AbstractItem; import xyz.xenondevs.invui.item.impl.AbstractItem;

6
src/main/java/xyz/atnrch/nicko/i18n/I18N.java → src/main/java/xyz/ineanto/nicko/i18n/I18N.java
View file

@ -1,9 +1,9 @@
package xyz.atnrch.nicko.i18n; package xyz.ineanto.nicko.i18n;
import com.github.jsixface.YamlConfig; import com.github.jsixface.YamlConfig;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.xenondevs.invui.item.builder.AbstractItemBuilder; import xyz.xenondevs.invui.item.builder.AbstractItemBuilder;
import java.io.InputStream; import java.io.InputStream;

2
src/main/java/xyz/atnrch/nicko/i18n/I18NDict.java → src/main/java/xyz/ineanto/nicko/i18n/I18NDict.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.i18n; package xyz.ineanto.nicko.i18n;
public class I18NDict { public class I18NDict {
public static class Error { public static class Error {

2
src/main/java/xyz/atnrch/nicko/i18n/ItemTranslation.java → src/main/java/xyz/ineanto/nicko/i18n/ItemTranslation.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.i18n; package xyz.ineanto.nicko.i18n;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/xyz/atnrch/nicko/i18n/Locale.java → src/main/java/xyz/ineanto/nicko/i18n/Locale.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.i18n; package xyz.ineanto.nicko.i18n;
import java.io.Serializable; import java.io.Serializable;

4
src/main/java/xyz/atnrch/nicko/i18n/LocaleFileManager.java → src/main/java/xyz/ineanto/nicko/i18n/LocaleFileManager.java
View file

@ -1,7 +1,7 @@
package xyz.atnrch.nicko.i18n; package xyz.ineanto.nicko.i18n;
import com.github.jsixface.YamlConfig; import com.github.jsixface.YamlConfig;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.xenondevs.invui.util.IOUtils; import xyz.xenondevs.invui.util.IOUtils;
import java.io.*; import java.io.*;

2
src/main/java/xyz/atnrch/nicko/mojang/MojangAPI.java → src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java
View file

@ -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.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;

2
src/main/java/xyz/atnrch/nicko/mojang/MojangSkin.java → src/main/java/xyz/ineanto/nicko/mojang/MojangSkin.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.mojang; package xyz.ineanto.nicko.mojang;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;

2
src/main/java/xyz/atnrch/nicko/mojang/MojangUtils.java → src/main/java/xyz/ineanto/nicko/mojang/MojangUtils.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.mojang; package xyz.ineanto.nicko.mojang;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Pattern; import java.util.regex.Pattern;

6
src/main/java/xyz/atnrch/nicko/placeholder/NickoExpansion.java → src/main/java/xyz/ineanto/nicko/placeholder/NickoExpansion.java
View file

@ -1,11 +1,11 @@
package xyz.atnrch.nicko.placeholder; package xyz.ineanto.nicko.placeholder;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import java.util.Optional; import java.util.Optional;

28
src/main/java/xyz/atnrch/nicko/profile/NickoProfile.java → src/main/java/xyz/ineanto/nicko/profile/NickoProfile.java
View file

@ -1,10 +1,9 @@
package xyz.atnrch.nicko.profile; package xyz.ineanto.nicko.profile;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
@ -13,8 +12,6 @@ public class NickoProfile implements Cloneable {
public static final PlayerDataStore dataStore = NickoBukkit.getInstance().getDataStore(); public static final PlayerDataStore dataStore = NickoBukkit.getInstance().getDataStore();
public static final NickoProfile EMPTY_PROFILE = new NickoProfile(null, null, Locale.ENGLISH, true); public static final NickoProfile EMPTY_PROFILE = new NickoProfile(null, null, Locale.ENGLISH, true);
private transient final Player player;
private String name; private String name;
private String skin; private String skin;
private Locale locale; private Locale locale;
@ -25,23 +22,6 @@ public class NickoProfile implements Cloneable {
this.skin = skin; this.skin = skin;
this.locale = locale; this.locale = locale;
this.bungeecordTransfer = bungeecordTransfer; 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<NickoProfile> get(Player player) { public static Optional<NickoProfile> get(Player player) {

6
src/main/java/xyz/atnrch/nicko/storage/Cache.java → src/main/java/xyz/ineanto/nicko/storage/Cache.java
View file

@ -1,7 +1,7 @@
package xyz.atnrch.nicko.storage; package xyz.ineanto.nicko.storage;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;

2
src/main/java/xyz/atnrch/nicko/storage/CacheProvider.java → src/main/java/xyz/ineanto/nicko/storage/CacheProvider.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.storage; package xyz.ineanto.nicko.storage;
public interface CacheProvider { public interface CacheProvider {
boolean init(); boolean init();

24
src/main/java/xyz/atnrch/nicko/storage/PlayerDataStore.java → src/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java
View file

@ -1,17 +1,17 @@
package xyz.atnrch.nicko.storage; package xyz.ineanto.nicko.storage;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.mojang.MojangAPI; import xyz.ineanto.nicko.mojang.MojangAPI;
import xyz.atnrch.nicko.mojang.MojangUtils; import xyz.ineanto.nicko.mojang.MojangUtils;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.json.JSONStorage; import xyz.ineanto.nicko.storage.json.JSONStorage;
import xyz.atnrch.nicko.storage.map.MapCache; import xyz.ineanto.nicko.storage.map.MapCache;
import xyz.atnrch.nicko.storage.mariadb.MariaDBStorage; import xyz.ineanto.nicko.storage.mariadb.MariaDBStorage;
import xyz.atnrch.nicko.storage.mysql.MySQLStorage; import xyz.ineanto.nicko.storage.mysql.MySQLStorage;
import xyz.atnrch.nicko.storage.redis.RedisCache; import xyz.ineanto.nicko.storage.redis.RedisCache;
import java.io.IOException; import java.io.IOException;
import java.util.Optional; import java.util.Optional;

6
src/main/java/xyz/atnrch/nicko/storage/Storage.java → src/main/java/xyz/ineanto/nicko/storage/Storage.java
View file

@ -1,7 +1,7 @@
package xyz.atnrch.nicko.storage; package xyz.ineanto.nicko.storage;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;

2
src/main/java/xyz/atnrch/nicko/storage/StorageProvider.java → src/main/java/xyz/ineanto/nicko/storage/StorageProvider.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.storage; package xyz.ineanto.nicko.storage;
public interface StorageProvider { public interface StorageProvider {
boolean init(); boolean init();

14
src/main/java/xyz/atnrch/nicko/storage/json/JSONStorage.java → src/main/java/xyz/ineanto/nicko/storage/json/JSONStorage.java
View file

@ -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.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.storage.Storage; import xyz.ineanto.nicko.storage.Storage;
import xyz.atnrch.nicko.storage.StorageProvider; import xyz.ineanto.nicko.storage.StorageProvider;
import java.io.*; import java.io.*;
import java.util.Optional; import java.util.Optional;

4
src/main/java/xyz/atnrch/nicko/storage/json/JSONStorageProvider.java → src/main/java/xyz/ineanto/nicko/storage/json/JSONStorageProvider.java
View file

@ -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; import java.io.File;

10
src/main/java/xyz/atnrch/nicko/storage/map/MapCache.java → src/main/java/xyz/ineanto/nicko/storage/map/MapCache.java
View file

@ -1,9 +1,9 @@
package xyz.atnrch.nicko.storage.map; package xyz.ineanto.nicko.storage.map;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.Cache; import xyz.ineanto.nicko.storage.Cache;
import xyz.atnrch.nicko.storage.CacheProvider; import xyz.ineanto.nicko.storage.CacheProvider;
import java.util.HashMap; import java.util.HashMap;
import java.util.Optional; import java.util.Optional;

6
src/main/java/xyz/atnrch/nicko/storage/map/MapCacheProvider.java → src/main/java/xyz/ineanto/nicko/storage/map/MapCacheProvider.java
View file

@ -1,7 +1,7 @@
package xyz.atnrch.nicko.storage.map; package xyz.ineanto.nicko.storage.map;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.CacheProvider; import xyz.ineanto.nicko.storage.CacheProvider;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID; import java.util.UUID;

14
src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorage.java → src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java
View file

@ -1,11 +1,11 @@
package xyz.atnrch.nicko.storage.mariadb; package xyz.ineanto.nicko.storage.mariadb;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.Storage; import xyz.ineanto.nicko.storage.Storage;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;

8
src/main/java/xyz/atnrch/nicko/storage/mariadb/MariaDBStorageProvider.java → src/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorageProvider.java
View file

@ -1,9 +1,9 @@
package xyz.atnrch.nicko.storage.mariadb; package xyz.ineanto.nicko.storage.mariadb;
import org.mariadb.jdbc.MariaDbDataSource; import org.mariadb.jdbc.MariaDbDataSource;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.ineanto.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.storage.StorageProvider; import xyz.ineanto.nicko.storage.StorageProvider;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;

14
src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorage.java → src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java
View file

@ -1,11 +1,11 @@
package xyz.atnrch.nicko.storage.mysql; package xyz.ineanto.nicko.storage.mysql;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.Storage; import xyz.ineanto.nicko.storage.Storage;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;

8
src/main/java/xyz/atnrch/nicko/storage/mysql/MySQLStorageProvider.java → src/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorageProvider.java
View file

@ -1,9 +1,9 @@
package xyz.atnrch.nicko.storage.mysql; package xyz.ineanto.nicko.storage.mysql;
import com.mysql.cj.jdbc.MysqlDataSource; import com.mysql.cj.jdbc.MysqlDataSource;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.ineanto.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.storage.StorageProvider; import xyz.ineanto.nicko.storage.StorageProvider;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;

2
src/main/java/xyz/atnrch/nicko/storage/name/PlayerNameStore.java → src/main/java/xyz/ineanto/nicko/storage/name/PlayerNameStore.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.storage.name; package xyz.ineanto.nicko.storage.name;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

12
src/main/java/xyz/atnrch/nicko/storage/redis/RedisCache.java → src/main/java/xyz/ineanto/nicko/storage/redis/RedisCache.java
View file

@ -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.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.Cache; import xyz.ineanto.nicko.storage.Cache;
import xyz.atnrch.nicko.storage.CacheProvider; import xyz.ineanto.nicko.storage.CacheProvider;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;

8
src/main/java/xyz/atnrch/nicko/storage/redis/RedisCacheProvider.java → src/main/java/xyz/ineanto/nicko/storage/redis/RedisCacheProvider.java
View file

@ -1,9 +1,9 @@
package xyz.atnrch.nicko.storage.redis; package xyz.ineanto.nicko.storage.redis;
import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisConnectionException;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.ineanto.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.storage.CacheProvider; import xyz.ineanto.nicko.storage.CacheProvider;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPool;

2
src/main/java/xyz/atnrch/nicko/wrapper/AbstractPacket.java → src/main/java/xyz/ineanto/nicko/wrapper/AbstractPacket.java
View file

@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package xyz.atnrch.nicko.wrapper; package xyz.ineanto.nicko.wrapper;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;

2
src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerEntityDestroy.java → src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerEntityDestroy.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.wrapper; package xyz.ineanto.nicko.wrapper;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

2
src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerRespawn.java → src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerRespawn.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.wrapper; package xyz.ineanto.nicko.wrapper;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.InternalStructure; import com.comphenix.protocol.events.InternalStructure;

2
src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayServerSpawnEntity.java → src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerSpawnEntity.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.wrapper; package xyz.ineanto.nicko.wrapper;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

2
src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfo.java → src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfo.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.wrapper; package xyz.ineanto.nicko.wrapper;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

2
src/main/java/xyz/atnrch/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java → src/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java
View file

@ -1,4 +1,4 @@
package xyz.atnrch.nicko.wrapper; package xyz.ineanto.nicko.wrapper;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

4
src/main/resources/plugin.yml
View file

@ -1,6 +1,6 @@
name: Nicko name: Nicko
main: xyz.atnrch.nicko.NickoBukkit main: xyz.ineanto.nicko.NickoBukkit
version: 1.0-SNAPSHOT version: 1.0-RC1
author: Ineanto author: Ineanto
description: "The feature packed, next generation disguise plugin for Minecraft." description: "The feature packed, next generation disguise plugin for Minecraft."
api-version: 1.14 api-version: 1.14

6
src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java
View file

@ -5,9 +5,9 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DefaultDataSources; import xyz.ineanto.nicko.config.DefaultDataSources;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;

4
src/test/java/xyz/atnrch/nicko/test/config/ConfigurationTest.java
View file

@ -5,8 +5,8 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;

14
src/test/java/xyz/atnrch/nicko/test/i18n/ItemTranslationTest.java
View file

@ -6,13 +6,13 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DefaultDataSources; import xyz.ineanto.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.ItemTranslation; import xyz.ineanto.nicko.i18n.ItemTranslation;
import xyz.atnrch.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;

13
src/test/java/xyz/atnrch/nicko/test/i18n/TranslationTest.java
View file

@ -6,13 +6,12 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.ineanto.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.config.DefaultDataSources; import xyz.ineanto.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18N; import xyz.ineanto.nicko.i18n.I18NDict;
import xyz.atnrch.nicko.i18n.I18NDict; import xyz.ineanto.nicko.i18n.Locale;
import xyz.atnrch.nicko.i18n.Locale;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;

12
src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
View file

@ -7,12 +7,12 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DefaultDataSources; import xyz.ineanto.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.config.SQLDataSourceConfiguration; import xyz.ineanto.nicko.config.SQLDataSourceConfiguration;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import java.util.Optional; import java.util.Optional;

16
src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
View file

@ -2,14 +2,14 @@ package xyz.atnrch.nicko.test.storage;
import be.seeseemelk.mockbukkit.MockBukkit; import be.seeseemelk.mockbukkit.MockBukkit;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DefaultDataSources; import xyz.ineanto.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.config.SQLDataSourceConfiguration; import xyz.ineanto.nicko.config.SQLDataSourceConfiguration;
import xyz.atnrch.nicko.i18n.Locale; import xyz.ineanto.nicko.i18n.Locale;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;

9
src/test/java/xyz/atnrch/nicko/test/storage/map/MapCacheTest.java
View file

@ -3,11 +3,10 @@ package xyz.atnrch.nicko.test.storage.map;
import be.seeseemelk.mockbukkit.MockBukkit; import be.seeseemelk.mockbukkit.MockBukkit;
import be.seeseemelk.mockbukkit.ServerMock; import be.seeseemelk.mockbukkit.ServerMock;
import be.seeseemelk.mockbukkit.entity.PlayerMock; import be.seeseemelk.mockbukkit.entity.PlayerMock;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.ineanto.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.config.DefaultDataSources; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.profile.NickoProfile;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;

14
src/test/java/xyz/atnrch/nicko/test/storage/redis/RedisCacheTest.java
View file

@ -4,13 +4,13 @@ import be.seeseemelk.mockbukkit.MockBukkit;
import be.seeseemelk.mockbukkit.ServerMock; import be.seeseemelk.mockbukkit.ServerMock;
import be.seeseemelk.mockbukkit.entity.PlayerMock; import be.seeseemelk.mockbukkit.entity.PlayerMock;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import xyz.atnrch.nicko.NickoBukkit; import xyz.ineanto.nicko.NickoBukkit;
import xyz.atnrch.nicko.appearance.ActionResult; import xyz.ineanto.nicko.appearance.ActionResult;
import xyz.atnrch.nicko.config.Configuration; import xyz.ineanto.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.ineanto.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.config.DefaultDataSources; import xyz.ineanto.nicko.config.DefaultDataSources;
import xyz.atnrch.nicko.profile.NickoProfile; import xyz.ineanto.nicko.profile.NickoProfile;
import xyz.atnrch.nicko.storage.PlayerDataStore; import xyz.ineanto.nicko.storage.PlayerDataStore;
import java.util.Optional; import java.util.Optional;