From 0a8d34a21ff00cbd3a73c649f44e353064a55b6e Mon Sep 17 00:00:00 2001 From: GJ Date: Sun, 11 Mar 2012 01:39:14 -0500 Subject: [PATCH] *CLEANUP* - mcSpoutListener.java & mcSpoutScreenListener.java --- .../nossr50/listeners/mcPlayerListener.java | 1 - .../nossr50/listeners/mcSpoutListener.java | 44 +++--- .../listeners/mcSpoutScreenListener.java | 134 ++++++++++-------- 3 files changed, 94 insertions(+), 85 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java index 697a9945d..87401712d 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java @@ -46,7 +46,6 @@ import com.gmail.nossr50.skills.Repair; import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.skills.Taming; - public class mcPlayerListener implements Listener { protected static final Logger log = Logger.getLogger("Minecraft"); private mcMMO plugin; diff --git a/src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java b/src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java index 194ed9be0..0ef163356 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java @@ -10,26 +10,26 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.HUDmmo; import com.gmail.nossr50.spout.SpoutStuff; -public class mcSpoutListener implements Listener -{ - mcMMO plugin = null; - - public mcSpoutListener(mcMMO pluginx) - { - plugin = pluginx; - } - - @EventHandler - public void onSpoutCraftEnable(SpoutCraftEnableEvent event) - { - SpoutPlayer sPlayer = event.getPlayer(); - if(sPlayer.isSpoutCraftEnabled()) - { - //Setup Party HUD stuff - SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); +public class mcSpoutListener implements Listener { + //Why do we have this here? We never use it... + mcMMO plugin = null; + + public mcSpoutListener(mcMMO pluginx) { + plugin = pluginx; + } + + /** + * Monitor SpoutCraftEnable events. + * + * @param event The event to watch + */ + @EventHandler + public void onSpoutCraftEnable(SpoutCraftEnableEvent event) { + SpoutPlayer sPlayer = event.getPlayer(); - //Party.update(sPlayer); - Users.getProfile(sPlayer).toggleSpoutEnabled(); - } - } -} \ No newline at end of file + if (sPlayer.isSpoutCraftEnabled()) { + SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); //Setup Party HUD stuff + Users.getProfile(sPlayer).toggleSpoutEnabled(); + } + } +} diff --git a/src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java b/src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java index ea65a99d4..123a68a6f 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java @@ -17,65 +17,75 @@ import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle; import com.gmail.nossr50.datatypes.popups.PopupMMO; import com.gmail.nossr50.spout.SpoutStuff; -public class mcSpoutScreenListener implements Listener -{ - mcMMO plugin = null; - public mcSpoutScreenListener(mcMMO pluginx) - { - plugin = pluginx; - } - - @EventHandler - public void onButtonClick(ButtonClickEvent event) - { - SpoutPlayer sPlayer = event.getPlayer(); - PlayerProfile PP = Users.getProfile(sPlayer); - - if(event.getButton() instanceof ButtonHUDStyle) - { - if(SpoutStuff.playerHUDs.containsKey(sPlayer)) - { - SpoutStuff.playerHUDs.get(sPlayer).resetHUD(); - SpoutStuff.playerHUDs.remove(sPlayer); - - switch(PP.getHUDType()) - { - case RETRO: - PP.setHUDType(HUDType.STANDARD); - break; - case STANDARD: - PP.setHUDType(HUDType.SMALL); - break; - case SMALL: - PP.setHUDType(HUDType.DISABLED); - break; - case DISABLED: - PP.setHUDType(HUDType.RETRO); - } - - SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); - - SpoutStuff.playerScreens.get(sPlayer).updateButtons(PP); - } - } else if (event.getButton() instanceof ButtonEscape) - { - sPlayer.getMainScreen().closePopup(); - } else if (event.getButton() instanceof ButtonPartyToggle) - { - PP.togglePartyHUD(); - ButtonPartyToggle bpt = (ButtonPartyToggle)event.getButton(); - bpt.updateText(PP); - SpoutStuff.playerHUDs.get(sPlayer).resetHUD(); - SpoutStuff.playerHUDs.get(sPlayer).initializeHUD(sPlayer); - } - } - - @EventHandler - public void onScreenClose(ScreenCloseEvent event) - { - if(event.getScreen() instanceof PopupMMO) - { - SpoutStuff.playerScreens.remove(event.getPlayer()); - } - } -} \ No newline at end of file +public class mcSpoutScreenListener implements Listener { + //Why do we have this here? We never use it... + mcMMO plugin = null; + + public mcSpoutScreenListener(mcMMO pluginx) { + plugin = pluginx; + } + + /** + * Monitor Spout ButtonClick events. + * + * @param event The event to watch + */ + @EventHandler + public void onButtonClick(ButtonClickEvent event) { + SpoutPlayer sPlayer = event.getPlayer(); + PlayerProfile PP = Users.getProfile(sPlayer); + + if (event.getButton() instanceof ButtonHUDStyle) { + if (SpoutStuff.playerHUDs.containsKey(sPlayer)) { + SpoutStuff.playerHUDs.get(sPlayer).resetHUD(); + SpoutStuff.playerHUDs.remove(sPlayer); + + switch (PP.getHUDType()) { + case RETRO: + PP.setHUDType(HUDType.STANDARD); + break; + + case STANDARD: + PP.setHUDType(HUDType.SMALL); + break; + + case SMALL: + PP.setHUDType(HUDType.DISABLED); + break; + + case DISABLED: + PP.setHUDType(HUDType.RETRO); + break; + + default: + break; + } + + SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); + SpoutStuff.playerScreens.get(sPlayer).updateButtons(PP); + } + } + else if (event.getButton() instanceof ButtonEscape) { + sPlayer.getMainScreen().closePopup(); + } + else if (event.getButton() instanceof ButtonPartyToggle) { + PP.togglePartyHUD(); + ButtonPartyToggle bpt = (ButtonPartyToggle) event.getButton(); + bpt.updateText(PP); + SpoutStuff.playerHUDs.get(sPlayer).resetHUD(); + SpoutStuff.playerHUDs.get(sPlayer).initializeHUD(sPlayer); + } + } + + /** + * Monitor Spout ScreenClose events. + * + * @param event The event to watch + */ + @EventHandler + public void onScreenClose(ScreenCloseEvent event) { + if (event.getScreen() instanceof PopupMMO) { + SpoutStuff.playerScreens.remove(event.getPlayer()); + } + } +}