EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 05:36:46 +01:00
Code Issues Projects Releases Wiki Activity

Generic cleanup.

Browse Source
This commit is contained in:
GJ 2012-03-26 09:06:48 -04:00
parent 77462888ff
commit 3ec5894249
4 changed files with 358 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

346
src/main/java/com/gmail/nossr50/datatypes/HUDmmo.java
View File

@ -16,90 +16,99 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.spout.SpoutStuff;
public class HUDmmo public class HUDmmo {
{ private int center_x = 427/2;
int center_x = 427/2; // private int center_y = 240/2; //Any reason we can't just delete this?
int center_y = 240/2;
String playerName = null; private String playerName = null;
Widget xpbar = null;
GenericGradient xpfill = null;
GenericGradient xpbg = null;
GenericGradient xpicon_bg = null;
GenericGradient xpicon_border = null;
GenericTexture xpicon = null;
mcMMO plugin = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO");
public HUDmmo(Player player) private Widget xpbar = null;
{ private GenericGradient xpfill = null;
private GenericGradient xpbg = null;
private GenericGradient xpicon_bg = null;
private GenericGradient xpicon_border = null;
private GenericTexture xpicon = null;
private mcMMO plugin = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO");
public HUDmmo(Player player) {
playerName = player.getName(); playerName = player.getName();
initializeHUD(player); initializeHUD(player);
} }
public void initializeHUD(Player player) /**
{ * Initialize the HUD.
*
* @param player Player whose HUD to initialize
*/
public void initializeHUD(Player player) {
// PlayerProfile PP = Users.getProfile(player); // PlayerProfile PP = Users.getProfile(player);
HUDType type = Users.getProfile(player).getHUDType(); HUDType type = Users.getProfile(player).getHUDType();
SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
//if(LoadProperties.partybar && PP.getPartyHUD()) // if (LoadProperties.partybar && PP.getPartyHUD()) {
//mmoHelper.initialize(SpoutManager.getPlayer(player), plugin); //PARTY HUD // mmoHelper.initialize(sPlayer, plugin); //PARTY HUD
// }
switch(type) switch (type) {
{
case RETRO: case RETRO:
{ initializeXpBarDisplayRetro(sPlayer);
initializeXpBarDisplayRetro(SpoutManager.getPlayer(player));
break; break;
}
case STANDARD: case STANDARD:
{ initializeXpBarDisplayStandard(sPlayer);
initializeXpBarDisplayStandard(SpoutManager.getPlayer(player));
break; break;
}
case SMALL: case SMALL:
{ initializeXpBarDisplaySmall(sPlayer);
initializeXpBarDisplaySmall(SpoutManager.getPlayer(player));
break; break;
}
case DISABLED: case DISABLED:
{ break;
//Do nothing.. :)
} default:
break;
} }
} }
public void updateXpBarDisplay(HUDType type, Player player) /**
{ * Update the XP bar.
switch(type) *
{ * @param type Type of XP bar
* @param player Player whose XP bar to update
*/
public void updateXpBarDisplay(HUDType type, Player player) {
PlayerProfile PP = Users.getProfile(player);
switch (type) {
case RETRO: case RETRO:
{ updateXpBarRetro(player, PP);
updateXpBarRetro(player, Users.getProfile(player));
break; break;
}
case STANDARD: case STANDARD:
{ updateXpBarStandard(player, PP);
updateXpBarStandard(player, Users.getProfile(player));
break; break;
}
case SMALL: case SMALL:
{ updateXpBarStandard(player, PP);
updateXpBarStandard(player, Users.getProfile(player));
break; break;
}
case DISABLED: case DISABLED:
{ break;
//Do nothing.. :)
} default:
break;
} }
} }
public void resetHUD() /**
{ * Reset a player's HUD.
*/
public void resetHUD() {
SpoutPlayer sPlayer = SpoutStuff.getSpoutPlayer(playerName); SpoutPlayer sPlayer = SpoutStuff.getSpoutPlayer(playerName);
// PlayerProfile PP = Users.getProfile(sPlayer); // PlayerProfile PP = Users.getProfile(sPlayer);
if(sPlayer != null)
{ if (sPlayer != null) {
sPlayer.getMainScreen().removeWidgets(plugin); sPlayer.getMainScreen().removeWidgets(plugin);
//Reset the objects //Reset the objects
@ -108,17 +117,22 @@ public class HUDmmo
xpbg = null; xpbg = null;
xpicon = null; xpicon = null;
//if(LoadProperties.partybar && PP.getPartyHUD()) // if (LoadProperties.partybar && PP.getPartyHUD()) {
// mmoHelper.initialize(sPlayer, plugin); // mmoHelper.initialize(sPlayer, plugin);
// }
sPlayer.getMainScreen().setDirty(true); sPlayer.getMainScreen().setDirty(true);
} }
} }
private void initializeXpBarDisplayRetro(SpoutPlayer sPlayer) /**
{ * Initialize Retro XP bar.
*
* @param sPlayer Player to initialize XP bar for
*/
private void initializeXpBarDisplayRetro(SpoutPlayer sPlayer) {
Color border = new Color((float) LoadProperties.xpborder_r, (float) LoadProperties.xpborder_g, (float) LoadProperties.xpborder_b, 1f); Color border = new Color((float) LoadProperties.xpborder_r, (float) LoadProperties.xpborder_g, (float) LoadProperties.xpborder_b, 1f);
Color green = new Color(0, 1f, 0, 1f); Color green = new Color(0f, 1f, 0f, 1f);
Color background = new Color((float) LoadProperties.xpbackground_r, (float) LoadProperties.xpbackground_g, (float) LoadProperties.xpbackground_b, 1f); Color background = new Color((float) LoadProperties.xpbackground_r, (float) LoadProperties.xpbackground_g, (float) LoadProperties.xpbackground_b, 1f);
Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f); Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
@ -130,108 +144,159 @@ public class HUDmmo
xpicon_bg = new GenericGradient(); xpicon_bg = new GenericGradient();
xpicon_border = new GenericGradient(); xpicon_border = new GenericGradient();
xpicon_bg.setBottomColor(darkbg).setTopColor(darkbg).setWidth(4).setHeight(4).setPriority(RenderPriority.High).setX(142).setY(10).setDirty(true); xpicon_bg.setBottomColor(darkbg);
xpicon_border.setBottomColor(border).setTopColor(border).setWidth(6).setHeight(6).setPriority(RenderPriority.Highest).setX(141).setY(9).setDirty(true); xpicon_bg.setTopColor(darkbg);
xpicon_bg.setWidth(4);
xpicon_bg.setHeight(4);
xpicon_bg.setPriority(RenderPriority.High);
xpicon_bg.setX(142);
xpicon_bg.setY(10);
xpicon_bg.setDirty(true);
xpicon.setWidth(6).setHeight(6).setX(141).setY(9).setPriority(RenderPriority.Normal).setDirty(true); xpicon_border.setBottomColor(border);
xpicon_border.setTopColor(border);
xpicon_border.setWidth(6);
xpicon_border.setHeight(6);
xpicon_border.setPriority(RenderPriority.Highest);
xpicon_border.setX(141);
xpicon_border.setY(9);
xpicon_border.setDirty(true);
xpicon.setWidth(6);
xpicon.setHeight(6);
xpicon.setX(141);
xpicon.setY(9);
xpicon.setPriority(RenderPriority.Normal);
xpicon.setDirty(true);
xpicon.setUrl("Icon_r.png"); xpicon.setUrl("Icon_r.png");
xpbar.setWidth(128).setHeight(4).setX(149).setY(10); xpbar.setWidth(128);
((GenericGradient) xpbar).setBottomColor(border).setTopColor(border).setPriority(RenderPriority.Highest).setDirty(true); xpbar.setHeight(4);
xpbar.setX(149);
xpbar.setY(10);
((GenericGradient) xpbar).setBottomColor(border);
((GenericGradient) xpbar).setTopColor(border);
xpbar.setPriority(RenderPriority.Highest);
xpbar.setDirty(true);
xpfill.setWidth(0).setHeight(2).setX(150).setY(11); xpfill.setWidth(0);
xpfill.setBottomColor(green).setTopColor(green).setPriority(RenderPriority.Lowest).setDirty(true); xpfill.setHeight(2);
xpfill.setX(150);
xpfill.setY(11);
xpfill.setBottomColor(green);
xpfill.setTopColor(green);
xpfill.setPriority(RenderPriority.Lowest);
xpfill.setDirty(true);
xpbg.setWidth(126).setHeight(2).setX(150).setY(11); xpbg.setWidth(126);
xpbg.setBottomColor(background).setTopColor(background).setPriority(RenderPriority.Low).setDirty(true); xpbg.setHeight(2);
xpbg.setX(150);
xpbg.setY(11);
xpbg.setBottomColor(background);
xpbg.setTopColor(background);
xpbg.setPriority(RenderPriority.Low);
xpbg.setDirty(true);
if(LoadProperties.xpbar) if (LoadProperties.xpbar) {
{ sPlayer.getMainScreen().attachWidget(plugin, xpbar);
sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpbar); sPlayer.getMainScreen().attachWidget(plugin, xpfill);
sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpfill); sPlayer.getMainScreen().attachWidget(plugin, xpbg);
sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpbg);
if(LoadProperties.xpicon) if (LoadProperties.xpicon) {
{ sPlayer.getMainScreen().attachWidget(plugin, xpicon);
sPlayer.getMainScreen().attachWidget(plugin, (GenericTexture)xpicon); sPlayer.getMainScreen().attachWidget(plugin, xpicon_bg);
sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpicon_bg); sPlayer.getMainScreen().attachWidget(plugin, xpicon_border);
} }
sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpicon_border);
} }
sPlayer.getMainScreen().setDirty(true); sPlayer.getMainScreen().setDirty(true);
} }
private void initializeXpBarDisplayStandard(SpoutPlayer sPlayer) /**
{ * Initialize Standard XP bar.
//Setup xp bar *
* @param sPlayer Player to initialize XP bar for
*/
private void initializeXpBarDisplayStandard(SpoutPlayer sPlayer) {
if (LoadProperties.xpbar) {
xpbar = new GenericTexture(); xpbar = new GenericTexture();
if(LoadProperties.xpbar && LoadProperties.xpicon) ((GenericTexture) xpbar).setUrl("xpbar_inc000.png");
{
xpbar.setX(LoadProperties.xpbar_x);
xpbar.setY(LoadProperties.xpbar_y);
xpbar.setHeight(8);
xpbar.setWidth(256);
sPlayer.getMainScreen().attachWidget(plugin, xpbar);
if (LoadProperties.xpicon) {
xpicon = new GenericTexture(); xpicon = new GenericTexture();
xpicon.setUrl("Icon.png"); xpicon.setUrl("Icon.png");
xpicon.setHeight(16);
xpicon.setHeight(16).setWidth(32).setX(LoadProperties.xpicon_x).setY(LoadProperties.xpicon_y); xpicon.setWidth(32);
xpicon.setX(LoadProperties.xpicon_x);
xpicon.setY(LoadProperties.xpicon_y);
xpicon.setDirty(true); xpicon.setDirty(true);
sPlayer.getMainScreen().attachWidget(plugin, xpicon); sPlayer.getMainScreen().attachWidget(plugin, xpicon);
} }
if(LoadProperties.xpbar)
{
((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
xpbar.setX(LoadProperties.xpbar_x).setY(LoadProperties.xpbar_y).setHeight(8).setWidth(256);
sPlayer.getMainScreen().attachWidget(plugin, xpbar);
} }
sPlayer.getMainScreen().setDirty(true); sPlayer.getMainScreen().setDirty(true);
} }
private void initializeXpBarDisplaySmall(SpoutPlayer sPlayer) /**
{ * Initialize Small XP bar.
//Setup xp bar *
* @param sPlayer Player to initialize XP bar for
*/
private void initializeXpBarDisplaySmall(SpoutPlayer sPlayer) {
if (LoadProperties.xpbar) {
xpbar = new GenericTexture(); xpbar = new GenericTexture();
if(LoadProperties.xpbar && LoadProperties.xpicon) ((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
{ xpbar.setX(center_x - 64);
xpbar.setY(LoadProperties.xpbar_y);
xpbar.setHeight(4);
xpbar.setWidth(128);
sPlayer.getMainScreen().attachWidget(plugin, xpbar);
if (LoadProperties.xpicon) {
xpicon = new GenericTexture(); xpicon = new GenericTexture();
xpicon.setUrl("Icon.png"); xpicon.setUrl("Icon.png");
xpicon.setHeight(8);
xpicon.setHeight(8).setWidth(16).setX(center_x-(8+64)).setY(LoadProperties.xpicon_y+2); xpicon.setWidth(16);
xpicon.setX(center_x - (8 + 64));
xpicon.setY(LoadProperties.xpicon_y + 2);
xpicon.setDirty(true); xpicon.setDirty(true);
sPlayer.getMainScreen().attachWidget(plugin, xpicon); sPlayer.getMainScreen().attachWidget(plugin, xpicon);
} }
if(LoadProperties.xpbar)
{
((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
xpbar.setX(center_x-64).setY(LoadProperties.xpbar_y).setHeight(4).setWidth(128);
sPlayer.getMainScreen().attachWidget(plugin, xpbar);
} }
sPlayer.getMainScreen().setDirty(true); sPlayer.getMainScreen().setDirty(true);
} }
private void updateXpBarStandard(Player player, PlayerProfile PP) /**
{ * Update XP bar for Standard & Small styles.
if(!LoadProperties.xpbar) *
* @param player Player whose XP bar to update
* @param PP Profile of the given player
*/
private void updateXpBarStandard(Player player, PlayerProfile PP) {
if (!LoadProperties.xpbar) {
return; return;
}
SkillType theType = null; SkillType theType = getType(PP);
if(PP.getXpBarLocked()) if (theType == null) { //Can this ever actually BE null?
theType=PP.getSkillLock();
else
theType=PP.getLastGained();
if(theType == null)
return; return;
}
((GenericTexture) xpicon).setUrl(m.getCapitalized(theType.toString()) + ".png"); ((GenericTexture) xpicon).setUrl(m.getCapitalized(theType.toString()) + ".png");
xpicon.setDirty(true); xpicon.setDirty(true);
@ -242,29 +307,31 @@ public class HUDmmo
SpoutManager.getPlayer(player).getMainScreen().setDirty(true); SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
} }
private void updateXpBarRetro(Player player, PlayerProfile PP) /**
{ * Update XP bar for Retro styles.
if(!LoadProperties.xpbar) *
* @param player Player whose XP bar to update
* @param PP Profile of the given player
*/
private void updateXpBarRetro(Player player, PlayerProfile PP) {
if (!LoadProperties.xpbar) {
return; return;
SkillType theType = null; }
if(PP.getXpBarLocked() && PP.getSkillLock() != null) SkillType theType = getType(PP);
theType=PP.getSkillLock();
else
theType=PP.getLastGained();
if(theType == null) if (theType == null) { //Can this ever actually BE null?
return; return;
}
Color color = getRetroColor(theType); Color color = getRetroColor(theType);
if(xpicon != null && theType != null)
xpicon.setUrl(m.getCapitalized(theType.toString()) + "_r.png"); xpicon.setUrl(m.getCapitalized(theType.toString()) + "_r.png");
if(theType != null) xpfill.setBottomColor(color);
xpfill.setBottomColor(color).setTopColor(color).setWidth(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.RETRO)).setDirty(true); xpfill.setTopColor(color);
else xpfill.setWidth(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.RETRO));
System.out.println("theType was null!"); xpfill.setDirty(true);
SpoutManager.getPlayer(player).getMainScreen().setDirty(true); SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
} }
@ -273,28 +340,40 @@ public class HUDmmo
switch (type) { switch (type) {
case ACROBATICS: case ACROBATICS:
return new Color((float) LoadProperties.acrobatics_r, (float) LoadProperties.acrobatics_g, (float) LoadProperties.acrobatics_b, 1f); return new Color((float) LoadProperties.acrobatics_r, (float) LoadProperties.acrobatics_g, (float) LoadProperties.acrobatics_b, 1f);
case ARCHERY: case ARCHERY:
return new Color((float) LoadProperties.archery_r, (float) LoadProperties.archery_g, (float) LoadProperties.archery_b, 1f); return new Color((float) LoadProperties.archery_r, (float) LoadProperties.archery_g, (float) LoadProperties.archery_b, 1f);
case AXES: case AXES:
return new Color((float) LoadProperties.axes_r, (float) LoadProperties.axes_g, (float) LoadProperties.axes_b, 1f); return new Color((float) LoadProperties.axes_r, (float) LoadProperties.axes_g, (float) LoadProperties.axes_b, 1f);
case EXCAVATION: case EXCAVATION:
return new Color((float) LoadProperties.excavation_r, (float) LoadProperties.excavation_g, (float) LoadProperties.excavation_b, 1f); return new Color((float) LoadProperties.excavation_r, (float) LoadProperties.excavation_g, (float) LoadProperties.excavation_b, 1f);
case HERBALISM: case HERBALISM:
return new Color((float) LoadProperties.herbalism_r, (float) LoadProperties.herbalism_g, (float) LoadProperties.herbalism_b, 1f); return new Color((float) LoadProperties.herbalism_r, (float) LoadProperties.herbalism_g, (float) LoadProperties.herbalism_b, 1f);
case MINING: case MINING:
return new Color((float) LoadProperties.mining_r, (float) LoadProperties.mining_g, (float) LoadProperties.mining_b, 1f); return new Color((float) LoadProperties.mining_r, (float) LoadProperties.mining_g, (float) LoadProperties.mining_b, 1f);
case REPAIR: case REPAIR:
return new Color((float) LoadProperties.repair_r, (float) LoadProperties.repair_g, (float) LoadProperties.repair_b, 1f); return new Color((float) LoadProperties.repair_r, (float) LoadProperties.repair_g, (float) LoadProperties.repair_b, 1f);
case SWORDS: case SWORDS:
return new Color((float) LoadProperties.swords_r, (float) LoadProperties.swords_g, (float) LoadProperties.swords_b, 1f); return new Color((float) LoadProperties.swords_r, (float) LoadProperties.swords_g, (float) LoadProperties.swords_b, 1f);
case TAMING: case TAMING:
return new Color((float) LoadProperties.taming_r, (float) LoadProperties.taming_g, (float) LoadProperties.taming_b, 1f); return new Color((float) LoadProperties.taming_r, (float) LoadProperties.taming_g, (float) LoadProperties.taming_b, 1f);
case UNARMED: case UNARMED:
return new Color((float) LoadProperties.unarmed_r, (float) LoadProperties.unarmed_g, (float) LoadProperties.unarmed_b, 1f); return new Color((float) LoadProperties.unarmed_r, (float) LoadProperties.unarmed_g, (float) LoadProperties.unarmed_b, 1f);
case WOODCUTTING: case WOODCUTTING:
return new Color((float) LoadProperties.woodcutting_r, (float) LoadProperties.woodcutting_g, (float) LoadProperties.woodcutting_b, 1f); return new Color((float) LoadProperties.woodcutting_r, (float) LoadProperties.woodcutting_g, (float) LoadProperties.woodcutting_b, 1f);
case FISHING: case FISHING:
return new Color((float) LoadProperties.fishing_r, (float) LoadProperties.fishing_g, (float) LoadProperties.fishing_b, 1f); return new Color((float) LoadProperties.fishing_r, (float) LoadProperties.fishing_g, (float) LoadProperties.fishing_b, 1f);
default: default:
return new Color(0.3f, 0.3f, 0.75f, 1f); return new Color(0.3f, 0.3f, 0.75f, 1f);
} }
@ -334,4 +413,13 @@ public class HUDmmo
return (int) (percentage / inc); return (int) (percentage / inc);
} }
private static SkillType getType(PlayerProfile PP) {
if (PP.getXpBarLocked()) {
return PP.getSkillLock();
}
else {
return PP.getLastGained();
}
}
} }

2
src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
View File

@ -581,6 +581,6 @@ public class SpoutStuff {
* @param player The player whose bar to update * @param player The player whose bar to update
*/ */
public static void updateXpBar(Player player) { public static void updateXpBar(Player player) {
playerHUDs.get(player).updateXpBarDisplay(Users.getProfile(player).getHUDType(), player); playerHUDs.get(player).updateXpBarDisplay(Users.getProfile(player).getHUDType(), player); //Is there a reason we can't just do HUDmmo.updateXpBarDisplay?
} }
} }