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

Changing iteration over a nodes children to be based on a list of its children rather than a returned type of String

Browse Source
This commit is contained in:
nossr50 2019-02-26 15:15:43 -08:00
parent 22ca1863fd
commit 4ab5e5e925
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/config/treasure/ExcavationTreasureConfig.java
View File

@ -55,7 +55,9 @@ public class ExcavationTreasureConfig extends Config implements UnsafeValueValid
}
try {
for (String treasureName : excavationTreasureNode.getList(TypeToken.of(String.class))) {
for (ConfigurationNode treasureNode : excavationTreasureNode.getChildrenList()) {
String treasureName = treasureNode.getString();
//Treasure Material Definition
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());

29
src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java
View File

@ -85,7 +85,9 @@ public class FishingTreasureConfig extends Config implements UnsafeValueValidati
}
try {
for (String treasureName : fishingTreasureNode.getList(TypeToken.of(String.class))) {
for (ConfigurationNode treasureNode : fishingTreasureNode.getChildrenList()) {
String treasureName = treasureNode.getString();
//Treasure Material Definition
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
@ -190,7 +192,9 @@ public class FishingTreasureConfig extends Config implements UnsafeValueValidati
return;
try {
for (String treasureName : shakeTreasureNode.getList(TypeToken.of(String.class))) {
for (ConfigurationNode treasureNode : shakeTreasureNode.getChildrenList()) {
String treasureName = treasureNode.getString();
//Treasure Material Definition
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
@ -302,21 +306,20 @@ public class FishingTreasureConfig extends Config implements UnsafeValueValidati
return;
}
try {
for (String enchantmentName : enchantmentSection.getList(TypeToken.of(String.class))) {
int level = getIntValue(ENCHANTMENTS_RARITY, rarity.toString(), enchantmentName);
Enchantment enchantment = EnchantmentUtils.getByName(enchantmentName);
for (ConfigurationNode enchantmentNode : enchantmentSection.getChildrenList()) {
if (enchantment == null) {
mcMMO.p.getLogger().severe("Skipping invalid enchantment in treasures.yml: " + enchantmentName);
continue;
}
String enchantmentName = enchantmentNode.getString();
int level = getIntValue(ENCHANTMENTS_RARITY, rarity.toString(), enchantmentName);
Enchantment enchantment = EnchantmentUtils.getByName(enchantmentName);
fishingEnchantments.get(rarity).add(new EnchantmentTreasure(enchantment, level));
if (enchantment == null) {
mcMMO.p.getLogger().severe("Skipping invalid enchantment in treasures.yml: " + enchantmentName);
continue;
}
} catch (ObjectMappingException e) {
e.printStackTrace();
fishingEnchantments.get(rarity).add(new EnchantmentTreasure(enchantment, level));
}
}
}

4
src/main/java/com/gmail/nossr50/config/treasure/HerbalismTreasureConfig.java
View File

@ -58,7 +58,9 @@ public class HerbalismTreasureConfig extends Config implements UnsafeValueValida
}
try {
for (String treasureName : herbalismTreasureNode.getList(TypeToken.of(String.class))) {
for (ConfigurationNode treasureNode : herbalismTreasureNode.getChildrenList()) {
String treasureName = treasureNode.getString();
//Treasure Material Definition
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());