mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-25 14:46:46 +01:00
Changing iteration over a nodes children to be based on a list of its children rather than a returned type of String
This commit is contained in:
parent
22ca1863fd
commit
4ab5e5e925
@ -55,7 +55,9 @@ public class ExcavationTreasureConfig extends Config implements UnsafeValueValid
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
for (String treasureName : excavationTreasureNode.getList(TypeToken.of(String.class))) {
|
for (ConfigurationNode treasureNode : excavationTreasureNode.getChildrenList()) {
|
||||||
|
|
||||||
|
String treasureName = treasureNode.getString();
|
||||||
//Treasure Material Definition
|
//Treasure Material Definition
|
||||||
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
||||||
|
|
||||||
|
@ -85,7 +85,9 @@ public class FishingTreasureConfig extends Config implements UnsafeValueValidati
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
for (String treasureName : fishingTreasureNode.getList(TypeToken.of(String.class))) {
|
for (ConfigurationNode treasureNode : fishingTreasureNode.getChildrenList()) {
|
||||||
|
|
||||||
|
String treasureName = treasureNode.getString();
|
||||||
//Treasure Material Definition
|
//Treasure Material Definition
|
||||||
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
||||||
|
|
||||||
@ -190,7 +192,9 @@ public class FishingTreasureConfig extends Config implements UnsafeValueValidati
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
for (String treasureName : shakeTreasureNode.getList(TypeToken.of(String.class))) {
|
for (ConfigurationNode treasureNode : shakeTreasureNode.getChildrenList()) {
|
||||||
|
|
||||||
|
String treasureName = treasureNode.getString();
|
||||||
//Treasure Material Definition
|
//Treasure Material Definition
|
||||||
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
||||||
|
|
||||||
@ -302,21 +306,20 @@ public class FishingTreasureConfig extends Config implements UnsafeValueValidati
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
for (ConfigurationNode enchantmentNode : enchantmentSection.getChildrenList()) {
|
||||||
for (String enchantmentName : enchantmentSection.getList(TypeToken.of(String.class))) {
|
|
||||||
int level = getIntValue(ENCHANTMENTS_RARITY, rarity.toString(), enchantmentName);
|
|
||||||
Enchantment enchantment = EnchantmentUtils.getByName(enchantmentName);
|
|
||||||
|
|
||||||
if (enchantment == null) {
|
String enchantmentName = enchantmentNode.getString();
|
||||||
mcMMO.p.getLogger().severe("Skipping invalid enchantment in treasures.yml: " + enchantmentName);
|
int level = getIntValue(ENCHANTMENTS_RARITY, rarity.toString(), enchantmentName);
|
||||||
continue;
|
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +58,9 @@ public class HerbalismTreasureConfig extends Config implements UnsafeValueValida
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
for (String treasureName : herbalismTreasureNode.getList(TypeToken.of(String.class))) {
|
for (ConfigurationNode treasureNode : herbalismTreasureNode.getChildrenList()) {
|
||||||
|
|
||||||
|
String treasureName = treasureNode.getString();
|
||||||
//Treasure Material Definition
|
//Treasure Material Definition
|
||||||
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
Material treasureMaterial = Material.matchMaterial(treasureName.toUpperCase());
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user