EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Skills refactoring

Browse Source
This commit is contained in:
GJ
2012-05-01 13:58:47 -04:00
parent e2265dd6f7
commit edaa51593b
30 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

443
src/main/java/com/gmail/nossr50/skills/Skills.java
View File

@ -1,443 +0,0 @@
package com.gmail.nossr50.skills;
import org.bukkit.ChatColor;
import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.getspout.spoutapi.SpoutManager;
import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.util.Leaderboard;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.PlayerStat;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.ToolType;
import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
import com.gmail.nossr50.locale.LocaleLoader;
public class Skills {
private final static int TIME_CONVERSION_FACTOR = 1000;
private final static double MAX_DISTANCE_AWAY = 10.0;
/**
* Checks to see if the cooldown for an item or ability is expired.
*
* @param oldTime The time the ability or item was last used
* @param cooldown The amount of time that must pass between uses
* @return true if the cooldown is over, false otherwise
*/
public static boolean cooldownOver(long oldTime, int cooldown){
long currentTime = System.currentTimeMillis();
if (currentTime - oldTime >= (cooldown * TIME_CONVERSION_FACTOR)) {
return true;
}
else {
return false;
}
}
/**
* Calculate the time remaining until the cooldown expires.
*
* @param deactivatedTimeStamp Time of deactivation
* @param cooldown The length of the cooldown
* @return the number of seconds remaining before the cooldown expires
*/
public static int calculateTimeLeft(long deactivatedTimeStamp, int cooldown) {
return (int) (((deactivatedTimeStamp + (cooldown * TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / TIME_CONVERSION_FACTOR);
}
/**
* Sends a message to the player when the cooldown expires.
*
* @param player The player to send a message to
* @param PP The profile of the player
* @param curTime The current system time
* @param ability The ability to watch cooldowns for
*/
public static void watchCooldown(Player player, PlayerProfile PP, long curTime, AbilityType ability) {
if (!PP.getAbilityInformed(ability) && curTime - (PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR) >= (ability.getCooldown() * TIME_CONVERSION_FACTOR)) {
PP.setAbilityInformed(ability, true);
player.sendMessage(ability.getAbilityRefresh());
}
}
/**
* Process activating abilities & readying the tool.
*
* @param player The player using the ability
* @param skill The skill the ability is tied to
*/
public static void activationCheck(Player player, SkillType skill) {
if (Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() && !player.isSneaking()) {
return;
}
PlayerProfile PP = Users.getProfile(player);
AbilityType ability = skill.getAbility();
ToolType tool = skill.getTool();
ItemStack inHand = player.getItemInHand();
/* Check if any abilities are active */
if (!PP.getAbilityUse()) {
return;
}
for (AbilityType x : AbilityType.values()) {
if (PP.getAbilityMode(x)) {
return;
}
}
/* Woodcutting & Axes need to be treated differently.
* Basically the tool always needs to ready and we check to see if the cooldown is over when the user takes action
*/
if (ability.getPermissions(player) && tool.inHand(inHand) && !PP.getToolPreparationMode(tool)) {
if (skill != SkillType.WOODCUTTING && skill != SkillType.AXES) {
if (!PP.getAbilityMode(ability) && !cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
player.sendMessage(LocaleLoader.getString("Skills.TooTired") + ChatColor.YELLOW + " (" + calculateTimeLeft(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown()) + "s)");
return;
}
}
if (Config.getInstance().getAbilityMessagesEnabled()) {
player.sendMessage(tool.getRaiseTool());
}
PP.setToolPreparationATS(tool, System.currentTimeMillis());
PP.setToolPreparationMode(tool, true);
}
}
/**
* Monitors various things relating to skill abilities.
*
* @param player The player using the skill
* @param PP The profile of the player
* @param curTime The current system time
* @param skill The skill being monitored
*/
public static void monitorSkill(Player player, PlayerProfile PP, long curTime, SkillType skill) {
final int FOUR_SECONDS = 4000;
ToolType tool = skill.getTool();
AbilityType ability = skill.getAbility();
if (PP.getToolPreparationMode(tool) && curTime - (PP.getToolPreparationATS(tool) * TIME_CONVERSION_FACTOR) >= FOUR_SECONDS) {
PP.setToolPreparationMode(tool, false);
player.sendMessage(tool.getLowerTool());
}
if (ability.getPermissions(player)) {
if (PP.getAbilityMode(ability) && (PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR) <= curTime) {
PP.setAbilityMode(ability, false);
PP.setAbilityInformed(ability, false);
player.sendMessage(ability.getAbilityOff());
for (Player y : player.getWorld().getPlayers()) {
if (y != player && Misc.isNear(player.getLocation(), y.getLocation(), MAX_DISTANCE_AWAY)) {
y.sendMessage(ability.getAbilityPlayerOff(player));
}
}
}
}
}
/**
* Update the leaderboards.
*
* @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) {
PlayerProfile PP = Users.getProfile(player);
PlayerStat ps = new PlayerStat();
if (skillType != SkillType.ALL) {
ps.statVal = PP.getSkillLevel(skillType);
}
else {
ps.statVal = PP.getPowerLevel();
}
ps.name = player.getName();
Leaderboard.updateLeaderboard(ps, skillType);
}
/**
* Check the XP of a skill.
*
* @param skillType The skill to check
* @param player The player whose skill to check
*/
public static void XpCheckSkill(SkillType skillType, Player player) {
PlayerProfile PP = Users.getProfile(player);
int skillups = 0;
if (PP.getSkillXpLevel(skillType) >= PP.getXpToLevel(skillType)) {
while (PP.getSkillXpLevel(skillType) >= PP.getXpToLevel(skillType)) {
if ((skillType.getMaxLevel() >= PP.getSkillLevel(skillType) + 1) && (Misc.getPowerLevelCap() >= PP.getPowerLevel() + 1)) {
PP.removeXP(skillType, PP.getXpToLevel(skillType));
skillups++;
PP.skillUp(skillType, 1);
McMMOPlayerLevelUpEvent eventToFire = new McMMOPlayerLevelUpEvent(player, skillType);
mcMMO.p.getServer().getPluginManager().callEvent(eventToFire);
}
else {
PP.addLevels(skillType, 0);
}
}
if (!Config.getInstance().getUseMySQL()) {
ProcessLeaderboardUpdate(skillType, player);
ProcessLeaderboardUpdate(SkillType.ALL, player);
}
String capitalized = Misc.getCapitalized(skillType.toString());
/* Spout Stuff */
if (Config.getInstance().spoutEnabled && player instanceof SpoutPlayer) {
SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
if (sPlayer.isSpoutCraftEnabled()) {
if (Config.getInstance().getSpoutXPBarEnabled()) {
SpoutStuff.updateXpBar(player);
}
SpoutStuff.levelUpNotification(skillType, sPlayer);
/* Update custom titles */
if (Config.getInstance().getShowPowerLevelForSpout()) {
sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE + "." + ChatColor.GREEN + String.valueOf(PP.getPowerLevel()));
}
}
else {
player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", new Object[] {String.valueOf(skillups), PP.getSkillLevel(skillType)}));
}
}
else {
player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", new Object[] {String.valueOf(skillups), PP.getSkillLevel(skillType)}));
}
}
/* Always update XP Bar (Check if no levels were gained first to remove redundancy) */
if (skillups == 0 && Config.getInstance().spoutEnabled && player instanceof SpoutPlayer) {
SpoutPlayer sPlayer = (SpoutPlayer) player;
if (sPlayer.isSpoutCraftEnabled()) {
if (Config.getInstance().getSpoutXPBarEnabled()) {
SpoutStuff.updateXpBar(player);
}
}
}
}
/**
* Check XP of all skills.
*
* @param player The player to check XP for.
*/
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);
}
}
/**
* Get the skill represented by the given string
*
* @param skillName The name of the skill
* @return the SkillType if it exists, null otherwise
*/
public static SkillType getSkillType(String skillName) {
for (SkillType x : SkillType.values()) {
if (x.toString().equals(skillName.toUpperCase()))
return x;
}
return null;
}
/**
* Checks if the given string represents a valid skill
*
* @param skillname The name of the skill to check
* @return true if this is a valid skill, false otherwise
*/
public static boolean isSkill(String skillName) {
if (getSkillType(skillName) != null) {
return true;
}
else {
return false;
}
}
/**
* Check if the player has any combat skill permissions.
*
* @param player The player to check permissions for
* @return true if the player has combat skills, false otherwise
*/
public static boolean hasCombatSkills(Player player) {
if (Permissions.getInstance().axes(player)
|| Permissions.getInstance().archery(player)
|| Permissions.getInstance().swords(player)
|| Permissions.getInstance().taming(player)
|| Permissions.getInstance().unarmed(player)) {
return true;
}
else {
return false;
}
}
/**
* Check if the player has any gathering skill permissions.
*
* @param player The player to check permissions for
* @return true if the player has gathering skills, false otherwise
*/
public static boolean hasGatheringSkills(Player player) {
if (Permissions.getInstance().excavation(player)
|| Permissions.getInstance().fishing(player)
|| Permissions.getInstance().herbalism(player)
|| Permissions.getInstance().mining(player)
|| Permissions.getInstance().woodcutting(player)) {
return true;
}
else {
return false;
}
}
/**
* Check if the player has any misc skill permissions.
*
* @param player The player to check permissions for
* @return true if the player has misc skills, false otherwise
*/
public static boolean hasMiscSkills(Player player) {
if (Permissions.getInstance().acrobatics(player) || Permissions.getInstance().repair(player)) {
return true;
}
else {
return false;
}
}
/**
* Handle tool durability loss from abilities.
*
* @param inhand The item to damage
* @param durabilityLoss The durability to remove from the item
*/
public static void abilityDurabilityLoss(ItemStack inhand, int durabilityLoss) {
if (Config.getInstance().getAbilitiesDamageTools()) {
if (!inhand.containsEnchantment(Enchantment.DURABILITY)) {
inhand.setDurability((short) (inhand.getDurability() + durabilityLoss));
}
}
}
/**
* Check to see if an ability can be activated.
*
* @param player The player activating the ability
* @param type The skill the ability is based on
*/
public static void abilityCheck(Player player, SkillType type) {
PlayerProfile PP = Users.getProfile(player);
AbilityType ability = type.getAbility();
ToolType tool = type.getTool();
if (type.getTool().inHand(player.getItemInHand())) {
if (PP.getToolPreparationMode(tool)) {
PP.setToolPreparationMode(tool, false);
}
/* Axes and Woodcutting are odd because they share the same tool.
* We show them the too tired message when they take action.
*/
if (type == SkillType.WOODCUTTING || type == SkillType.AXES) {
if (!PP.getAbilityMode(ability) && !cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
player.sendMessage(LocaleLoader.getString("Skills.TooTired") + ChatColor.YELLOW + " (" + calculateTimeLeft(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown()) + "s)");
return;
}
}
int ticks = 2 + (PP.getSkillLevel(type) / 50);
if (!PP.getAbilityMode(ability) && cooldownOver(PP.getSkillDATS(ability), ability.getCooldown())) {
player.sendMessage(ability.getAbilityOn());
for (Player y : player.getWorld().getPlayers()) {
if (y != player && Misc.isNear(player.getLocation(), y.getLocation(), MAX_DISTANCE_AWAY)) {
y.sendMessage(ability.getAbilityPlayer(player));
}
}
PP.setSkillDATS(ability, System.currentTimeMillis()+(ticks * TIME_CONVERSION_FACTOR));
PP.setAbilityMode(ability, true);
}
}
}
/**
* Check to see if ability should be triggered.
*
* @param player The player using the ability
* @param block The block modified by the ability
* @param ability The ability to check
* @return true if the ability should activate, false otherwise
*/
public static boolean triggerCheck(Player player, Block block, AbilityType ability) {
boolean activate = true;
if (!ability.getPermissions(player)) {
activate = false;
return activate;
}
switch (ability) {
case BERSERK:
case GIGA_DRILL_BREAKER:
case SUPER_BREAKER:
case LEAF_BLOWER:
if (!Misc.blockBreakSimulate(block, player, true)) {
activate = false;
break;
}
/* FALLS THROUGH */
case GREEN_TERRA:
if (!ability.blockCheck(block.getType())) {
activate = false;
break;
}
break;
default:
activate = false;
break;
}
return activate;
}
}

2
src/main/java/com/gmail/nossr50/skills/Archery.java → src/main/java/com/gmail/nossr50/skills/combat/Archery.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.combat;
import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Axes.java → src/main/java/com/gmail/nossr50/skills/combat/Axes.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.combat;
import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Swords.java → src/main/java/com/gmail/nossr50/skills/combat/Swords.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.combat;
import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Taming.java → src/main/java/com/gmail/nossr50/skills/combat/Taming.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.combat;
import java.util.Random;

2
src/main/java/com/gmail/nossr50/skills/Unarmed.java → src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.combat;
import java.util.Random;

3
src/main/java/com/gmail/nossr50/skills/BlastMining.java → src/main/java/com/gmail/nossr50/skills/gathering/BlastMining.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList;
import java.util.HashSet;
@ -23,6 +23,7 @@ import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class BlastMining {

3
src/main/java/com/gmail/nossr50/skills/Excavation.java → src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList;
import java.util.List;
@ -13,6 +13,7 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;

3
src/main/java/com/gmail/nossr50/skills/Fishing.java → src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList;
import java.util.List;
@ -27,6 +27,7 @@ import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class Fishing {

3
src/main/java/com/gmail/nossr50/skills/Herbalism.java → src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.gathering;
import java.util.Random;
@ -20,6 +20,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.runnables.GreenThumbTimer;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class Herbalism {

3
src/main/java/com/gmail/nossr50/skills/Mining.java → src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.gathering;
import java.util.Random;
@ -16,6 +16,7 @@ import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile;

3
src/main/java/com/gmail/nossr50/skills/WoodCutting.java → src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList;
import java.util.Random;
@ -23,6 +23,7 @@ import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import org.getspout.spoutapi.sound.SoundEffect;

3
src/main/java/com/gmail/nossr50/skills/Acrobatics.java → src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.misc;
import java.util.Random;
@ -12,6 +12,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
public class Acrobatics {

3
src/main/java/com/gmail/nossr50/skills/Repair.java → src/main/java/com/gmail/nossr50/skills/misc/Repair.java
View File

@ -1,4 +1,4 @@
package com.gmail.nossr50.skills;
package com.gmail.nossr50.skills.misc;
import java.util.Map;
import java.util.Random;
@ -20,6 +20,7 @@ import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;