From 41f020bbb7a13b01933bb13de907b5926a44e553 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 15 May 2013 15:39:40 -0400 Subject: [PATCH] Cleaning up our listeners, as well as some Spout stuff. --- src/main/java/com/gmail/nossr50/mcMMO.java | 23 +++++++------------ .../gmail/nossr50/util/spout/SpoutUtils.java | 22 +++--------------- 2 files changed, 11 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index c31ec61b3..989057dc2 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -28,6 +28,7 @@ import com.gmail.nossr50.listeners.EntityListener; import com.gmail.nossr50.listeners.InventoryListener; import com.gmail.nossr50.listeners.PlayerListener; import com.gmail.nossr50.listeners.SelfListener; +import com.gmail.nossr50.listeners.SpoutListener; import com.gmail.nossr50.listeners.WorldListener; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.metrics.MetricsManager; @@ -52,14 +53,6 @@ import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.spout.SpoutUtils; public class mcMMO extends JavaPlugin { - /* Listeners */ - private final PlayerListener playerListener = new PlayerListener(this); - private final BlockListener blockListener = new BlockListener(this); - private final EntityListener entityListener = new EntityListener(this); - private final InventoryListener inventoryListener = new InventoryListener(this); - private final WorldListener worldListener = new WorldListener(this); - private final SelfListener selfListener = new SelfListener(); - /* Managers */ private static ChunkManager placeStore; private static RepairableManager repairableManager; @@ -321,7 +314,7 @@ public class mcMMO extends JavaPlugin { spoutEnabled = true; SpoutConfig.getInstance(); - SpoutUtils.registerCustomEvent(); + getServer().getPluginManager().registerEvents(new SpoutListener(), this); SpoutUtils.preCacheFiles(); SpoutUtils.reloadSpoutPlayers(); // Handle spout players after a /reload } @@ -331,12 +324,12 @@ public class mcMMO extends JavaPlugin { PluginManager pluginManager = getServer().getPluginManager(); // Register events - pluginManager.registerEvents(playerListener, this); - pluginManager.registerEvents(blockListener, this); - pluginManager.registerEvents(entityListener, this); - pluginManager.registerEvents(inventoryListener, this); - pluginManager.registerEvents(selfListener, this); - pluginManager.registerEvents(worldListener, this); + pluginManager.registerEvents(new PlayerListener(this), this); + pluginManager.registerEvents(new BlockListener(this), this); + pluginManager.registerEvents(new EntityListener(this), this); + pluginManager.registerEvents(new InventoryListener(this), this); + pluginManager.registerEvents(new SelfListener(), this); + pluginManager.registerEvents(new WorldListener(this), this); } private void registerCustomRecipes() { diff --git a/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java b/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java index c7ee8ab55..1483f7239 100644 --- a/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java +++ b/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java @@ -13,31 +13,24 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; -import org.getspout.spoutapi.player.FileManager; import org.getspout.spoutapi.player.SpoutPlayer; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.listeners.SpoutListener; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.SkillUtils; public class SpoutUtils { - private static mcMMO plugin = mcMMO.p; - public final static String spoutDirectory = mcMMO.getMainDirectory() + "Resources" + File.separator; public final static String hudDirectory = spoutDirectory + "HUD" + File.separator; public final static String hudStandardDirectory = hudDirectory + "Standard" + File.separator; public final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator; public final static String soundDirectory = spoutDirectory + "Sound" + File.separator; - private final static SpoutListener spoutListener = new SpoutListener(); -// public static Keyboard menuKey; - /** * Write file to disk. * @@ -187,13 +180,6 @@ public class SpoutUtils { return files; } - /** - * Register custom Spout events. - */ - public static void registerCustomEvent() { - plugin.getServer().getPluginManager().registerEvents(spoutListener, plugin); - } - /** * Handle level-up notifications through Spout. * @@ -497,7 +483,7 @@ public class SpoutUtils { } spoutPlayer.sendNotification(LocaleLoader.getString("Spout.LevelUp.1"), LocaleLoader.getString("Spout.LevelUp.2", SkillUtils.getSkillName(skillType), profile.getSkillLevel(skillType)), mat); - SpoutManager.getSoundManager().playCustomSoundEffect(plugin, spoutPlayer, "level.wav", false); + SpoutManager.getSoundManager().playCustomSoundEffect(mcMMO.p, spoutPlayer, "level.wav", false); } /** @@ -542,9 +528,7 @@ public class SpoutUtils { } public static void preCacheFiles() { - extractFiles(); // Extract source materials - - FileManager FM = SpoutManager.getFileManager(); - FM.addToPreLoginCache(plugin, getFiles()); + extractFiles(); + SpoutManager.getFileManager().addToPreLoginCache(mcMMO.p, getFiles()); } }