EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 16:46:46 +01:00
Code Issues Projects Releases Wiki Activity

Improve validation messages of treasures.yml

Browse Source
This commit is contained in:
TfT_02 2013-10-06 09:51:33 +02:00
parent 0cd0919447
commit 2f90e533a5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
View File

@ -130,12 +130,12 @@ public class TreasureConfig extends ConfigLoader {
reason.add("Invalid material: " + treasureName); reason.add("Invalid material: " + treasureName);
} }
if (amount < 1) { if (amount <= 0) {
reason.add("Invalid amount: " + amount); reason.add("Amount of " + treasureName + " must be greater than 0! " + amount);
} }
if (material != null && material.isBlock() && (data > 127 || data < -128)) { 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"); int dropLevel = config.getInt(type + "." + treasureName + ".Drop_Level");
if (xp < 0) { if (xp < 0) {
reason.add("Invalid xp: " + xp); reason.add(treasureName + " has an invalid XP value: " + xp);
} }
if (dropChance < 0.0D) { if (dropChance < 0.0D) {
reason.add("Invalid Drop_Chance: " + dropChance); reason.add(treasureName + " has an invalid Drop_Chance: " + dropChance);
} }
if (dropLevel < 0) { 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"); maxLevel = config.getInt(type + "." + treasureName + ".Max_Level");
if (maxLevel < -1) { if (maxLevel < -1) {
reason.add("Invalid Max_Level: " + maxLevel); reason.add(treasureName + " has an invalid Max_Level: " + maxLevel);
} }
if (maxLevel != -1 && maxLevel < dropLevel) { 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!");
} }
} }

2
src/main/resources/treasures.yml
View File

@ -516,6 +516,8 @@ Hylian_Luck:
Drop_Level: 0 Drop_Level: 0
Drops_From: [Flowers] Drops_From: [Flowers]
APPLE: APPLE:
Amount: 1
XP: 0
Drop_Chance: 100.0 Drop_Chance: 100.0
Drop_Level: 0 Drop_Level: 0
Drops_From: [Flowers] Drops_From: [Flowers]