EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-01 12:05:27 +02:00
Code Issues Projects Releases Wiki Activity

Refactoring code part 1 to prep for adding a bunch of unit tests

Browse Source
This commit is contained in:
nossr50
2021-04-08 10:39:07 -07:00
parent 0636f578dd
commit 5080d86e44
115 changed files with 993 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -1,6 +1,5 @@
package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
@@ -536,7 +535,7 @@ public final class CombatUtils {
* @return true if the player has access to the limit break
*/
public static boolean canUseLimitBreak(@NotNull Player player, LivingEntity target, @NotNull SubSkillType subSkillType) {
if(target instanceof Player || AdvancedConfig.getInstance().canApplyLimitBreakPVE()) {
if(target instanceof Player || mcMMO.p.getAdvancedConfig().canApplyLimitBreakPVE()) {
return RankUtils.hasUnlockedSubskill(player, subSkillType)
&& Permissions.isSubSkillEnabled(player, subSkillType);
} else {

14
src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.sounds.SoundManager;
import com.gmail.nossr50.util.sounds.SoundType;
import org.apache.commons.lang.math.RandomUtils;
@@ -24,7 +24,7 @@ public final class ParticleEffectUtils {
}
public static void playBleedEffect(LivingEntity livingEntity) {
if (!Config.getInstance().getBleedEffectEnabled()) {
if (!mcMMO.p.getGeneralConfig().getBleedEffectEnabled()) {
return;
}
@@ -63,7 +63,7 @@ public final class ParticleEffectUtils {
public static void playDodgeEffect(Player player) {
if (!Config.getInstance().getDodgeEffectEnabled()) {
if (!mcMMO.p.getGeneralConfig().getDodgeEffectEnabled()) {
return;
}
@@ -71,7 +71,7 @@ public final class ParticleEffectUtils {
}
public static void playFluxEffect(Location location) {
if (!Config.getInstance().getFluxEffectEnabled()) {
if (!mcMMO.p.getGeneralConfig().getFluxEffectEnabled()) {
return;
}
@@ -100,7 +100,7 @@ public final class ParticleEffectUtils {
}
public static void playGreaterImpactEffect(LivingEntity livingEntity) {
if (!Config.getInstance().getGreaterImpactEffectEnabled()) {
if (!mcMMO.p.getGeneralConfig().getGreaterImpactEffectEnabled()) {
return;
}
@@ -110,7 +110,7 @@ public final class ParticleEffectUtils {
}
public static void playCallOfTheWildEffect(LivingEntity livingEntity) {
if (!Config.getInstance().getCallOfTheWildEffectEnabled()) {
if (!mcMMO.p.getGeneralConfig().getCallOfTheWildEffectEnabled()) {
return;
}
@@ -118,7 +118,7 @@ public final class ParticleEffectUtils {
}
public static void playAbilityDisabledEffect(Player player) {
if (!Config.getInstance().getAbilityDeactivationEffectEnabled()) {
if (!mcMMO.p.getGeneralConfig().getAbilityDeactivationEffectEnabled()) {
}
/*if (hasHeadRoom(player)) {

12
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@@ -1,7 +1,5 @@
package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.HiddenConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
@@ -56,8 +54,8 @@ public final class SkillUtils {
public static String[] calculateLengthDisplayValues(Player player, float skillValue, PrimarySkillType skill) {
int maxLength = skill.getAbility().getMaxLength();
int abilityLengthVar = AdvancedConfig.getInstance().getAbilityLength();
int abilityLengthCap = AdvancedConfig.getInstance().getAbilityLengthCap();
int abilityLengthVar = mcMMO.p.getAdvancedConfig().getAbilityLength();
int abilityLengthCap = mcMMO.p.getAdvancedConfig().getAbilityLengthCap();
int length;
@@ -125,7 +123,7 @@ public final class SkillUtils {
* @return true if this is a valid skill, false otherwise
*/
public static boolean isSkill(String skillName) {
return Config.getInstance().getLocale().equalsIgnoreCase("en_US") ? PrimarySkillType.getSkill(skillName) != null : isLocalizedSkill(skillName);
return mcMMO.p.getGeneralConfig().getLocale().equalsIgnoreCase("en_US") ? PrimarySkillType.getSkill(skillName) != null : isLocalizedSkill(skillName);
}
public static void sendSkillMessage(Player player, NotificationType notificationType, String key) {
@@ -183,8 +181,8 @@ public final class SkillUtils {
PrimarySkillType skill = mcMMOPlayer.getAbilityMode(SuperAbilityType.SUPER_BREAKER) ? PrimarySkillType.MINING : PrimarySkillType.EXCAVATION;
int abilityLengthVar = AdvancedConfig.getInstance().getAbilityLength();
int abilityLengthCap = AdvancedConfig.getInstance().getAbilityLengthCap();
int abilityLengthVar = mcMMO.p.getAdvancedConfig().getAbilityLength();
int abilityLengthCap = mcMMO.p.getAdvancedConfig().getAbilityLengthCap();
int ticks;