Reorganized config.yml and cleaned up

Unfortunately, nobody will see our nice super-pretty config.yml copied out properly just yet
Fortunately, maven filtering dark magic lets us stick in when it was copied out.

Changelog.txt

@@ -11,6 +11,8 @@ Version 1.3.00-dev
  - Fixed Tree Feller not playing nice with NoCheat (?)
  - Added framework for new Blast Mining skill
  - Changed Tree Feller to use per-use ArrayList
+ - Prettied up new config files
+ - Removed duplicate settings in config.yml
  
 Version 1.2.12
  - Fixed issue that caused terrible MySQL performance and negative XP on levelup (Issue #134)

src/main/java/com/gmail/nossr50/config/LoadProperties.java

@@ -159,7 +159,7 @@ public class LoadProperties {
 		enableAbilities = readBoolean("Abilities.Enabled", true);
 
 		donateMessage = readBoolean("Commands.mcmmo.Donate_Message", true);
-		xpGainsMobSpawners = readBoolean("XP.Gains.Mobspawners.Enabled", false);
+		xpGainsMobSpawners = readBoolean("Experience.Gains.Mobspawners.Enabled", false);
 
 		bonesConsumedByCOTW = readInteger("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10);
 
@@ -314,8 +314,9 @@ public class LoadProperties {
 		chimaeraId = readInteger("Items.Chimaera_Wing.Item_ID", 288);
 		chimaeraWingEnable = readBoolean("Items.Chimaera_Wing.Enabled", true);
 
-		pvpxp = readBoolean("XP.PVP.Rewards", true);
+		pvpxp = readBoolean("Experience.PVP.Rewards", true);
 		pvpxprewardmodifier = readDouble("Experience.Gains.Multiplier.PVP", 1.0);
+
 		miningrequirespickaxe = readBoolean("Skills.Mining.Requires_Pickaxe", true);
 		excavationRequiresShovel = readBoolean("Skills.Excavation.Requires_Shovel", true);
 		woodcuttingrequiresaxe = readBoolean("Skills.Woodcutting.Requires_Axe", true);

src/main/resources/config.yml

@@ -1,108 +1,94 @@
+#
+#  mcMMO configuration
+#    First generated on ${project.version}-b${BUILD_NUMBER}
+#
+#####
+
+#
+#  Settings for mcMMO in general
+###
+General:
+    HP_Regeneration:
+        Enabled: true
+    Locale: en_us
+    MySpawn:
+        Enabled: true
+    MOTD:
+        Enabled: true
+    #Amount of time (in minutes) to wait between saves of player information
+    Save_Interval: 10
+    #Allow mcMMO to report on basic anonymous usage
+    Stats_Tracking: true
+    #Allow mcMMO to inform other plugins of damage being dealt
+    Event_Callback: true
+
+#
+#  Settings for using a mySQL database
+###
+MySQL:
+    Enabled: false
+    Database:
+        User:
+            Name: UserName
+            Password: UserPassword
+        Name: DataBaseName
+        TablePrefix: mcmmo_
+    Server:
+        Port: 3306
+        Address: localhost
+
+#
+#  Settings for mcMMO items
+###
 Items:
     Chimaera_Wing:
         Enabled: true
         Feather_Cost: 10
         Item_ID: 288
-Spout:
-    Menu:
-        Key: KEY_M
-    XP:
-        Bar:
-            Enabled: true
-            X_POS: 95
-            Y_POS: 6
-        Icon:
-            Enabled: true
-            X_POS: 78
-            Y_POS: 2
-    Party:
-        HUD:
-            Show_Faces: true
-            Enabled: true
-            Show_Display_Name: false
-    HUD:
-        Default: STANDARD
-        Retro:
-            Colors:
-                Swords:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Taming:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Acrobatics:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Border:
-                    BLUE: 0.0
-                    GREEN: 0.0
-                    RED: 0.0
-                Background:
-                    BLUE: 0.75
-                    GREEN: 0.75
-                    RED: 0.75
-                Woodcutting:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Archery:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Axes:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Repair:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Fishing:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Excavation:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Herbalism:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Unarmed:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-                Mining:
-                    BLUE: 0.75
-                    GREEN: 0.3
-                    RED: 0.3
-Fishing:
-    Drops:
-        Gold_Tools: true
-        Diamond_Armor: true
-        Stone_Tools: true
-        Diamonds: true
-        Iron_Armor: true
-        Iron_Tools: true
-        Diamond_Tools: true
-        Item_Drops_Enabled: true
-        Records: true
-        Blaze_Rod: true
-        Leather_Armor: true
-        Drop_Chance:
-            Tier_1: 20
-            Tier_2: 25
-            Tier_3: 30
-            Tier_4: 35
-            Tier_5: 40
-        Gold_Armor: true
-        Glowstone_Dust: true
-        Ender_Pearl: true
-        Wooden_Tools: true
+
+#
+#  Settings for Arcane Forging
+###
+Arcane_Forging:
+    Keep_Enchants:
+        Chance:
+            Rank_4: 40
+            Rank_3: 30
+            Rank_2: 20
+            Rank_1: 10
+    May_Lose_Enchants:
+        Enabled: true
+    Downgrades:
+        Enabled: true
+        Chance:
+            Rank_4: 15
+            Rank_3: 25
+            Rank_2: 50
+            Rank_1: 75
+
+#
+#  Settings for Abilities
+###
+Abilities:
+    Enabled: true
+    Messages: true
+    Activation:
+        Only_Activate_When_Sneaking: false
+    Cooldowns:
+        Giga_Drill_Breaker: 240
+        Berserk: 240
+        Green_Terra: 240
+        Skull_Splitter: 240
+        Serrated_Strikes: 240
+        Tree_Feller: 240
+        Super_Breaker: 240
+    Tools:
+        Durability_Loss_Enabled: true
+        Durability_Loss: 2
+
+#
+#  Settings for Skills
+###
 Skills:
     Acrobatics:
         Level_Cap: 0    #Level cap of 0 for no limit
@@ -127,6 +113,8 @@ Skills:
         Requires_Pickaxe: true
     Repair:
         Level_Cap: 0
+        Anvil_Messages: true
+        Anvil_ID: 42
         Leather:
             Name: Leather
             ID: 334
@@ -142,15 +130,13 @@ Skills:
         Gold:
             Name: Gold Bars
             ID: 266
-        Anvil_Messages: true
-        Anvil_ID: 42
+        Iron:
+            Name: Iron Bars
+            ID: 265
         Diamond:
             Name: Diamond
             Level_Required: 50
             ID: 264
-        Iron:
-            Name: Iron Bars
-            ID: 265
     Swords:
         Level_Cap: 0
     Taming:
@@ -162,9 +148,19 @@ Skills:
     Woodcutting:
         Level_Cap: 0
         Requires_Axe: true
+
+#
+#  Settings for XP distribution
+###
 Experience:
-    Fishing:
-        Base: 800
+    Gains:
+        Mobspawners:
+            Enabled: false
+        Multiplier:
+            PVP: 1
+            Global: 1.0
+    PVP:
+        Rewards: true
     Formula:
         Multiplier:
             Swords: 1.0
@@ -179,14 +175,8 @@ Experience:
             Archery: 1.0
             Axes: 1.0
             Repair: 1.0
-    Gains:
-        Mobspawners:
-            Enabled: false
-        Multiplier:
-            PVP: 1
-            Global: 1.0
-    PVP:
-        Rewards: true
+    Fishing:
+        Base: 800
     Excavation:
         Base: 40
         Cake: 3000
@@ -237,37 +227,37 @@ Experience:
         End_Stone: 150
         Moss_Stone: 30
         Stone_Brick: 30
-MySQL:
-    Enabled: false
-    Database:
-        User:
-            Name: UserName
-            Password: UserPassword
-        Name: DataBaseName
-        TablePrefix: mcmmo_
-    Server:
-        Port: 3306
-        Address: localhost
-XP:
-    Gains:
-        Mobspawners:
-            Enabled: false
-    PVP:
-        Rewards: true
-General:
-    HP_Regeneration:
-        Enabled: true
-    Locale: en_us
-    MySpawn:
-        Enabled: true
-    MOTD:
-        Enabled: true
-    #Amount of time (in minutes) to wait between saves of player information
-    Save_Interval: 10
-    #Allow mcMMO to report on basic anonymous usage
-    Stats_Tracking: true
-    #Allow mcMMO to inform other plugins of damage being dealt
-    Event_Callback: true
+
+#
+#  Settings for Fishing
+###
+Fishing:
+    Drops:
+        Item_Drops_Enabled: true
+        Drop_Chance:
+            Tier_1: 20
+            Tier_2: 25
+            Tier_3: 30
+            Tier_4: 35
+            Tier_5: 40
+        Gold_Tools: true
+        Diamond_Armor: true
+        Stone_Tools: true
+        Diamonds: true
+        Iron_Armor: true
+        Iron_Tools: true
+        Diamond_Tools: true
+        Records: true
+        Blaze_Rod: true
+        Leather_Armor: true
+        Gold_Armor: true
+        Glowstone_Dust: true
+        Ender_Pearl: true
+        Wooden_Tools: true
+
+#
+#  Settings for Excavation
+###
 Excavation:
     Drops:
         Cake: true
@@ -288,38 +278,10 @@ Excavation:
         Music: true
         Diamond: true
         Cocoa_Beans: true
-Arcane_Forging:
-    Keep_Enchants:
-        Chance:
-            Rank_4: 40
-            Rank_3: 30
-            Rank_2: 20
-            Rank_1: 10
-    May_Lose_Enchants:
-        Enabled: true
-    Downgrades:
-        Enabled: true
-        Chance:
-            Rank_4: 15
-            Rank_3: 25
-            Rank_2: 50
-            Rank_1: 75
-Abilities:
-    Activation:
-        Only_Activate_When_Sneaking: false
-    Enabled: true
-    Messages: true
-    Cooldowns:
-        Giga_Drill_Breaker: 240
-        Berserk: 240
-        Green_Terra: 240
-        Skull_Splitter: 240
-        Serrated_Strikes: 240
-        Tree_Feller: 240
-        Super_Breaker: 240
-    Tools:
-        Durability_Loss: 2
-        Durability_Loss_Enabled: true
+
+#
+#  Settings for commands
+###
 Commands:
     invite:
         Enabled: true
@@ -363,4 +325,85 @@ Commands:
         Display_Names: true
     a:
         Enabled: true
-        Display_Names: true
+        Display_Names: true
+
+#
+#  Settings for Spout features
+###
+Spout:
+    Menu:
+        Key: KEY_M
+    XP:
+        Bar:
+            Enabled: true
+            X_POS: 95
+            Y_POS: 6
+        Icon:
+            Enabled: true
+            X_POS: 78
+            Y_POS: 2
+    Party:
+        HUD:
+            Show_Faces: true
+            Enabled: true
+            Show_Display_Name: false
+    HUD:
+        Default: STANDARD
+        Retro:
+            Colors:
+                Swords:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Taming:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Acrobatics:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Border:
+                    BLUE: 0.0
+                    GREEN: 0.0
+                    RED: 0.0
+                Background:
+                    BLUE: 0.75
+                    GREEN: 0.75
+                    RED: 0.75
+                Woodcutting:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Archery:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Axes:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Repair:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Fishing:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Excavation:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Herbalism:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Unarmed:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3
+                Mining:
+                    BLUE: 0.75
+                    GREEN: 0.3
+                    RED: 0.3