From 6ac1c4fa2c72fe5f30e900cf48fd288f861c2799 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 26 Jan 2019 08:27:58 -0800 Subject: [PATCH] JSON Styling will be handled in the Locale instead of the config --- Changelog.txt | 1 + .../gmail/nossr50/config/AdvancedConfig.java | 4 +- src/main/resources/advanced.yml | 86 +------------------ 3 files changed, 4 insertions(+), 87 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 71afaa7ab..a639818e9 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -88,6 +88,7 @@ Version 2.1.0 = (Commands) '/mcMMO help' no longer displays the other/special commands category to players lacking permissions + (Party) Parties can now have size limits (configurable in config.yml), party size is unlimited by default + (Party) You can now turn on Friendly Fire for parties in config.yml + + (Debug Stick) The Debug stick can now tell you about properties of a block related to Excavation ! (Deaths) Fixed the bug where mob names would be replaced by hearts ! (Experience) The XP values of fish are now based on their rarity and have been drastically changed ! (Experience) Skills now start at level 1 (configurable in advanced.yml) diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 52ef49c9b..476bbb165 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -775,7 +775,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { * Used to color our details header in our JSON Hover Object tooltips * @return the ChatColor for this element */ - public ChatColor getJSONStatHoverDetailsColor() + /*public ChatColor getJSONStatHoverDetailsColor() { String keyLocation = "Style.JSON.Hover.Details.Header.Color"; return getChatColorFromKey(keyLocation); @@ -820,7 +820,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public ChatColor getJSONActionBarColor(NotificationType notificationType) { return getChatColor(config.getString("Style.JSON.Notification."+notificationType.toString()+".Color")); - } + }*/ private ChatColor getChatColorFromKey(String keyLocation) { String colorName = config.getString(keyLocation); diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index ecd1b9a1c..d63b53551 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -574,88 +574,4 @@ Skills: # ChanceMax: Maximum chance of receiving double drops (100 = 100%) # MaxBonusLevel: Level when the maximum chance of receiving double drops is reached ChanceMax: 100.0 - MaxBonusLevel: 100 -Style: - JSON: - Notification: - SubSkillFailure: - Color: RED - AbilityOff: - Color: GRAY - LevelRequirementNotMet: - Color: RED - AbilityCoolDown: - Color: RED - LevelUps: - Color: GOLD - ToolReady: - Color: GREEN - SubSkillInteraction: - Color: YELLOW - SubSkillUnlocked: - Color: PURPLE - SuperAbilityInteraction: - Color: DARK_AQUA - SuperAbilityAlertOthers: - Color: - Party: GREEN - Others: DARK_RED - ExperienceGain: - Color: WHITE - Hover: - Details: - Header: - Bold: true - Italics: false - Underline: false - Color: DARK_GRAY - Description: - Bold: true - Italics: false - Underline: false - Color: YELLOW - Target: - Enable: true - Prefix: - Bold: false - Italics: false - Underline: false - Color: YELLOW - Value: - Bold: false - Italics: false - Underline: false - Color: YELLOW - Duration: - Prefix: - Bold: false - Italics: false - Underline: false - Color: GOLD - Value: - Bold: false - Italics: false - Underline: false - Color: GREEN - Reward: - Prefix: - Bold: false - Italics: false - Underline: false - Color: GOLD - Value: - Bold: false - Italics: false - Underline: false - Color: GREEN - Limit: - Prefix: - Bold: false - Italics: false - Underline: false - Color: GOLD - Value: - Bold: false - Italics: false - Underline: false - Color: GREEN + MaxBonusLevel: 100 \ No newline at end of file