Improved refactor of RecipeManager

This commit is contained in:
tastybento 2019-11-01 15:22:30 -07:00
parent 697feef3bb
commit 680097cc38
1 changed files with 9 additions and 16 deletions

View File

@ -100,7 +100,7 @@ public class RecipeManager {
} }
ConfigurationSection temp = biomes.getConfigurationSection("biomes." + type + ".plants"); ConfigurationSection temp = biomes.getConfigurationSection("biomes." + type + ".plants");
// Load plants // Load plants
loadPlants(type, temp, biomes, b); loadPlants(temp, b);
// Load mobs! // Load mobs!
loadMobs(type, temp, biomes, b); loadMobs(type, temp, biomes, b);
@ -139,18 +139,16 @@ public class RecipeManager {
return b; return b;
} }
private void loadPlants(String type, ConfigurationSection temp, YamlConfiguration biomes, BiomeRecipe b) { private void loadPlants(ConfigurationSection temp, BiomeRecipe b) {
// # Plant Material: Probability in %:Block Material on what they grow // # Plant Material: Probability in %:Block Material on what they grow
if (temp != null) { if (temp != null) {
HashMap<String,Object> plants = (HashMap<String,Object>)temp.getValues(false); HashMap<String,Object> plants = (HashMap<String,Object>)temp.getValues(false);
if (plants != null) { for (Entry<String, Object> s: plants.entrySet()) {
for (Entry<String, Object> s: plants.entrySet()) { Material plantMaterial = Material.valueOf(s.getKey());
Material plantMaterial = Material.valueOf(s.getKey()); String[] split = ((String)s.getValue()).split(":");
String[] split = ((String)s.getValue()).split(":"); int plantProbability = Integer.parseInt(split[0]);
int plantProbability = Integer.parseInt(split[0]); Material plantGrowOn = Material.valueOf(split[1]);
Material plantGrowOn = Material.valueOf(split[1]); b.addPlants(plantMaterial, plantProbability, plantGrowOn);
b.addPlants(plantMaterial, plantProbability, plantGrowOn);
}
} }
} }
@ -182,12 +180,7 @@ public class RecipeManager {
// Mob EntityType: Probability:Spawn on Material // Mob EntityType: Probability:Spawn on Material
temp = biomes.getConfigurationSection("biomes." + type + ".mobs"); temp = biomes.getConfigurationSection("biomes." + type + ".mobs");
if (temp != null) { if (temp != null) {
HashMap<String,Object> mobs = (HashMap<String,Object>)temp.getValues(false); ((HashMap<String,Object>)temp.getValues(false)).entrySet().forEach(s -> parseMob(s,b));
if (mobs != null) {
for (Entry<String, Object> s: mobs.entrySet()) {
parseMob(s,b);
}
}
} }
} }