From d1444096734b818d401fd967cc496e69d085255f Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 22 Mar 2019 18:12:07 -0700 Subject: [PATCH] even more comment restyling on repair --- .../config/hocon/skills/ConfigScalingSubSkillRetro.java | 4 ++-- .../hocon/skills/ConfigScalingSubSkillStandard.java | 4 ++-- .../hocon/skills/repair/general/ConfigRepairGeneral.java | 2 +- .../skills/repair/repairmastery/RepairMasteryRetro.java | 8 ++++---- .../repair/repairmastery/RepairMasteryStandard.java | 8 ++++---- .../skills/salvage/general/ConfigSalvageGeneral.java | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillRetro.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillRetro.java index 6f3a5d575..80e5d6107 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillRetro.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillRetro.java @@ -15,7 +15,7 @@ public class ConfigScalingSubSkillRetro { @Setting(value = "Max-Bonus-Level", comment = "Max bonus level is the level a player needs to reach in this skill to receive maximum benefits, such as better RNG odds or otherwise." + "\nSkills dynamically adjust their rewards to match the max bonus level, you can think of it as a curve that calculates what bonuses " + "\n a player should have based on how far they are from the max bonus level value, and the other parameters used for the scaling of the sub-skill." + - "\n\nNote: This is the setting for RETRO MODE!" + + "\n\n-- NOTE: This setting is only valid for retro level scaling! --" + "\nDefault value: "+MAX_BONUS_LEVEL_DEFAULT) private int maxBonusLevel = MAX_BONUS_LEVEL_DEFAULT; @@ -25,7 +25,7 @@ public class ConfigScalingSubSkillRetro { "\nMax skill chance is dynamically adjusted based on the players level difference from the \"Max-Bonus-Level\", you can think of it as a curve where reaching \"Max-Bonus-Level\" is the peak." + "\nAs an example, imagine \"Max-Success-Chance\" was set to " + FIFTY_PERCENT_EXAMPLE + " and the \"Max-Bonus-Level\" was " + MAX_BONUS_LEVEL_EXAMPLE + "," + "\n and the player was level " + FIFTY_PERCENT_EXAMPLE + " for this skill, that would give the player " + ODDS_PERCENTAGE_EXAMPLE + " odds to succeed with this skill." + - "\n\nNote: This is the setting for RETRO MODE!" + + "\n\n-- NOTE: This setting is only valid for retro level scaling! --" + "\nDefault value: "+CHANCE_AT_MAX_SKILL_DEFAULT) private double chanceAtMaxSkill = CHANCE_AT_MAX_SKILL_DEFAULT; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillStandard.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillStandard.java index e203ff4ac..147b20c91 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillStandard.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ConfigScalingSubSkillStandard.java @@ -15,7 +15,7 @@ public class ConfigScalingSubSkillStandard { @Setting(value = "Max-Bonus-Level", comment = "Max bonus level is the level a player needs to reach in this skill to receive maximum benefits, such as better RNG odds or otherwise." + "\nSkills dynamically adjust their rewards to match the max bonus level, you can think of it as a curve that calculates what bonuses " + "\n a player should have based on how far they are from the max bonus level value, and the other parameters used for the scaling of the sub-skill." + - "\n\nNote: This is the setting for STANDARD MODE!" + + "\n\n-- NOTE: This setting is only valid for standard level scaling! --" + "\nDefault value: "+MAX_BONUS_LEVEL_DEFAULT) private int maxBonusLevel = MAX_BONUS_LEVEL_DEFAULT; @@ -25,7 +25,7 @@ public class ConfigScalingSubSkillStandard { "\nMax skill chance is dynamically adjusted based on the players level difference from the \"Max-Bonus-Level\", you can think of it as a curve where reaching \"Max-Bonus-Level\" is the peak." + "\nAs an example, imagine \"Max-Success-Chance\" was set to " + FIFTY_PERCENT_EXAMPLE + " and the \"Max-Bonus-Level\" was " + MAX_BONUS_LEVEL_EXAMPLE + "," + "\n and the player was level " + FIFTY_PERCENT_EXAMPLE + " for this skill, that would give the player " + ODDS_PERCENTAGE_EXAMPLE + " odds to succeed with this skill." + - "\n\nNote: This is the setting for STANDARD MODE!" + + "\n\n-- NOTE: This setting is only valid for standard level scaling! --" + "\nDefault value: "+CHANCE_AT_MAX_SKILL_DEFAULT) private double chanceAtMaxSkill = CHANCE_AT_MAX_SKILL_DEFAULT; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/general/ConfigRepairGeneral.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/general/ConfigRepairGeneral.java index 7d447b3c0..eea6ed5f9 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/general/ConfigRepairGeneral.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/general/ConfigRepairGeneral.java @@ -12,7 +12,7 @@ public class ConfigRepairGeneral { public static final boolean ENCHANTED_ITEMS_REQUIRE_CONFIRM = true; @Setting(value = "Anvil-Block-Material", comment = "The block used for mcMMO repairs." + - "Default value: "+"minecraft:iron_block") + "\nDefault value: "+"minecraft:iron_block") private String repairAnvilMaterial = Material.IRON_BLOCK.getKey().toString(); @Setting(value = "Anvil-Use-Sounds", comment = "If true, mcMMO will play a sound when a player uses an anvil." + diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryRetro.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryRetro.java index 5c66aed3c..b324cd26c 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryRetro.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryRetro.java @@ -12,18 +12,18 @@ public class RepairMasteryRetro { public static final String MAX_BONUS_LEVEL_EXAMPLE = "1000"; public static final String BONUS_PERCENTAGE_EXAMPLE = "100%"; - @Setting(value = "Standard-Mode-Max-Bonus-Level", comment = "At the max bonus level a player will have full benefits from this scaling skill." + + @Setting(value = "Max-Bonus-Level", comment = "At the max bonus level a player will have full benefits from this scaling skill." + "\nSkills dynamically adjust their rewards to match the max bonus level, you can think of it as a curve that calculates what bonuses " + "\n a player should have based on how far they are from the max bonus level value, and the other parameters used for the scaling of the sub-skill." + - "\nNote: This is the setting for STANDARD MODE!" + + "\n-- NOTE: This setting is only valid for retro level scaling! --" + "\nDefault value: "+MAX_BONUS_LEVEL_DEFAULT) private int maxBonusLevel = MAX_BONUS_LEVEL_DEFAULT; - @Setting(value = "Standard-Mode-Max-Bonus-Percentage", comment = "This is the maximum benefit for additional repair amount from this skill when the player reaches \"Max-Bonus-Level\"." + + @Setting(value = "Max-Bonus-Percentage", comment = "This is the maximum benefit for additional repair amount from this skill when the player reaches \"Max-Bonus-Level\"." + "\nRepair Mastery's bonus to repair is dynamically adjusted based on the players level difference from the \"Max-Bonus-Level\", you can think of it as a curve where reaching \"Max-Bonus-Level\" is the peak." + "\nAs an example, imagine \"Standard-Mode-Max-Bonus-Percentage\" was set to " + MAX_BONUS_PERCENTAGE + " and the \"Max-Bonus-Level\" was " + MAX_BONUS_LEVEL_EXAMPLE + "," + "\n and the player was level " + PLAYER_LEVEL_FIFTY_PERCENT_EXAMPLE + " for this skill, that would give the player " + BONUS_PERCENTAGE_EXAMPLE + "% added to the repair amount on the item before other bonuses." + - "\nNote: This is the setting for STANDARD MODE!" + + "\n-- NOTE: This setting is only valid for retro level scaling! --" + "\nDefault value: "+MAX_BONUS_PERCENTAGE) private double maxBonusPercentage = MAX_BONUS_PERCENTAGE; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryStandard.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryStandard.java index b23f48b79..da0df43de 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryStandard.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/repairmastery/RepairMasteryStandard.java @@ -12,18 +12,18 @@ public class RepairMasteryStandard { public static final String MAX_BONUS_LEVEL_EXAMPLE = "100"; public static final String BONUS_PERCENTAGE_EXAMPLE = "100%"; - @Setting(value = "Standard-Mode-Max-Bonus-Level", comment = "At the max bonus level a player will have full benefits from this scaling skill." + + @Setting(value = "Max-Bonus-Level", comment = "At the max bonus level a player will have full benefits from this scaling skill." + "\nSkills dynamically adjust their rewards to match the max bonus level, you can think of it as a curve that calculates what bonuses " + "\n a player should have based on how far they are from the max bonus level value, and the other parameters used for the scaling of the sub-skill." + - "\nNote: This is the setting for STANDARD MODE!" + + "\n-- NOTE: This setting is only valid for standard level scaling! --" + "\nDefault value: "+MAX_BONUS_LEVEL_DEFAULT) private int maxBonusLevel = MAX_BONUS_LEVEL_DEFAULT; - @Setting(value = "Standard-Mode-Max-Bonus-Percentage", comment = "This is the maximum benefit for additional repair amount from this skill when the player reaches \"Max-Bonus-Level\"." + + @Setting(value = "Max-Bonus-Percentage", comment = "This is the maximum benefit for additional repair amount from this skill when the player reaches \"Max-Bonus-Level\"." + "\nRepair Mastery's bonus to repair is dynamically adjusted based on the players level difference from the \"Max-Bonus-Level\", you can think of it as a curve where reaching \"Max-Bonus-Level\" is the peak." + "\nAs an example, imagine \"Standard-Mode-Max-Bonus-Percentage\" was set to " + MAX_BONUS_PERCENTAGE + " and the \"Max-Bonus-Level\" was " + MAX_BONUS_LEVEL_EXAMPLE + "," + "\n and the player was level " + PLAYER_LEVEL_FIFTY_PERCENT_EXAMPLE + " for this skill, that would give the player " + BONUS_PERCENTAGE_EXAMPLE + "% added to the repair amount on the item before other bonuses." + - "\nNote: This is the setting for STANDARD MODE!" + + "\n-- NOTE: This setting is only valid for standard level scaling! --" + "\nDefault value: "+MAX_BONUS_PERCENTAGE) private double maxBonusPercentage = MAX_BONUS_PERCENTAGE; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/general/ConfigSalvageGeneral.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/general/ConfigSalvageGeneral.java index d47241c62..c45911ed7 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/general/ConfigSalvageGeneral.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/salvage/general/ConfigSalvageGeneral.java @@ -11,7 +11,7 @@ public class ConfigSalvageGeneral { public static final boolean ENCHANTED_ITEMS_REQUIRE_CONFIRM = true; @Setting(value = "Anvil-Block-Material", comment = "The block used for mcMMO repairs." + - "Default value: "+"gold_block") + "Default value: "+"minecraft:gold_block") private String salvageAnvilMaterial = Material.GOLD_BLOCK.getKey().toString(); @Setting(value = "Anvil-Use-Sounds", comment = "If true, mcMMO will play a sound when a player uses an anvil." +