From 2a27048174dd124f6b37b04229fcfd8938002be0 Mon Sep 17 00:00:00 2001 From: GJ Date: Mon, 4 Jun 2012 09:08:41 -0400 Subject: [PATCH] Functions that start with capital letters are bad. --- .../java/com/gmail/nossr50/api/ExperienceAPI.java | 4 ++-- .../gmail/nossr50/commands/general/AddxpCommand.java | 8 ++++---- .../com/gmail/nossr50/listeners/EntityListener.java | 2 +- .../java/com/gmail/nossr50/runnables/GainXp.java | 2 +- .../gmail/nossr50/skills/gathering/Excavation.java | 2 +- .../com/gmail/nossr50/skills/gathering/Fishing.java | 2 +- .../gmail/nossr50/skills/gathering/Herbalism.java | 2 +- .../com/gmail/nossr50/skills/gathering/Mining.java | 2 +- .../gmail/nossr50/skills/gathering/WoodCutting.java | 4 ++-- .../com/gmail/nossr50/skills/misc/Acrobatics.java | 6 +++--- .../java/com/gmail/nossr50/skills/repair/Repair.java | 2 +- src/main/java/com/gmail/nossr50/util/Skills.java | 12 ++++++------ 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java index 2d429e01f..d9ce52a65 100644 --- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java +++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java @@ -16,10 +16,10 @@ public class ExperienceAPI { */ private void checkXP(Player player, SkillType skillType) { if (skillType.equals(SkillType.ALL)) { - Skills.XpCheckAll(player); + Skills.xpCheckAll(player); } else { - Skills.XpCheckSkill(skillType, player); + Skills.xpCheckSkill(skillType, player); } } diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java index b0e893914..2277b5553 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java @@ -59,10 +59,10 @@ public class AddxpCommand implements CommandExecutor { modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale. if (skill.equals(SkillType.ALL)) { - Skills.XpCheckAll(modifiedPlayer); + Skills.xpCheckAll(modifiedPlayer); } else { - Skills.XpCheckSkill(skill, modifiedPlayer); + Skills.xpCheckSkill(skill, modifiedPlayer); } } else { @@ -109,10 +109,10 @@ public class AddxpCommand implements CommandExecutor { modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale. if (skill.equals(SkillType.ALL)) { - Skills.XpCheckAll(modifiedPlayer); + Skills.xpCheckAll(modifiedPlayer); } else { - Skills.XpCheckSkill(skill, modifiedPlayer); + Skills.xpCheckSkill(skill, modifiedPlayer); } } else { diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 5dfc47e67..1e67dfae8 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -314,7 +314,7 @@ public class EntityListener implements Listener { } PP.addXP(player, SkillType.TAMING, xp); - Skills.XpCheckSkill(SkillType.TAMING, player); + Skills.xpCheckSkill(SkillType.TAMING, player); } } } diff --git a/src/main/java/com/gmail/nossr50/runnables/GainXp.java b/src/main/java/com/gmail/nossr50/runnables/GainXp.java index c061bf7ce..4ab834d29 100644 --- a/src/main/java/com/gmail/nossr50/runnables/GainXp.java +++ b/src/main/java/com/gmail/nossr50/runnables/GainXp.java @@ -40,6 +40,6 @@ public class GainXp implements Runnable { } PP.addXP(player, skillType, (int) (damage * baseXp)); - Skills.XpCheckSkill(skillType, player); + Skills.xpCheckSkill(skillType, player); } } diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java b/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java index 5dfcc5bfd..3cc559a15 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java @@ -109,7 +109,7 @@ public class Excavation { //Handle XP related tasks PP.addXP(player, SkillType.EXCAVATION, xp); - Skills.XpCheckSkill(SkillType.EXCAVATION, player); + Skills.xpCheckSkill(SkillType.EXCAVATION, player); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java index 7a798e405..441500125 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java @@ -118,7 +118,7 @@ public class Fishing { } PP.addXP(player, SkillType.FISHING, Config.getInstance().getFishingBaseXP()); - Skills.XpCheckSkill(SkillType.FISHING, player); + Skills.xpCheckSkill(SkillType.FISHING, player); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java index 19261cb40..0594247b9 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java @@ -289,7 +289,7 @@ public class Herbalism { } PP.addXP(player, SkillType.HERBALISM, xp); - Skills.XpCheckSkill(SkillType.HERBALISM, player); + Skills.xpCheckSkill(SkillType.HERBALISM, player); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java index ca7bce82d..9bfd992c1 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java @@ -276,7 +276,7 @@ public class Mining { } PP.addXP(player, SkillType.MINING, xp); - Skills.XpCheckSkill(SkillType.MINING, player); + Skills.xpCheckSkill(SkillType.MINING, player); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java index 0c049261f..2ecc5267b 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java @@ -204,7 +204,7 @@ public class WoodCutting { if (Permissions.getInstance().woodcutting(player)) { PP.addXP(player, SkillType.WOODCUTTING, xp); //Tree Feller gives nerf'd XP - Skills.XpCheckSkill(SkillType.WOODCUTTING, player); + Skills.xpCheckSkill(SkillType.WOODCUTTING, player); } } @@ -385,7 +385,7 @@ public class WoodCutting { WoodCutting.woodCuttingProcCheck(player, block); PP.addXP(player, SkillType.WOODCUTTING, xp); - Skills.XpCheckSkill(SkillType.WOODCUTTING, player); + Skills.xpCheckSkill(SkillType.WOODCUTTING, player); } /** diff --git a/src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java b/src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java index b15952b6c..1a2d6b2c8 100644 --- a/src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java +++ b/src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java @@ -59,7 +59,7 @@ public class Acrobatics { /* Check for death */ if (health - damage >= 1) { PP.addXP(player, SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER); - Skills.XpCheckSkill(SkillType.ACROBATICS, player); + Skills.xpCheckSkill(SkillType.ACROBATICS, player); event.setDamage(newDamage); @@ -77,7 +77,7 @@ public class Acrobatics { } else if (health - damage >= 1) { PP.addXP(player, SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER); - Skills.XpCheckSkill(SkillType.ACROBATICS, player); + Skills.xpCheckSkill(SkillType.ACROBATICS, player); } } @@ -112,7 +112,7 @@ public class Acrobatics { if (System.currentTimeMillis() >= (5000 + PPd.getRespawnATS()) && defender.getHealth() >= 1) { PPd.addXP(defender, SkillType.ACROBATICS, damage * DODGE_MODIFIER); - Skills.XpCheckSkill(SkillType.ACROBATICS, defender); + Skills.xpCheckSkill(SkillType.ACROBATICS, defender); } int newDamage = damage / 2; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java index 0b6fd04ed..06170eec3 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java @@ -43,7 +43,7 @@ public class Repair { dif = (short) (dif * modify); PP.addXP(player, SkillType.REPAIR, dif * 10); - Skills.XpCheckSkill(SkillType.REPAIR, player); + Skills.xpCheckSkill(SkillType.REPAIR, player); //CLANG CLANG if (mcMMO.p.spoutEnabled) { diff --git a/src/main/java/com/gmail/nossr50/util/Skills.java b/src/main/java/com/gmail/nossr50/util/Skills.java index 7b7836fbc..9e311220a 100644 --- a/src/main/java/com/gmail/nossr50/util/Skills.java +++ b/src/main/java/com/gmail/nossr50/util/Skills.java @@ -161,7 +161,7 @@ public class Skills { * @param skillType The skill to update the leaderboards for * @param player The player whose skill to update */ - public static void ProcessLeaderboardUpdate(SkillType skillType, Player player) { + public static void processLeaderboardUpdate(SkillType skillType, Player player) { PlayerProfile PP = Users.getProfile(player); PlayerStat ps = new PlayerStat(); @@ -182,7 +182,7 @@ public class Skills { * @param skillType The skill to check * @param player The player whose skill to check */ - public static void XpCheckSkill(SkillType skillType, Player player) { + public static void xpCheckSkill(SkillType skillType, Player player) { PlayerProfile PP = Users.getProfile(player); int skillups = 0; @@ -203,8 +203,8 @@ public class Skills { } if (!Config.getInstance().getUseMySQL()) { - ProcessLeaderboardUpdate(skillType, player); - ProcessLeaderboardUpdate(SkillType.ALL, player); + processLeaderboardUpdate(skillType, player); + processLeaderboardUpdate(SkillType.ALL, player); } String capitalized = Misc.getCapitalized(skillType.toString()); @@ -250,14 +250,14 @@ public class Skills { * * @param player The player to check XP for. */ - public static void XpCheckAll(Player player) { + public static void xpCheckAll(Player player) { for (SkillType x : SkillType.values()) { //Don't want to do anything with this one if (x == SkillType.ALL) { continue; } - XpCheckSkill(x, player); + xpCheckSkill(x, player); } }