diff --git a/nicko-core/dependency-reduced-pom.xml b/nicko-core/dependency-reduced-pom.xml index a974651..6babce6 100644 --- a/nicko-core/dependency-reduced-pom.xml +++ b/nicko-core/dependency-reduced-pom.xml @@ -35,17 +35,11 @@ - xyz.upperlevel.spigot.book:spigot-book-api net.wesjd:anvilgui de.studiocode.invui:* - io.vavr:vavr - - xyz.upperlevel.spigot.book - net.artelnatif.bookapi - net.wesjd.anvilgui net.artelnatif.anvilgui @@ -84,7 +78,7 @@ org.spigotmc spigot-api - 1.18.2-R0.1-SNAPSHOT + 1.19.2-R0.1-SNAPSHOT provided @@ -93,6 +87,12 @@ 1.18-R0.1-SNAPSHOT compile + + org.apache.commons + commons-lang3 + 3.12.0 + compile + com.google.guava guava @@ -101,21 +101,21 @@ org.junit.jupiter - junit-jupiter-api - 5.9.0-M1 + junit-jupiter + 5.9.0 test - opentest4j - org.opentest4j + junit-jupiter-api + org.junit.jupiter - junit-platform-commons - org.junit.platform + junit-jupiter-params + org.junit.jupiter - apiguardian-api - org.apiguardian + junit-jupiter-engine + org.junit.jupiter diff --git a/nicko-core/pom.xml b/nicko-core/pom.xml index aa07286..f1b6f43 100644 --- a/nicko-core/pom.xml +++ b/nicko-core/pom.xml @@ -56,16 +56,16 @@ InvUI 0.8.2 - - xyz.upperlevel.spigot.book - spigot-book-api - 1.6 - net.wesjd anvilgui 1.5.3-SNAPSHOT + + org.apache.commons + commons-lang3 + 3.12.0 + com.google.guava guava @@ -74,8 +74,8 @@ org.junit.jupiter - junit-jupiter-api - 5.9.0-M1 + junit-jupiter + 5.9.0 test @@ -103,17 +103,11 @@ - xyz.upperlevel.spigot.book:spigot-book-api net.wesjd:anvilgui de.studiocode.invui:* - io.vavr:vavr - - xyz.upperlevel.spigot.book - net.artelnatif.bookapi - net.wesjd.anvilgui net.artelnatif.anvilgui diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java index cb95f57..dc8fc35 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java @@ -1,5 +1,7 @@ package net.artelnatif.nicko.bungee; +import net.artelnatif.nicko.bungee.event.PluginMessageListener; +import net.artelnatif.nicko.bungee.event.ServerSwitchListener; import net.md_5.bungee.api.plugin.Plugin; public class NickoBungee extends Plugin { @@ -17,6 +19,10 @@ public class NickoBungee extends Plugin { getProxy().registerChannel(NICKO_PLUGIN_CHANNEL_FETCH); getProxy().registerChannel(NICKO_PLUGIN_CHANNEL_UPDATE); + getLogger().info("Registering listeners..."); + getProxy().getPluginManager().registerListener(this, new ServerSwitchListener()); + getProxy().getPluginManager().registerListener(this, new PluginMessageListener()); + getLogger().info("Nicko (Bungee) has been enabled."); } diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/PluginMessageListener.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/PluginMessageListener.java new file mode 100644 index 0000000..e3c772b --- /dev/null +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/event/PluginMessageListener.java @@ -0,0 +1,15 @@ +package net.artelnatif.nicko.bungee.event; + +import net.md_5.bungee.api.event.PluginMessageEvent; +import net.md_5.bungee.api.plugin.Listener; +import net.md_5.bungee.event.EventHandler; + +import java.util.Arrays; + +public class PluginMessageListener implements Listener { + @EventHandler + public void onSwitch(PluginMessageEvent event) { + final String message = Arrays.toString(event.getData()); + System.out.println("message = " + message); + } +} 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 index 5877a1c..5d38915 100644 --- 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 @@ -1,7 +1,7 @@ package net.artelnatif.nicko.bungee.event; import net.artelnatif.nicko.bungee.NickoBungee; -import net.artelnatif.nicko.bungee.pluginchannel.PluginChannelHelper; +import net.artelnatif.nicko.bungee.pluginchannel.PluginMessageUtils; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.Server; @@ -10,23 +10,12 @@ import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; public class ServerSwitchListener implements Listener { - - /* - * Nicko Message Format - * FETCH: nicko:skin/fetch - * - UUID - * - * UPDATE: nicko:skin/update - * - UUID - * - Skin - * - Name - */ - @EventHandler public void onSwitch(ServerSwitchEvent event) { final ServerInfo from = event.getFrom(); final ProxiedPlayer player = event.getPlayer(); final Server to = player.getServer(); - PluginChannelHelper.sendMessage(from, NickoBungee.NICKO_PLUGIN_CHANNEL_FETCH, player.getUniqueId().toString()); + System.out.println("NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE = " + NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE); + PluginMessageUtils.sendMessage(from, NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE, player.getUniqueId().toString()); } } diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginMessageUtils.java similarity index 66% rename from nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginMessageUtils.java index a428a5d..0065d78 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginMessageUtils.java @@ -4,14 +4,16 @@ import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import net.md_5.bungee.api.config.ServerInfo; -public class PluginChannelHelper { - public static boolean sendMessage(final ServerInfo info, final String channel, final String... data) { +public class PluginMessageUtils { + public static void sendMessage(final ServerInfo info, final String channel, final String... data) { + if (info == null) { return; } + final ByteArrayDataOutput output = ByteStreams.newDataOutput(); output.writeUTF(channel); for (String elt : data) { output.writeUTF(elt); } System.out.printf("(%s) PluginMessage <-> %s", info.getSocketAddress().toString(), output); - return info.sendData(channel, output.toByteArray(), false); + info.sendData(channel, output.toByteArray(), true); } } diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java b/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java index 8b37799..8d32bce 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/i18n/LocaleManager.java @@ -1,7 +1,7 @@ package net.artelnatif.nicko.i18n; import net.artelnatif.nicko.NickoBukkit; -import org.apache.commons.lang.LocaleUtils; +import org.apache.commons.lang3.LocaleUtils; import java.util.Arrays; import java.util.Locale; diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java b/nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java index aab7624..84ece2d 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/pluginchannel/UpdateMessageHandler.java @@ -9,6 +9,7 @@ import org.bukkit.plugin.messaging.PluginMessageListener; public class UpdateMessageHandler implements PluginMessageListener { @Override public void onPluginMessageReceived(String channel, Player player, byte[] message) { + System.out.println("channel = " + channel); if(!channel.equals(NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE)) { return; } @@ -16,7 +17,8 @@ public class UpdateMessageHandler implements PluginMessageListener { final ByteArrayDataInput in = ByteStreams.newDataInput(message); final String subchannel = in.readUTF(); if(subchannel.equals(NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE)) { - // TODO: 10/20/22 update player + System.out.println("subchannel = " + subchannel); + System.out.println("Received " + NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE + " msg"); } } }