mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-19 02:52:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix several minor config issues

Browse Source
This commit is contained in:
dfsek 2020-10-01 17:17:53 -07:00
parent 6f11222a88
commit 576365b688
3 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dfsek/terra/TerraWorld.java
View File

@ -18,7 +18,7 @@ import java.util.Map;
public class TerraWorld { public class TerraWorld {
private static Map<World, TerraWorld> map = new HashMap<>(); private static Map<World, TerraWorld> map = new HashMap<>();
private final TerraBiomeGrid grid; private final TerraBiomeGrid grid;
private BiomeZone zone; private final BiomeZone zone;
private final TerraConfig config; private final TerraConfig config;
private final WorldConfig worldConfig; private final WorldConfig worldConfig;
private static final Object lock = new Object(); private static final Object lock = new Object();
@ -70,4 +70,8 @@ public class TerraWorld {
public BiomeZone getZone() { public BiomeZone getZone() {
return zone; return zone;
} }
public static void invalidate() {
map.clear();
}
} }

36
src/main/java/com/dfsek/terra/config/TerraConfig.java
View File

@ -1,13 +1,7 @@
package com.dfsek.terra.config; package com.dfsek.terra.config;
import com.dfsek.terra.biome.BiomeZone;
import com.dfsek.terra.biome.TerraBiomeGrid;
import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.UserDefinedGrid;
import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.carving.UserDefinedCarver;
import com.dfsek.terra.command.TerraCommand;
import com.dfsek.terra.config.base.ConfigUtil;
import com.dfsek.terra.config.base.WorldConfig;
import com.dfsek.terra.config.exception.ConfigException; import com.dfsek.terra.config.exception.ConfigException;
import com.dfsek.terra.config.genconfig.AbstractBiomeConfig; import com.dfsek.terra.config.genconfig.AbstractBiomeConfig;
import com.dfsek.terra.config.genconfig.BiomeConfig; import com.dfsek.terra.config.genconfig.BiomeConfig;
@ -18,14 +12,11 @@ import com.dfsek.terra.config.genconfig.OreConfig;
import com.dfsek.terra.config.genconfig.PaletteConfig; import com.dfsek.terra.config.genconfig.PaletteConfig;
import com.dfsek.terra.config.genconfig.StructureConfig; import com.dfsek.terra.config.genconfig.StructureConfig;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -47,9 +38,6 @@ public class TerraConfig extends YamlConfiguration {
private final Map<String, BiomeGridConfig> grids; private final Map<String, BiomeGridConfig> grids;
private final File dataFolder; private final File dataFolder;
private final Map<World, TerraBiomeGrid> grid = new HashMap<>();
private final Map<World, BiomeZone> zones = new HashMap<>();
private final String id; private final String id;
public List<String> biomeList; public List<String> biomeList;
@ -101,14 +89,6 @@ public class TerraConfig extends YamlConfiguration {
configs.put(id, this); configs.put(id, this);
} }
public Map<String, OreConfig> getOres() {
return ores;
}
public Map<String, PaletteConfig> getPalettes() {
return palettes;
}
public Map<String, AbstractBiomeConfig> getAbstractBiomes() { public Map<String, AbstractBiomeConfig> getAbstractBiomes() {
return abstractBiomes; return abstractBiomes;
} }
@ -117,26 +97,10 @@ public class TerraConfig extends YamlConfiguration {
return biomes; return biomes;
} }
public Map<String, BiomeGridConfig> getGrids() {
return grids;
}
public Map<String, CarverConfig> getCarvers() { public Map<String, CarverConfig> getCarvers() {
return carvers; return carvers;
} }
public Map<String, FloraConfig> getFlora() {
return flora;
}
public Map<String, StructureConfig> getStructures() {
return structures;
}
public static Map<String, TerraConfig> getConfigs() {
return configs;
}
public static void loadAll(JavaPlugin main) { public static void loadAll(JavaPlugin main) {
configs.clear(); configs.clear();
List<Path> subfolder; List<Path> subfolder;

3
src/main/java/com/dfsek/terra/config/base/ConfigUtil.java
View File

@ -1,5 +1,6 @@
package com.dfsek.terra.config.base; package com.dfsek.terra.config.base;
import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.BiomeZone;
import com.dfsek.terra.biome.TerraBiomeGrid; import com.dfsek.terra.biome.TerraBiomeGrid;
import com.dfsek.terra.config.ConfigLoader; import com.dfsek.terra.config.ConfigLoader;
@ -44,6 +45,8 @@ public final class ConfigUtil {
logger.info("Loading config values"); logger.info("Loading config values");
TerraConfig.loadAll(main); TerraConfig.loadAll(main);
TerraWorld.invalidate();
TerraWorld.invalidate();
} }
public static <E extends Enum<E>> List<E> getElements(List<String> st, Class<E> clazz) { public static <E extends Enum<E>> List<E> getElements(List<String> st, Class<E> clazz) {