*CLEANUP* - mcSpoutListener.java & mcSpoutScreenListener.java

This commit is contained in:
GJ 2012-03-11 01:39:14 -05:00
parent def65282dd
commit 0a8d34a21f
3 changed files with 94 additions and 85 deletions

View File

@ -46,7 +46,6 @@ import com.gmail.nossr50.skills.Repair;
import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.skills.Taming; import com.gmail.nossr50.skills.Taming;
public class mcPlayerListener implements Listener { public class mcPlayerListener implements Listener {
protected static final Logger log = Logger.getLogger("Minecraft"); protected static final Logger log = Logger.getLogger("Minecraft");
private mcMMO plugin; private mcMMO plugin;

View File

@ -10,26 +10,26 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.HUDmmo; import com.gmail.nossr50.datatypes.HUDmmo;
import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.spout.SpoutStuff;
public class mcSpoutListener implements Listener public class mcSpoutListener implements Listener {
{ //Why do we have this here? We never use it...
mcMMO plugin = null; mcMMO plugin = null;
public mcSpoutListener(mcMMO pluginx) public mcSpoutListener(mcMMO pluginx) {
{ plugin = pluginx;
plugin = pluginx; }
}
@EventHandler /**
public void onSpoutCraftEnable(SpoutCraftEnableEvent event) * Monitor SpoutCraftEnable events.
{ *
SpoutPlayer sPlayer = event.getPlayer(); * @param event The event to watch
if(sPlayer.isSpoutCraftEnabled()) */
{ @EventHandler
//Setup Party HUD stuff public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); SpoutPlayer sPlayer = event.getPlayer();
//Party.update(sPlayer); if (sPlayer.isSpoutCraftEnabled()) {
Users.getProfile(sPlayer).toggleSpoutEnabled(); SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); //Setup Party HUD stuff
} Users.getProfile(sPlayer).toggleSpoutEnabled();
} }
}
} }

View File

@ -17,65 +17,75 @@ import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle;
import com.gmail.nossr50.datatypes.popups.PopupMMO; import com.gmail.nossr50.datatypes.popups.PopupMMO;
import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.spout.SpoutStuff;
public class mcSpoutScreenListener implements Listener public class mcSpoutScreenListener implements Listener {
{ //Why do we have this here? We never use it...
mcMMO plugin = null; mcMMO plugin = null;
public mcSpoutScreenListener(mcMMO pluginx)
{
plugin = pluginx;
}
@EventHandler public mcSpoutScreenListener(mcMMO pluginx) {
public void onButtonClick(ButtonClickEvent event) plugin = pluginx;
{ }
SpoutPlayer sPlayer = event.getPlayer();
PlayerProfile PP = Users.getProfile(sPlayer);
if(event.getButton() instanceof ButtonHUDStyle) /**
{ * Monitor Spout ButtonClick events.
if(SpoutStuff.playerHUDs.containsKey(sPlayer)) *
{ * @param event The event to watch
SpoutStuff.playerHUDs.get(sPlayer).resetHUD(); */
SpoutStuff.playerHUDs.remove(sPlayer); @EventHandler
public void onButtonClick(ButtonClickEvent event) {
SpoutPlayer sPlayer = event.getPlayer();
PlayerProfile PP = Users.getProfile(sPlayer);
switch(PP.getHUDType()) if (event.getButton() instanceof ButtonHUDStyle) {
{ if (SpoutStuff.playerHUDs.containsKey(sPlayer)) {
case RETRO: SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
PP.setHUDType(HUDType.STANDARD); SpoutStuff.playerHUDs.remove(sPlayer);
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)); switch (PP.getHUDType()) {
case RETRO:
PP.setHUDType(HUDType.STANDARD);
break;
SpoutStuff.playerScreens.get(sPlayer).updateButtons(PP); case STANDARD:
} PP.setHUDType(HUDType.SMALL);
} else if (event.getButton() instanceof ButtonEscape) break;
{
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 case SMALL:
public void onScreenClose(ScreenCloseEvent event) PP.setHUDType(HUDType.DISABLED);
{ break;
if(event.getScreen() instanceof PopupMMO)
{ case DISABLED:
SpoutStuff.playerScreens.remove(event.getPlayer()); 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());
}
}
} }