From b1bf68a0ade19269771a5f34b7c10e579c2ffd63 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Wed, 30 Jan 2019 01:02:55 -0500 Subject: [PATCH] Wtf... why was this still here. --- pom.xml | 7 -- .../MultiverseCore/MultiverseCore.java | 27 -------- .../MultiverseCore/commands/SpoutCommand.java | 66 ------------------- .../MultiverseCore/utils/SpoutInterface.java | 30 --------- 4 files changed, 130 deletions(-) delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java diff --git a/pom.xml b/pom.xml index ce3bb516..b49e6828 100644 --- a/pom.xml +++ b/pom.xml @@ -289,13 +289,6 @@ 1.13.2-R0.1-SNAPSHOT provided - me.main__.util diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index 6d37f01e..f5ac4d11 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -230,7 +230,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { private Buscript buscript; private int pluginCount; private DestinationFactory destFactory; - //private SpoutInterface spoutInterface = null; private MultiverseMessaging messaging; private BlockSafety blockSafety; private LocationManipulation locationManipulation; @@ -334,13 +333,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { this.chatListener = new MVPlayerChatListener(this, this.playerListener); } getServer().getPluginManager().registerEvents(this.chatListener, this); - /* - // Check to see if spout was already loaded (most likely): - if (this.getServer().getPluginManager().getPlugin("Spout") != null) { - this.setSpout(); - this.log(Level.INFO, "Spout integration enabled."); - } - */ this.initializeBuscript(); this.setupMetrics(); @@ -1084,25 +1076,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { this.serverFolder = newServerFolder; } - /* - /** - * Initializes Spout. - * / - public void setSpout() { - this.spoutInterface = new SpoutInterface(); - this.commandHandler.registerCommand(new SpoutCommand(this)); - } - - /** - * Gets our {@link SpoutInterface}. - * - * @return The {@link SpoutInterface} we're using. - * / - public SpoutInterface getSpout() { - return this.spoutInterface; - } - */ - /** * {@inheritDoc} */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java deleted file mode 100644 index 3683d937..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java +++ /dev/null @@ -1,66 +0,0 @@ -/****************************************************************************** - * Multiverse 2 Copyright (c) the Multiverse Team 2011. * - * Multiverse 2 is licensed under the BSD License. * - * For more information please check the README.md file included * - * with this project. * - ******************************************************************************/ -/* -package com.onarandombox.MultiverseCore.commands; - -import com.onarandombox.MultiverseCore.MultiverseCore; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.permissions.PermissionDefault; -import org.getspout.spoutapi.gui.GenericButton; -import org.getspout.spoutapi.gui.GenericPopup; -import org.getspout.spoutapi.gui.PopupScreen; -import org.getspout.spoutapi.player.SpoutPlayer; - -import java.util.List; - -/** - * Edit a world with spout. - * / -public class SpoutCommand extends MultiverseCommand { - - public SpoutCommand(MultiverseCore plugin) { - super(plugin); - this.setName("Edit World with Spout"); - this.setCommandUsage("/mv spout"); - this.setArgRange(0, 0); - this.addKey("mv spout"); - this.setPermission("multiverse.core.spout", "Edit a world with spout.", PermissionDefault.OP); - this.addCommandExample("/mv spout"); - } - - @Override - public void runCommand(CommandSender sender, List args) { - if (!(sender instanceof Player)) { - sender.sendMessage(ChatColor.RED + "This command must be run as a player!"); - return; - } - if (plugin.getSpout() == null) { - sender.sendMessage(ChatColor.RED + "You need spout installed on this server to use it with Multiverse!"); - return; - } - SpoutPlayer p = (SpoutPlayer) sender; - if (!p.isSpoutCraftEnabled()) { - sender.sendMessage(ChatColor.RED + p.getName() + "You need to be using the Spoutcraft client to run this command!"); - return; - } - PopupScreen pop = new GenericPopup(); - GenericButton button = new GenericButton("Fish"); - // TO-DO maybe use constants for these - // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck - button.setX(50); - button.setY(50); - button.setWidth(100); - button.setHeight(40); - // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck - pop.attachWidget(this.plugin, button); - sender.sendMessage(ChatColor.GREEN + "YAY!"); - p.getMainScreen().attachPopupScreen(pop); - } -} -*/ diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java b/src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java deleted file mode 100644 index 19221508..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java +++ /dev/null @@ -1,30 +0,0 @@ -/****************************************************************************** - * Multiverse 2 Copyright (c) the Multiverse Team 2011. * - * Multiverse 2 is licensed under the BSD License. * - * For more information please check the README.md file included * - * with this project. * - ******************************************************************************/ -/* -package com.onarandombox.MultiverseCore.utils; - -import org.getspout.spoutapi.SpoutManager; - -/** - * A helper-class holding the {@link SpoutManager}. - * / -public class SpoutInterface { - private SpoutManager spoutManager; - - public SpoutInterface() { - this.spoutManager = SpoutManager.getInstance(); - } - - /** - * Gets the {@link SpoutManager}. - * @return The {@link SpoutManager}. - * / - public SpoutManager getManager() { - return this.spoutManager; - } -} -*/