mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-07-05 07:04:44 +02:00
Refactoring to make my life easier
This commit is contained in:
Changelog.txtpom.xml
src/main
java
com
gmail
nossr50
api
commands
experience
AddlevelsCommand.javaAddxpCommand.javaExperienceCommand.javaMmoeditCommand.javaSkillresetCommand.java
hardcore
player
server
skills
AcrobaticsCommand.javaAlchemyCommand.javaArcheryCommand.javaAxesCommand.javaExcavationCommand.javaFishingCommand.javaHerbalismCommand.javaMiningCommand.javaRepairCommand.javaSalvageCommand.javaSkillCommand.javaSkillGuideCommand.javaSmeltingCommand.javaSwordsCommand.javaTamingCommand.javaUnarmedCommand.javaWoodcuttingCommand.java
config
database
datatypes
experience
player
skills
events
experience
McMMOPlayerExperienceEvent.javaMcMMOPlayerLevelChangeEvent.javaMcMMOPlayerLevelDownEvent.javaMcMMOPlayerLevelUpEvent.javaMcMMOPlayerXpGainEvent.java
skills
McMMOPlayerSkillEvent.java
abilities
McMMOPlayerAbilityActivateEvent.javaMcMMOPlayerAbilityDeactivateEvent.javaMcMMOPlayerAbilityEvent.java
alchemy
fishing
repair
salvage
secondaryabilities
unarmed
listeners
mcMMO.javaparty
runnables
commands
McrankCommandAsyncTask.javaMcrankCommandDisplayTask.javaMctopCommandAsyncTask.javaMctopCommandDisplayTask.java
database
skills
skills
SkillManager.java
acrobatics
alchemy
archery
axes
child
excavation
fishing
herbalism
mining
repair
salvage
smelting
swords
taming
unarmed
woodcutting
util
BlockUtils.javaEventUtils.javaHardcoreManager.javaHolidayManager.javaMotd.javaPermissions.javaStringUtils.java
commands
experience
scoreboards
skills
resources
@ -3,8 +3,8 @@ package com.gmail.nossr50.skills.repair;
|
||||
import com.gmail.nossr50.config.Config;
|
||||
import com.gmail.nossr50.config.experience.ExperienceConfig;
|
||||
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
|
||||
import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
|
||||
import com.gmail.nossr50.datatypes.skills.SkillType;
|
||||
import com.gmail.nossr50.datatypes.skills.SubSkill;
|
||||
import com.gmail.nossr50.datatypes.skills.PrimarySkill;
|
||||
import com.gmail.nossr50.datatypes.skills.XPGainReason;
|
||||
import com.gmail.nossr50.locale.LocaleLoader;
|
||||
import com.gmail.nossr50.mcMMO;
|
||||
@ -15,7 +15,7 @@ import com.gmail.nossr50.util.EventUtils;
|
||||
import com.gmail.nossr50.util.Misc;
|
||||
import com.gmail.nossr50.util.Permissions;
|
||||
import com.gmail.nossr50.util.StringUtils;
|
||||
import com.gmail.nossr50.util.skills.SecondarySkillActivationType;
|
||||
import com.gmail.nossr50.util.skills.SubSkillActivationType;
|
||||
import com.gmail.nossr50.util.skills.SkillUtils;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
@ -23,7 +23,6 @@ import org.bukkit.enchantments.Enchantment;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.PlayerInventory;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
@ -33,7 +32,7 @@ public class RepairManager extends SkillManager {
|
||||
private int lastClick;
|
||||
|
||||
public RepairManager(McMMOPlayer mcMMOPlayer) {
|
||||
super(mcMMOPlayer, SkillType.REPAIR);
|
||||
super(mcMMOPlayer, PrimarySkill.REPAIR);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -245,12 +244,12 @@ public class RepairManager extends SkillManager {
|
||||
private short repairCalculate(short durability, int repairAmount) {
|
||||
Player player = getPlayer();
|
||||
|
||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.REPAIR_MASTERY)) {
|
||||
if (Permissions.isSubSkillEnabled(player, SubSkill.REPAIR_REPAIR_MASTERY)) {
|
||||
double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
|
||||
repairAmount += bonus;
|
||||
}
|
||||
|
||||
if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SUPER_REPAIR) && checkPlayerProcRepair()) {
|
||||
if (Permissions.isSubSkillEnabled(player, SubSkill.REPAIR_SUPER_REPAIR) && checkPlayerProcRepair()) {
|
||||
repairAmount *= 2.0D;
|
||||
}
|
||||
|
||||
@ -267,7 +266,7 @@ public class RepairManager extends SkillManager {
|
||||
* @return true if bonus granted, false otherwise
|
||||
*/
|
||||
private boolean checkPlayerProcRepair() {
|
||||
if (SkillUtils.isActivationSuccessful(SecondarySkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SecondaryAbility.SUPER_REPAIR, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
|
||||
if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.REPAIR_SUPER_REPAIR, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
|
||||
getPlayer().sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
|
||||
return true;
|
||||
}
|
||||
@ -294,7 +293,7 @@ public class RepairManager extends SkillManager {
|
||||
return;
|
||||
}
|
||||
|
||||
if (getArcaneForgingRank() == 0 || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_FORGING)) {
|
||||
if (getArcaneForgingRank() == 0 || !Permissions.isSubSkillEnabled(player, SubSkill.REPAIR_ARCANE_FORGING)) {
|
||||
for (Enchantment enchant : enchants.keySet()) {
|
||||
item.removeEnchantment(enchant);
|
||||
}
|
||||
|
Reference in New Issue
Block a user