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

new config pt 9

Browse Source
This commit is contained in:
nossr50
2019-02-16 16:09:48 -08:00
parent 2de87f7189
commit 9731b9cffb
164 changed files with 3195 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
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.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;

18
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.config.MainConfig;
import com.gmail.nossr50.mcMMO;
import org.bukkit.*;
import org.bukkit.FireworkEffect.Type;
@@ -18,7 +18,7 @@ public final class ParticleEffectUtils {
private ParticleEffectUtils() {};
public static void playBleedEffect(LivingEntity livingEntity) {
if (!Config.getInstance().getBleedEffectEnabled()) {
if (!MainConfig.getInstance().getBleedEffectEnabled()) {
return;
}
@@ -26,7 +26,7 @@ public final class ParticleEffectUtils {
}
public static void playDodgeEffect(Player player) {
if (!Config.getInstance().getDodgeEffectEnabled()) {
if (!MainConfig.getInstance().getDodgeEffectEnabled()) {
return;
}
@@ -34,7 +34,7 @@ public final class ParticleEffectUtils {
}
public static void playFluxEffect(Location location) {
if (!Config.getInstance().getFluxEffectEnabled()) {
if (!MainConfig.getInstance().getFluxEffectEnabled()) {
return;
}
@@ -58,7 +58,7 @@ public final class ParticleEffectUtils {
}
public static void playGreaterImpactEffect(LivingEntity livingEntity) {
if (!Config.getInstance().getGreaterImpactEffectEnabled()) {
if (!MainConfig.getInstance().getGreaterImpactEffectEnabled()) {
return;
}
@@ -68,7 +68,7 @@ public final class ParticleEffectUtils {
}
public static void playCallOfTheWildEffect(LivingEntity livingEntity) {
if (!Config.getInstance().getCallOfTheWildEffectEnabled()) {
if (!MainConfig.getInstance().getCallOfTheWildEffectEnabled()) {
return;
}
@@ -76,7 +76,7 @@ public final class ParticleEffectUtils {
}
public static void playAbilityEnabledEffect(Player player) {
if (!Config.getInstance().getAbilityActivationEffectEnabled()) {
if (!MainConfig.getInstance().getAbilityActivationEffectEnabled()) {
return;
}
@@ -86,7 +86,7 @@ public final class ParticleEffectUtils {
}
public static void playAbilityDisabledEffect(Player player) {
if (!Config.getInstance().getAbilityDeactivationEffectEnabled()) {
if (!MainConfig.getInstance().getAbilityDeactivationEffectEnabled()) {
return;
}
@@ -103,7 +103,7 @@ public final class ParticleEffectUtils {
Firework firework = (Firework) player.getWorld().spawnEntity(location, EntityType.FIREWORK);
firework.setMetadata(mcMMO.funfettiMetadataKey, new FixedMetadataValue(mcMMO.p, null));
FireworkMeta fireworkMeta = firework.getFireworkMeta();
FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(color).with((Config.getInstance().getLargeFireworks() ? Type.BALL_LARGE : Type.BALL)).trail(true).build();
FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(color).with((MainConfig.getInstance().getLargeFireworks() ? Type.BALL_LARGE : Type.BALL)).trail(true).build();
fireworkMeta.addEffect(effect);
fireworkMeta.addEffect(effect);
fireworkMeta.setPower(0);

1
src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java
View File

@@ -1,6 +1,5 @@
package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.util.Permissions;
import org.bukkit.entity.Player;

1
src/main/java/com/gmail/nossr50/util/skills/RankUtils.java
View File

@@ -1,6 +1,5 @@
package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.RankConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;

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

@@ -1,8 +1,6 @@
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.config.MainConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
@@ -117,7 +115,7 @@ public 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 MainConfig.getInstance().getLocale().equalsIgnoreCase("en_US") ? PrimarySkillType.getSkill(skillName) != null : isLocalizedSkill(skillName);
}
public static void sendSkillMessage(Player player, NotificationType notificationType, String key) {
@@ -131,7 +129,7 @@ public class SkillUtils {
}
public static void handleAbilitySpeedIncrease(Player player) {
if (HiddenConfig.getInstance().useEnchantmentBuffs()) {
if (HiddenMainConfig.getInstance().useEnchantmentBuffs()) {
ItemStack heldItem = player.getInventory().getItemInMainHand();
if (heldItem == null || heldItem.getType() == Material.AIR) {
@@ -189,7 +187,7 @@ public class SkillUtils {
}
public static void handleAbilitySpeedDecrease(Player player) {
if (!HiddenConfig.getInstance().useEnchantmentBuffs()) {
if (!HiddenMainConfig.getInstance().useEnchantmentBuffs()) {
return;
}