diff --git a/bungee/pom.xml b/bungee/pom.xml deleted file mode 100644 index fbf5b80cf..000000000 --- a/bungee/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - quests-parent - me.blackvein.quests - 4.2.4 - - quests-bungee - - - UTF-8 - - - - - bungeecord-repo - https://oss.sonatype.org/content/repositories/snapshots - - - - - - net.md-5 - bungeecord-api - 1.16-R0.5-SNAPSHOT - jar - provided - - - net.md-5 - bungeecord-api - 1.16-R0.5-SNAPSHOT - javadoc - provided - - - - - Quests-Bungee-${project.version} - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - \ No newline at end of file diff --git a/bungee/src/main/java/me/blackvein/quests/QuestsBungee.java b/bungee/src/main/java/me/blackvein/quests/QuestsBungee.java deleted file mode 100644 index 46c9bd311..000000000 --- a/bungee/src/main/java/me/blackvein/quests/QuestsBungee.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2014 PikaMug and contributors. All rights reserved. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package me.blackvein.quests; - -import me.blackvein.quests.listeners.BungeePlayerListener; -import net.md_5.bungee.api.plugin.Plugin; - -public class QuestsBungee extends Plugin { - private static final String CHANNEL = "quests:update"; - - private BungeePlayerListener playerListener; - - @Override - public void onEnable() { - playerListener = new BungeePlayerListener(this); - getProxy().registerChannel(CHANNEL); - getProxy().getPluginManager().registerListener(this, playerListener); - } - - @Override - public void onDisable() { - getProxy().unregisterChannel(CHANNEL); - getProxy().getPluginManager().unregisterListener(playerListener); - } -} diff --git a/bungee/src/main/java/me/blackvein/quests/listeners/BungeePlayerListener.java b/bungee/src/main/java/me/blackvein/quests/listeners/BungeePlayerListener.java deleted file mode 100644 index 8e978c758..000000000 --- a/bungee/src/main/java/me/blackvein/quests/listeners/BungeePlayerListener.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2014 PikaMug and contributors. All rights reserved. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package me.blackvein.quests.listeners; - -import me.blackvein.quests.QuestsBungee; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.config.ServerInfo; -import net.md_5.bungee.api.event.PlayerDisconnectEvent; -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.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.concurrent.TimeUnit; - -public class BungeePlayerListener implements Listener { - private static final String CHANNEL = "quests:update"; - - private final QuestsBungee plugin; - - public BungeePlayerListener(QuestsBungee plugin) { - this.plugin = plugin; - } - - @EventHandler - public void onPlayerLoginOrSwitch(ServerSwitchEvent evt) { - ProxyServer.getInstance().getScheduler().schedule(plugin, () -> { - final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - final DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream); - try { - dataOutputStream.writeUTF("LoadData:" + evt.getPlayer().getUniqueId()); - } catch (IOException e) { - e.printStackTrace(); - } - dispatchMessage(byteArrayOutputStream.toByteArray()); - }, 2, TimeUnit.SECONDS); - } - - @EventHandler - public void onPlayerDisconnect(PlayerDisconnectEvent evt) { - final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - final DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream); - try { - dataOutputStream.writeUTF("SaveData:" + evt.getPlayer().getUniqueId()); - } catch (IOException e) { - e.printStackTrace(); - } - dispatchMessage(byteArrayOutputStream.toByteArray()); - } - - private void dispatchMessage(byte[] message) { - for (ServerInfo server : plugin.getProxy().getServers().values()) { - server.sendData(CHANNEL, message, false); - } - } -} diff --git a/bungee/src/main/resources/bungee.yml b/bungee/src/main/resources/bungee.yml deleted file mode 100644 index 16038342a..000000000 --- a/bungee/src/main/resources/bungee.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: QuestsBungee -main: me.blackvein.quests.QuestsBungee -version: ${project.version}-b${env.BUILD_NUMBER} -description: An extensive questing system. -author: PikaMug \ No newline at end of file diff --git a/core/src/main/java/me/blackvein/quests/Quests.java b/core/src/main/java/me/blackvein/quests/Quests.java index 788adf776..2b9d7accb 100644 --- a/core/src/main/java/me/blackvein/quests/Quests.java +++ b/core/src/main/java/me/blackvein/quests/Quests.java @@ -37,7 +37,6 @@ import me.blackvein.quests.exceptions.QuestFormatException; import me.blackvein.quests.exceptions.StageFormatException; import me.blackvein.quests.interfaces.ReloadCallback; import me.blackvein.quests.listeners.BlockListener; -import me.blackvein.quests.listeners.BungeeListener; import me.blackvein.quests.listeners.CommandManager; import me.blackvein.quests.listeners.ConvoListener; import me.blackvein.quests.listeners.ItemListener; @@ -161,7 +160,6 @@ public class Quests extends JavaPlugin implements QuestsAPI { private ConditionFactory conditionFactory; private ConvoListener convoListener; private BlockListener blockListener; - private BungeeListener bungeeListener; private ItemListener itemListener; private NpcListener npcListener; private PlayerListener playerListener; @@ -190,7 +188,6 @@ public class Quests extends JavaPlugin implements QuestsAPI { } convoListener = new ConvoListener(); blockListener = new BlockListener(this); - bungeeListener = new BungeeListener(this); itemListener = new ItemListener(this); npcListener = new NpcListener(this); playerListener = new PlayerListener(this); @@ -271,9 +268,6 @@ public class Quests extends JavaPlugin implements QuestsAPI { } else if (depends.getPartiesApi() != null) { getServer().getPluginManager().registerEvents(getPartiesListener(), this); } - if (hasBungeeEnabled()) { - getServer().getMessenger().registerIncomingPluginChannel(this, "quests:update", getBungeeListener()); - } // 11 - Attempt to check for updates new UpdateChecker(this, 3711).getVersion(version -> { @@ -585,10 +579,6 @@ public class Quests extends JavaPlugin implements QuestsAPI { return blockListener; } - public BungeeListener getBungeeListener() { - return bungeeListener; - } - public ItemListener getItemListener() { return itemListener; } @@ -750,11 +740,6 @@ public class Quests extends JavaPlugin implements QuestsAPI { } } - private boolean hasBungeeEnabled() { - final ConfigurationSection section = getServer().spigot().getConfig().getConfigurationSection("settings"); - return section != null && section.getBoolean("bungeecord"); - } - /** * Transfer language files from jar to disk */ diff --git a/core/src/main/java/me/blackvein/quests/listeners/BungeeListener.java b/core/src/main/java/me/blackvein/quests/listeners/BungeeListener.java deleted file mode 100644 index 65a0cb6bd..000000000 --- a/core/src/main/java/me/blackvein/quests/listeners/BungeeListener.java +++ /dev/null @@ -1,52 +0,0 @@ -package me.blackvein.quests.listeners; - -import me.blackvein.quests.Quester; -import me.blackvein.quests.Quests; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.plugin.messaging.PluginMessageListener; -import org.jetbrains.annotations.NotNull; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import java.util.UUID; - -public class BungeeListener implements PluginMessageListener { - private static final String CHANNEL = "quests:update"; - - private final Quests plugin; - - public BungeeListener(final Quests plugin) { - this.plugin = plugin; - } - - @Override - public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte[] bytes) { - if (!channel.equalsIgnoreCase(CHANNEL) ) { - return; - } - - final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes); - final DataInputStream dataInputStream = new DataInputStream(byteArrayInputStream); - try { - final String input = dataInputStream.readUTF(); - final UUID uuid = UUID.fromString(input.substring(input.lastIndexOf(":") + 1)); - if (input.startsWith("SaveData:")) { - final Quester quester = plugin.getQuester(uuid); - if (quester != null) { - plugin.getLogger().info(ChatColor.GREEN + "[Bungee] Saved quester data for UUID " + uuid); - quester.saveData(); - } - } else if (input.startsWith("LoadData:")) { - final Quester quester = plugin.getQuester(uuid); - if (quester != null) { - plugin.getLogger().info(ChatColor.GREEN + "[Bungee] Loaded quester data for UUID " + uuid); - quester.hasData(); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } -} diff --git a/pom.xml b/pom.xml index ecf0c8a53..b32f7deec 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ v1_8_R3 core dist -