mirror of
				https://github.com/mcMMO-Dev/mcMMO.git
				synced 2025-11-04 11:03:43 +01:00 
			
		
		
		
	Some misc cleanup, including removing some leftover April Fools stuff
This commit is contained in:
		@@ -10,7 +10,7 @@ import java.util.HashMap;
 | 
			
		||||
@ConfigSerializable
 | 
			
		||||
public class ConfigExperienceFormula {
 | 
			
		||||
 | 
			
		||||
    public static final boolean CUMULATIVE_CURVE_DEFAULT = false;
 | 
			
		||||
    private static final boolean CUMULATIVE_CURVE_DEFAULT = false;
 | 
			
		||||
    private static final HashMap<PrimarySkillType, Float> SKILL_FORMULA_MODIFIER_DEFAULT;
 | 
			
		||||
 | 
			
		||||
    static {
 | 
			
		||||
 
 | 
			
		||||
@@ -6,8 +6,8 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
 | 
			
		||||
@ConfigSerializable
 | 
			
		||||
public class ConfigLevelEarlyGameBoost {
 | 
			
		||||
 | 
			
		||||
    public static final boolean EARLY_GAME_BOOST_DEFAULT = true;
 | 
			
		||||
    public static final double BOOST_MULTIPLIER_DEFAULT = 0.05D;
 | 
			
		||||
    private static final boolean EARLY_GAME_BOOST_DEFAULT = true;
 | 
			
		||||
    private static final double BOOST_MULTIPLIER_DEFAULT = 0.05D;
 | 
			
		||||
 | 
			
		||||
    @Setting(value = "Enabled", comment = "If set to true, the early game XP boost will be applied." +
 | 
			
		||||
            "\nDefault value: " + EARLY_GAME_BOOST_DEFAULT)
 | 
			
		||||
 
 | 
			
		||||
@@ -11,17 +11,8 @@ import static com.gmail.nossr50.datatypes.skills.PrimarySkillType.*;
 | 
			
		||||
@ConfigSerializable
 | 
			
		||||
public class ConfigLevelingDiminishedReturns {
 | 
			
		||||
 | 
			
		||||
    /*
 | 
			
		||||
    Diminished_Returns:
 | 
			
		||||
    #This is the minimum amount of XP a player will earn after reaching the timed threshold (this is to prevent punishing a player too hard for earning XP)
 | 
			
		||||
    ## A value of 1 would mean that a player gets FULL XP, which defeats the purpose of diminished returns, the default value is 0.05 (5% minimum XP)
 | 
			
		||||
    ### Set this value to 0 to turn it off
 | 
			
		||||
    Guaranteed_Minimum_Percentage: 0.05
 | 
			
		||||
    Enabled: false
 | 
			
		||||
     */
 | 
			
		||||
 | 
			
		||||
    private static final HashMap<PrimarySkillType, Integer> SKILL_THRESHOLDS_DEFAULT;
 | 
			
		||||
    public static final float GURANTEED_MIN_DEFAULT = 0.05f;
 | 
			
		||||
    private static final float GUARANTEED_MIN_DEFAULT = 0.05f;
 | 
			
		||||
 | 
			
		||||
    static {
 | 
			
		||||
        SKILL_THRESHOLDS_DEFAULT = new HashMap<>();
 | 
			
		||||
@@ -59,7 +50,7 @@ public class ConfigLevelingDiminishedReturns {
 | 
			
		||||
    @Setting(value = "Guaranteed-Minimum", comment = "The multiplier applied to an XP gain when a player has reached diminishing returns to guarantee that some XP is still gained." +
 | 
			
		||||
            "\nPlayers will gain (raw XP * guaranteedMinimum) if they are under sever enough diminishing return penalty (ie their XP would normally fall below this value)" +
 | 
			
		||||
            "\nDefault value: ")
 | 
			
		||||
    private float guaranteedMinimums = GURANTEED_MIN_DEFAULT;
 | 
			
		||||
    private float guaranteedMinimums = GUARANTEED_MIN_DEFAULT;
 | 
			
		||||
 | 
			
		||||
    public int getSkillThreshold(PrimarySkillType primarySkillType) {
 | 
			
		||||
        if (skillThresholds.get(primarySkillType) == null)
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
 | 
			
		||||
@ConfigSerializable
 | 
			
		||||
public class ConfigSectionLevelCaps {
 | 
			
		||||
    /* DEFAULT VALUES */
 | 
			
		||||
    public static final boolean TRUNCATE_SKILLS_ABOVE_CAP_DEFAULT = true;
 | 
			
		||||
    private static final boolean TRUNCATE_SKILLS_ABOVE_CAP_DEFAULT = true;
 | 
			
		||||
 | 
			
		||||
    /*
 | 
			
		||||
     * CONFIG NODES
 | 
			
		||||
 
 | 
			
		||||
@@ -159,10 +159,6 @@ commands:
 | 
			
		||||
        aliases: [mcsb]
 | 
			
		||||
        description: Manage your mcMMO scoreboard
 | 
			
		||||
        permission: mcmmo.commands.mcscoreboard
 | 
			
		||||
    mcfools:
 | 
			
		||||
        aliases: [macho, jumping, throwing, wrecking, crafting, walking, swimming, falling, climbing, flying, diving, piggy]
 | 
			
		||||
        description: Deploy jokes
 | 
			
		||||
        permission: mcmmo.commands.mcfools
 | 
			
		||||
    mcmmoreloadlocale:
 | 
			
		||||
        aliases: [mcreloadlocale]
 | 
			
		||||
        description: Reloads locale
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user