diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java similarity index 98% rename from nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java index 6209029..3664064 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/NickoBukkit.java @@ -119,7 +119,7 @@ public class NickoBukkit extends JavaPlugin { if (config.isBungeecordSupport()) { if (support.stopIfBungeeCordIsNotEnabled()) { getLogger().info("Enabling BungeeCord support..."); - getServer().getMessenger().registerIncomingPluginChannel(this, NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE, new PluginMessageHandler()); + getServer().getMessenger().registerIncomingPluginChannel(this, NickoBungee.PROXY_UPDATE, new PluginMessageHandler()); } } diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/anvil/AnvilManager.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/command/NickoCommand.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/NickoCommand.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/command/NickoCommand.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/NickoCommand.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoCheckSubCmd.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/command/sub/NickoDebugSubCmd.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/AdminGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AdminGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/AdminGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AdminGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/AppearanceManagerGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AppearanceManagerGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/AppearanceManagerGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/AppearanceManagerGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/MainGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/MainGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/SettingsGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/SettingsGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/SettingsGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/CacheManagementGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/admin/CacheManagementGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/CacheManagementGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailledGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/admin/cache/CacheDetailledGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/admin/cache/CacheDetailledGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/ManageCache.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/ManageCache.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/ManageCache.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheDetailed.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheDetailed.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheDetailed.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheInvalidate.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheInvalidate.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/CacheOverview.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/CacheOverview.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/SkinPlaceholder.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/cache/SkinPlaceholder.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/admin/cache/SkinPlaceholder.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/GoBack.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/common/GoBack.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/GoBack.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollDown.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollDown.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollDown.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollUp.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/common/ScrollUp.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/common/ScrollUp.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AdminSubGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminSubGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AdminSubGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AppearanceManagerSubGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AppearanceManagerSubGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AppearanceManagerSubGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/AppearanceManagerSubGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ExitGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ExitGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ExitGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/ResetAppearance.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/ResetAppearance.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/SettingsSubGUI.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsSubGUI.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/main/SettingsSubGUI.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/BungeeCordCycling.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/settings/BungeeCordCycling.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/BungeeCordCycling.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/settings/LanguageCycling.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/LanguageCycling.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/settings/OptionUnavailable.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/OptionUnavailable.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/settings/OptionUnavailable.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/settings/OptionUnavailable.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeName.java similarity index 95% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeName.java index 7d4cd6b..b42a97b 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeName.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeName.java @@ -3,7 +3,7 @@ package net.artelnatif.nicko.gui.items.skin; import de.studiocode.invui.item.ItemProvider; import de.studiocode.invui.item.builder.ItemBuilder; import de.studiocode.invui.item.impl.BaseItem; -import net.artelnatif.nicko.anvil.AnvilManager; +import net.artelnatif.nicko.bukkit.anvil.AnvilManager; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeNameAndSkin.java similarity index 95% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeNameAndSkin.java index d404ec3..be4e1e6 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeNameAndSkin.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeNameAndSkin.java @@ -3,7 +3,7 @@ package net.artelnatif.nicko.gui.items.skin; import de.studiocode.invui.item.ItemProvider; import de.studiocode.invui.item.builder.ItemBuilder; import de.studiocode.invui.item.impl.BaseItem; -import net.artelnatif.nicko.anvil.AnvilManager; +import net.artelnatif.nicko.bukkit.anvil.AnvilManager; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeSkin.java similarity index 95% rename from nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeSkin.java index e94bb70..4f23bf9 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/skin/ChangeSkin.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/gui/items/skin/ChangeSkin.java @@ -3,7 +3,7 @@ package net.artelnatif.nicko.gui.items.skin; import de.studiocode.invui.item.ItemProvider; import de.studiocode.invui.item.builder.ItemBuilder; import de.studiocode.invui.item.impl.BaseItem; -import net.artelnatif.nicko.anvil.AnvilManager; +import net.artelnatif.nicko.bukkit.anvil.AnvilManager; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/PluginMessageHandler.java b/nicko-core/src/main/java/net/artelnatif/nicko/bukkit/pluginchannel/PluginMessageHandler.java similarity index 100% rename from nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/PluginMessageHandler.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bukkit/pluginchannel/PluginMessageHandler.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java deleted file mode 100644 index 4a7053e..0000000 --- a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.artelnatif.nicko.bungee.event; - -import net.artelnatif.nicko.bungee.NickoBungee; -import net.artelnatif.nicko.bungee.pluginchannel.PluginMessageUtils; -import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.api.connection.Server; -import net.md_5.bungee.api.event.ServerSwitchEvent; -import net.md_5.bungee.api.plugin.Listener; -import net.md_5.bungee.event.EventHandler; - -import java.util.ArrayList; - -public class ServerSwitchListener implements Listener { - @EventHandler - public void onSwitch(ServerSwitchEvent event) { - final ProxiedPlayer player = event.getPlayer(); - final Server server = player.getServer(); - System.out.println("NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE = " + NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE); - - final ArrayList payload = new ArrayList<>(); - payload.add(player.getUniqueId().toString()); - - PluginMessageUtils.sendMessage(server.getInfo(), NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE, payload); - } -} diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginMessageUtils.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/PluginMessageSender.java similarity index 77% rename from nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginMessageUtils.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/PluginMessageSender.java index 39a1b59..c979ae8 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginMessageUtils.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/message/PluginMessageSender.java @@ -6,8 +6,8 @@ import net.md_5.bungee.api.config.ServerInfo; import java.util.ArrayList; -public class PluginMessageUtils { - public static void sendMessage(final ServerInfo info, final String channel, final ArrayList payload) { +public class PluginMessageSender { + public static void send(final ServerInfo info, final String channel, final ArrayList payload) { if (info == null) { return; } final ByteArrayDataOutput output = ByteStreams.newDataOutput(); diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java b/nicko-core/src/main/java/net/artelnatif/nicko/config/BukkitConfiguration.java similarity index 90% rename from nicko-core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java rename to nicko-core/src/main/java/net/artelnatif/nicko/config/BukkitConfiguration.java index 9a75ec7..a8d2e07 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/config/BukkitConfiguration.java @@ -1,11 +1,14 @@ package net.artelnatif.nicko.config; -import net.artelnatif.nicko.NickoBukkit; +import net.artelnatif.nicko.Nicko; +import net.artelnatif.nicko.bukkit.NickoBukkit; +import net.artelnatif.nicko.bungee.NickoBungee; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; public class NickoConfiguration { - private final NickoBukkit nicko; + private final Nicko nicko; private String prefix; private Boolean bungeecordSupport; @@ -14,7 +17,7 @@ public class NickoConfiguration { private String sqlUsername, sqlPassword, sqlAddress; - public NickoConfiguration(NickoBukkit nicko) { + public NickoConfiguration(Nicko nicko) { this.nicko = nicko; } @@ -121,6 +124,7 @@ public class NickoConfiguration { } private FileConfiguration getConfig() { - return nicko.getConfig(); + final YamlConfiguration configuration = new YamlConfiguration(); + return ; } } diff --git a/nicko-core/src/main/resources/config.yml b/nicko-core/src/main/resources/config.yml index 0cf53ab..124c28a 100644 --- a/nicko-core/src/main/resources/config.yml +++ b/nicko-core/src/main/resources/config.yml @@ -1,32 +1,44 @@ # Nicko ${project.version} - Config: -prefix: "§8[§6Nicko§8] " +# This is the Nicko configuration file. +# This file contains all the configuration for +# the Bukkit AND Bungeecord versions of Nicko. +# Nicko is smart and will only read its configuration +# section based on what it's enabled as. +# For example, if Nicko is enabled as a Bukkit plugin, +# it will only read the "Bukkit" section of the config file. +# As a result, modifying any other section is useless. + +########### +# GENERAL # +########### + +common: + storage: + # SQL database's address + address: "localhost" + # SQL database's username. + username: "" + # SQL database's password. + password: "" + +################# +# BUKKIT/SPIGOT # +################# + +bukkit: + # Nicko's messages prefix. + prefix: "§8[§6Nicko§8] " + + # Indicates wherever the data will be stored + # locally through a .json file or a (My)SQL database. + local_storage: true -bungeecord: # Enables Bungeecord support, switching through servers will transfer player's disguise. # Accepted values: false (Disabled), true (Enabled) - enabled: false - redis: - username: "" - password: "" - # Time To Live, the time the data will be stored on a player-by-player basis. - ttl: -1 + use_bungeecord: false -# Localisation: -locale: # Nicko will copy the English locale as "lang.yml" # and will use the translations in that file when "Server Custom" # is selected as the player's locale. - use_custom_locale: false - - -storage: - # Indicates wherever the data will be stored - # locally through a .json file or a (My)SQL database. - local: true - # SQL database's address - address: "localhost" - # SQL database's username. - username: "" - # SQL database's password. - password: "" \ No newline at end of file + use_custom_locale: false \ No newline at end of file