From 2f90e533a53b753e3306b75c778f1c9f893c29ee Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Sun, 6 Oct 2013 09:51:33 +0200
Subject: [PATCH] Improve validation messages of treasures.yml

---
 .../nossr50/config/treasure/TreasureConfig.java  | 16 ++++++++--------
 src/main/resources/treasures.yml                 |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
index e5377192d..39c5bce95 100644
--- a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
@@ -130,12 +130,12 @@ public class TreasureConfig extends ConfigLoader {
                 reason.add("Invalid material: " + treasureName);
             }
 
-            if (amount < 1) {
-                reason.add("Invalid amount: " + amount);
+            if (amount <= 0) {
+                reason.add("Amount of " + treasureName + " must be greater than 0! " + amount);
             }
 
             if (material != null && material.isBlock() && (data > 127 || data < -128)) {
-                reason.add("Invalid data: " + data);
+                reason.add("Data of " + treasureName + " is invalid! " + data);
             }
 
             /*
@@ -147,15 +147,15 @@ public class TreasureConfig extends ConfigLoader {
             int dropLevel = config.getInt(type + "." + treasureName + ".Drop_Level");
 
             if (xp < 0) {
-                reason.add("Invalid xp: " + xp);
+                reason.add(treasureName + " has an invalid XP value: " + xp);
             }
 
             if (dropChance < 0.0D) {
-                reason.add("Invalid Drop_Chance: " + dropChance);
+                reason.add(treasureName + " has an invalid Drop_Chance: " + dropChance);
             }
 
             if (dropLevel < 0) {
-                reason.add("Invalid Drop_Level: " + dropLevel);
+                reason.add(treasureName + " has an invalid Drop_Level: " + dropLevel);
             }
 
             /*
@@ -167,11 +167,11 @@ public class TreasureConfig extends ConfigLoader {
                 maxLevel = config.getInt(type + "." + treasureName + ".Max_Level");
 
                 if (maxLevel < -1) {
-                    reason.add("Invalid Max_Level: " + maxLevel);
+                    reason.add(treasureName + " has an invalid Max_Level: " + maxLevel);
                 }
 
                 if (maxLevel != -1 && maxLevel < dropLevel) {
-                    reason.add("Max_Level must be -1 or greater than Drop_Level!");
+                    reason.add(treasureName + " Max_Level must be -1 or greater than Drop_Level!");
                 }
             }
 
diff --git a/src/main/resources/treasures.yml b/src/main/resources/treasures.yml
index 58834ab03..269e8451c 100644
--- a/src/main/resources/treasures.yml
+++ b/src/main/resources/treasures.yml
@@ -516,6 +516,8 @@ Hylian_Luck:
         Drop_Level: 0
         Drops_From: [Flowers]
     APPLE:
+        Amount: 1
+        XP: 0
         Drop_Chance: 100.0
         Drop_Level: 0
         Drops_From: [Flowers]