Upstream
/
Greenhouses
mirror of https://github.com/BentoBoxWorld/Greenhouses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed bugs.

This commit is contained in:
tastybento 2019-11-01 15:45:40 -07:00
parent 680097cc38
commit 21ef0f3c10
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/world/bentobox/greenhouses/managers/RecipeManager.java
View File

@ -50,22 +50,21 @@ public class RecipeManager {
*/ */
private void loadBiomeRecipes() throws IOException, InvalidConfigurationException { private void loadBiomeRecipes() throws IOException, InvalidConfigurationException {
biomeRecipes.clear(); biomeRecipes.clear();
YamlConfiguration biomes = new YamlConfiguration(); YamlConfiguration biomeConfig = new YamlConfiguration();
File biomeFile = new File(addon.getDataFolder(), "biomes.yml"); File biomeFile = new File(addon.getDataFolder(), "biomes.yml");
if (!biomeFile.exists()) { if (!biomeFile.exists()) {
addon.logError("No biomes.yml file!"); addon.logError("No biomes.yml file!");
addon.saveResource("biomes.yml", true); addon.saveResource("biomes.yml", true);
} }
biomes.load(biomeFile); biomeConfig.load(biomeFile);
ConfigurationSection biomeSection = biomes.getConfigurationSection("biomes"); if (!biomeConfig.isConfigurationSection("biomes")) {
if (biomeSection == null) {
addon.logError("biomes.yml file is missing, empty or corrupted. Delete and reload plugin again!"); addon.logError("biomes.yml file is missing, empty or corrupted. Delete and reload plugin again!");
return; return;
} }
ConfigurationSection biomeSection = biomeConfig.getConfigurationSection("biomes");
// Loop through all the entries // Loop through all the entries
for (String type: biomeSection.getValues(false).keySet()) { for (String type: biomeSection.getValues(false).keySet()) {
processEntries(type, biomeSection, biomes); processEntries(type, biomeSection);
// Check maximum number // Check maximum number
if (biomeRecipes.size() == MAXIMUM_INVENTORY_SIZE) { if (biomeRecipes.size() == MAXIMUM_INVENTORY_SIZE) {
addon.logWarning("Cannot load any more biome recipies - limit is " + MAXIMUM_INVENTORY_SIZE); addon.logWarning("Cannot load any more biome recipies - limit is " + MAXIMUM_INVENTORY_SIZE);
@ -75,7 +74,7 @@ public class RecipeManager {
addon.log("Loaded " + biomeRecipes.size() + " biome recipes."); addon.log("Loaded " + biomeRecipes.size() + " biome recipes.");
} }
private void processEntries(String type, ConfigurationSection biomeSection, YamlConfiguration biomes) { private void processEntries(String type, ConfigurationSection biomeSection) {
try { try {
ConfigurationSection biomeRecipe = biomeSection.getConfigurationSection(type); ConfigurationSection biomeRecipe = biomeSection.getConfigurationSection(type);
Biome thisBiome; Biome thisBiome;
@ -98,15 +97,15 @@ public class RecipeManager {
parseReqBlock(b, rq, reqContents); parseReqBlock(b, rq, reqContents);
} }
} }
ConfigurationSection temp = biomes.getConfigurationSection("biomes." + type + ".plants");
// Load plants // Load plants
loadPlants(temp, b); loadPlants(biomeRecipe, b);
// Load mobs! // Load mobs!
loadMobs(type, temp, biomes, b); loadMobs(biomeRecipe, b);
// Load block conversions // Load block conversions
loadBlockConversions(type, biomeSection, b); loadBlockConversions(biomeRecipe, b);
// Add the recipe to the list // Add the recipe to the list
biomeRecipes.add(b); biomeRecipes.add(b);
@ -139,7 +138,8 @@ public class RecipeManager {
return b; return b;
} }
private void loadPlants(ConfigurationSection temp, BiomeRecipe b) { private void loadPlants(ConfigurationSection biomeSection, BiomeRecipe b) {
ConfigurationSection temp = biomeSection.getConfigurationSection("plants");
// # 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);
@ -154,8 +154,8 @@ public class RecipeManager {
} }
private void loadBlockConversions(String type, ConfigurationSection biomeSection, BiomeRecipe b) { private void loadBlockConversions(ConfigurationSection biomeSection, BiomeRecipe b) {
ConfigurationSection conversionSec = biomeSection.getConfigurationSection(type + ".conversions"); ConfigurationSection conversionSec = biomeSection.getConfigurationSection("conversions");
if (conversionSec != null) { if (conversionSec != null) {
for (String oldMat : conversionSec.getKeys(false)) { for (String oldMat : conversionSec.getKeys(false)) {
try { try {
@ -176,9 +176,9 @@ public class RecipeManager {
} }
} }
private void loadMobs(String type, ConfigurationSection temp, YamlConfiguration biomes, BiomeRecipe b) { private void loadMobs(ConfigurationSection biomeSection, BiomeRecipe b) {
ConfigurationSection temp = biomeSection.getConfigurationSection("mobs");
// Mob EntityType: Probability:Spawn on Material // Mob EntityType: Probability:Spawn on Material
temp = biomes.getConfigurationSection("biomes." + type + ".mobs");
if (temp != null) { if (temp != null) {
((HashMap<String,Object>)temp.getValues(false)).entrySet().forEach(s -> parseMob(s,b)); ((HashMap<String,Object>)temp.getValues(false)).entrySet().forEach(s -> parseMob(s,b));
} }