Disabled Spout support because we aren't using it

This commit is contained in:
main() 2012-03-17 12:27:50 +01:00
parent f60f770b98
commit 62f79e7592
5 changed files with 19 additions and 12 deletions

View File

@ -187,13 +187,13 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Bukkit Dependency --> <!-- Bukkit Dependency -->
<!-- Start of Spout --> <!-- Start of Spout (disabled because we aren't using it)
<dependency> <dependency>
<groupId>org.getspout</groupId> <groupId>org.getspout</groupId>
<artifactId>spoutpluginapi</artifactId> <artifactId>spoutpluginapi</artifactId>
<version>dev-SNAPSHOT</version> <version>dev-SNAPSHOT</version>
</dependency> </dependency>
<!-- End of Spout --> End of Spout -->
<!-- SerializationConfig Dependency --> <!-- SerializationConfig Dependency -->
<dependency> <dependency>
<groupId>me.main__.util</groupId> <groupId>me.main__.util</groupId>

View File

@ -159,7 +159,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
private AllPay banker; private AllPay banker;
private int pluginCount; private int pluginCount;
private DestinationFactory destFactory; private DestinationFactory destFactory;
private SpoutInterface spoutInterface = null; //private SpoutInterface spoutInterface = null;
private MultiverseMessaging messaging; private MultiverseMessaging messaging;
private BlockSafety blockSafety; private BlockSafety blockSafety;
private LocationManipulation locationManipulation; private LocationManipulation locationManipulation;
@ -253,11 +253,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
// A test that had no worlds loaded was being run. This should never happen in production // A test that had no worlds loaded was being run. This should never happen in production
} }
this.saveMVConfig(); this.saveMVConfig();
/*
// Check to see if spout was already loaded (most likely): // Check to see if spout was already loaded (most likely):
if (this.getServer().getPluginManager().getPlugin("Spout") != null) { if (this.getServer().getPluginManager().getPlugin("Spout") != null) {
this.setSpout(); this.setSpout();
this.log(Level.INFO, "Spout integration enabled."); this.log(Level.INFO, "Spout integration enabled.");
} }
*/
} }
private void initializeDestinationFactory() { private void initializeDestinationFactory() {
@ -662,9 +664,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
this.serverFolder = newServerFolder; this.serverFolder = newServerFolder;
} }
/*
/** /**
* Initializes Spout. * Initializes Spout.
*/ * /
public void setSpout() { public void setSpout() {
this.spoutInterface = new SpoutInterface(); this.spoutInterface = new SpoutInterface();
this.commandHandler.registerCommand(new SpoutCommand(this)); this.commandHandler.registerCommand(new SpoutCommand(this));
@ -674,10 +677,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
* Gets our {@link SpoutInterface}. * Gets our {@link SpoutInterface}.
* *
* @return The {@link SpoutInterface} we're using. * @return The {@link SpoutInterface} we're using.
*/ * /
public SpoutInterface getSpout() { public SpoutInterface getSpout() {
return this.spoutInterface; return this.spoutInterface;
} }
*/
/** /**
* {@inheritDoc} * {@inheritDoc}

View File

@ -4,7 +4,7 @@
* For more information please check the README.md file included * * For more information please check the README.md file included *
* with this project. * * with this project. *
******************************************************************************/ ******************************************************************************/
/*
package com.onarandombox.MultiverseCore.commands; package com.onarandombox.MultiverseCore.commands;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
@ -21,7 +21,7 @@ import java.util.List;
/** /**
* Edit a world with spout. * Edit a world with spout.
*/ * /
public class SpoutCommand extends MultiverseCommand { public class SpoutCommand extends MultiverseCommand {
public SpoutCommand(MultiverseCore plugin) { public SpoutCommand(MultiverseCore plugin) {
@ -51,7 +51,7 @@ public class SpoutCommand extends MultiverseCommand {
} }
PopupScreen pop = new GenericPopup(); PopupScreen pop = new GenericPopup();
GenericButton button = new GenericButton("Fish"); GenericButton button = new GenericButton("Fish");
// TODO maybe use constants for these // TO-DO maybe use constants for these
// BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
button.setX(50); button.setX(50);
button.setY(50); button.setY(50);
@ -63,3 +63,4 @@ public class SpoutCommand extends MultiverseCommand {
p.getMainScreen().attachPopupScreen(pop); p.getMainScreen().attachPopupScreen(pop);
} }
} }
*/

View File

@ -16,7 +16,6 @@ import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.PluginEnableEvent;
import java.util.Arrays; import java.util.Arrays;
import java.util.logging.Level;
/** /**
* Multiverse's Plugin {@link Listener}. * Multiverse's Plugin {@link Listener}.
@ -40,10 +39,12 @@ public class MVPluginListener implements Listener {
this.plugin.setBank(this.plugin.getBanker().loadEconPlugin()); this.plugin.setBank(this.plugin.getBanker().loadEconPlugin());
} }
/*
if (event.getPlugin().getDescription().getName().equals("Spout")) { if (event.getPlugin().getDescription().getName().equals("Spout")) {
this.plugin.setSpout(); this.plugin.setSpout();
this.plugin.log(Level.INFO, "Spout integration enabled."); this.plugin.log(Level.INFO, "Spout integration enabled.");
} }
*/
} }
/** /**

View File

@ -4,14 +4,14 @@
* For more information please check the README.md file included * * For more information please check the README.md file included *
* with this project. * * with this project. *
******************************************************************************/ ******************************************************************************/
/*
package com.onarandombox.MultiverseCore.utils; package com.onarandombox.MultiverseCore.utils;
import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.SpoutManager;
/** /**
* A helper-class holding the {@link SpoutManager}. * A helper-class holding the {@link SpoutManager}.
*/ * /
public class SpoutInterface { public class SpoutInterface {
private SpoutManager spoutManager; private SpoutManager spoutManager;
@ -22,8 +22,9 @@ public class SpoutInterface {
/** /**
* Gets the {@link SpoutManager}. * Gets the {@link SpoutManager}.
* @return The {@link SpoutManager}. * @return The {@link SpoutManager}.
*/ * /
public SpoutManager getManager() { public SpoutManager getManager() {
return this.spoutManager; return this.spoutManager;
} }
} }
*/