From 0cbc22540835266080af4d0a54eae9d9f320442e Mon Sep 17 00:00:00 2001 From: dfsek Date: Mon, 30 Nov 2020 17:36:32 -0700 Subject: [PATCH] Refactoring n stuff --- .../terra/config/loaders/BlockDataLoader.java | 15 --------- .../config/loaders/FloraSearchLoader.java | 15 --------- .../terra/config/loaders/MaterialLoader.java | 15 --------- .../terra/config/loaders/OreTypeLoader.java | 15 --------- .../config/loaders/VanillaBiomeLoader.java | 15 --------- .../{ => config}/FloraLayerLoader.java | 3 +- .../loaders/{ => config}/GridSpawnLoader.java | 2 +- .../{ => config}/NoiseBuilderLoader.java | 2 +- .../loaders/{ => config}/OreConfigLoader.java | 2 +- .../loaders/{ => config}/TreeLayerLoader.java | 3 +- .../CarverPaletteLoader.java | 2 +- .../{ => palette}/PaletteHolderLoader.java | 3 +- .../{ => palette}/PaletteLayerLoader.java | 3 +- .../java/com/dfsek/terra/util/ConfigUtil.java | 32 ++++++++----------- 14 files changed, 26 insertions(+), 101 deletions(-) delete mode 100644 src/main/java/com/dfsek/terra/config/loaders/BlockDataLoader.java delete mode 100644 src/main/java/com/dfsek/terra/config/loaders/FloraSearchLoader.java delete mode 100644 src/main/java/com/dfsek/terra/config/loaders/MaterialLoader.java delete mode 100644 src/main/java/com/dfsek/terra/config/loaders/OreTypeLoader.java delete mode 100644 src/main/java/com/dfsek/terra/config/loaders/VanillaBiomeLoader.java rename src/main/java/com/dfsek/terra/config/loaders/{ => config}/FloraLayerLoader.java (93%) rename src/main/java/com/dfsek/terra/config/loaders/{ => config}/GridSpawnLoader.java (92%) rename src/main/java/com/dfsek/terra/config/loaders/{ => config}/NoiseBuilderLoader.java (97%) rename src/main/java/com/dfsek/terra/config/loaders/{ => config}/OreConfigLoader.java (94%) rename src/main/java/com/dfsek/terra/config/loaders/{ => config}/TreeLayerLoader.java (93%) rename src/main/java/com/dfsek/terra/config/loaders/{base => palette}/CarverPaletteLoader.java (96%) rename src/main/java/com/dfsek/terra/config/loaders/{ => palette}/PaletteHolderLoader.java (92%) rename src/main/java/com/dfsek/terra/config/loaders/{ => palette}/PaletteLayerLoader.java (91%) diff --git a/src/main/java/com/dfsek/terra/config/loaders/BlockDataLoader.java b/src/main/java/com/dfsek/terra/config/loaders/BlockDataLoader.java deleted file mode 100644 index b5f44397f..000000000 --- a/src/main/java/com/dfsek/terra/config/loaders/BlockDataLoader.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.dfsek.terra.config.loaders; - -import com.dfsek.tectonic.loading.ConfigLoader; -import com.dfsek.tectonic.loading.TypeLoader; -import org.bukkit.Bukkit; -import org.bukkit.block.data.BlockData; - -import java.lang.reflect.Type; - -public class BlockDataLoader implements TypeLoader { - @Override - public BlockData load(Type type, Object o, ConfigLoader configLoader) { - return Bukkit.createBlockData((String) o); - } -} diff --git a/src/main/java/com/dfsek/terra/config/loaders/FloraSearchLoader.java b/src/main/java/com/dfsek/terra/config/loaders/FloraSearchLoader.java deleted file mode 100644 index 5a9014c8f..000000000 --- a/src/main/java/com/dfsek/terra/config/loaders/FloraSearchLoader.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.dfsek.terra.config.loaders; - -import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.tectonic.loading.ConfigLoader; -import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.generation.items.flora.TerraFlora; - -import java.lang.reflect.Type; - -public class FloraSearchLoader implements TypeLoader { - @Override - public TerraFlora.Search load(Type type, Object o, ConfigLoader configLoader) throws LoadException { - return TerraFlora.Search.valueOf((String) o); - } -} diff --git a/src/main/java/com/dfsek/terra/config/loaders/MaterialLoader.java b/src/main/java/com/dfsek/terra/config/loaders/MaterialLoader.java deleted file mode 100644 index 29313ded5..000000000 --- a/src/main/java/com/dfsek/terra/config/loaders/MaterialLoader.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.dfsek.terra.config.loaders; - -import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.tectonic.loading.ConfigLoader; -import com.dfsek.tectonic.loading.TypeLoader; -import org.bukkit.Material; - -import java.lang.reflect.Type; - -public class MaterialLoader implements TypeLoader { - @Override - public Material load(Type type, Object o, ConfigLoader configLoader) throws LoadException { - return Material.matchMaterial((String) o); - } -} diff --git a/src/main/java/com/dfsek/terra/config/loaders/OreTypeLoader.java b/src/main/java/com/dfsek/terra/config/loaders/OreTypeLoader.java deleted file mode 100644 index 5ba1f5bae..000000000 --- a/src/main/java/com/dfsek/terra/config/loaders/OreTypeLoader.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.dfsek.terra.config.loaders; - -import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.tectonic.loading.ConfigLoader; -import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.generation.items.ores.Ore; - -import java.lang.reflect.Type; - -public class OreTypeLoader implements TypeLoader { - @Override - public Ore.Type load(Type type, Object o, ConfigLoader configLoader) throws LoadException { - return Ore.Type.valueOf((String) o); - } -} diff --git a/src/main/java/com/dfsek/terra/config/loaders/VanillaBiomeLoader.java b/src/main/java/com/dfsek/terra/config/loaders/VanillaBiomeLoader.java deleted file mode 100644 index dff24ae7d..000000000 --- a/src/main/java/com/dfsek/terra/config/loaders/VanillaBiomeLoader.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.dfsek.terra.config.loaders; - -import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.tectonic.loading.ConfigLoader; -import com.dfsek.tectonic.loading.TypeLoader; -import org.bukkit.block.Biome; - -import java.lang.reflect.Type; - -public class VanillaBiomeLoader implements TypeLoader { - @Override - public Biome load(Type type, Object o, ConfigLoader configLoader) throws LoadException { - return Biome.valueOf((String) o); - } -} diff --git a/src/main/java/com/dfsek/terra/config/loaders/FloraLayerLoader.java b/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java similarity index 93% rename from src/main/java/com/dfsek/terra/config/loaders/FloraLayerLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java index 38bfda3b5..4a2ed5f30 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/FloraLayerLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java @@ -1,8 +1,9 @@ -package com.dfsek.terra.config.loaders; +package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; +import com.dfsek.terra.config.loaders.Types; import com.dfsek.terra.generation.items.flora.FloraLayer; import org.polydev.gaea.math.FastNoiseLite; import org.polydev.gaea.math.ProbabilityCollection; diff --git a/src/main/java/com/dfsek/terra/config/loaders/GridSpawnLoader.java b/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java similarity index 92% rename from src/main/java/com/dfsek/terra/config/loaders/GridSpawnLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java index 2f3764092..5b02fe953 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/GridSpawnLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders; +package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; diff --git a/src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java b/src/main/java/com/dfsek/terra/config/loaders/config/NoiseBuilderLoader.java similarity index 97% rename from src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/config/NoiseBuilderLoader.java index 521934076..debf59f7b 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/config/NoiseBuilderLoader.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders; +package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.config.Configuration; import com.dfsek.tectonic.exception.ConfigException; diff --git a/src/main/java/com/dfsek/terra/config/loaders/OreConfigLoader.java b/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java similarity index 94% rename from src/main/java/com/dfsek/terra/config/loaders/OreConfigLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java index 33ca13595..31a7e62a0 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/OreConfigLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders; +package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; diff --git a/src/main/java/com/dfsek/terra/config/loaders/TreeLayerLoader.java b/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java similarity index 93% rename from src/main/java/com/dfsek/terra/config/loaders/TreeLayerLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java index d2be750d6..3e2090cb8 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/TreeLayerLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java @@ -1,8 +1,9 @@ -package com.dfsek.terra.config.loaders; +package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; +import com.dfsek.terra.config.loaders.Types; import com.dfsek.terra.generation.items.tree.TreeLayer; import org.polydev.gaea.math.FastNoiseLite; import org.polydev.gaea.math.ProbabilityCollection; diff --git a/src/main/java/com/dfsek/terra/config/loaders/base/CarverPaletteLoader.java b/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java similarity index 96% rename from src/main/java/com/dfsek/terra/config/loaders/base/CarverPaletteLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java index 6ea942a53..dfd74887c 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/base/CarverPaletteLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.base; +package com.dfsek.terra.config.loaders.palette; import com.dfsek.tectonic.config.Configuration; import com.dfsek.tectonic.exception.LoadException; diff --git a/src/main/java/com/dfsek/terra/config/loaders/PaletteHolderLoader.java b/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java similarity index 92% rename from src/main/java/com/dfsek/terra/config/loaders/PaletteHolderLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java index 6a7717a9d..fa9f9b826 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/PaletteHolderLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java @@ -1,10 +1,11 @@ -package com.dfsek.terra.config.loaders; +package com.dfsek.terra.config.loaders.palette; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.biome.palette.PaletteHolder; import com.dfsek.terra.biome.palette.PaletteHolderBuilder; +import com.dfsek.terra.config.loaders.Types; import org.bukkit.block.data.BlockData; import org.polydev.gaea.world.palette.Palette; diff --git a/src/main/java/com/dfsek/terra/config/loaders/PaletteLayerLoader.java b/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java similarity index 91% rename from src/main/java/com/dfsek/terra/config/loaders/PaletteLayerLoader.java rename to src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java index 1fad98b59..d96cfb1fc 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/PaletteLayerLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java @@ -1,9 +1,10 @@ -package com.dfsek.terra.config.loaders; +package com.dfsek.terra.config.loaders.palette; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.biome.palette.PaletteLayer; +import com.dfsek.terra.config.loaders.Types; import org.bukkit.block.data.BlockData; import org.polydev.gaea.math.ProbabilityCollection; diff --git a/src/main/java/com/dfsek/terra/util/ConfigUtil.java b/src/main/java/com/dfsek/terra/util/ConfigUtil.java index 68564363d..9adf44629 100644 --- a/src/main/java/com/dfsek/terra/util/ConfigUtil.java +++ b/src/main/java/com/dfsek/terra/util/ConfigUtil.java @@ -4,22 +4,17 @@ import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.biome.palette.PaletteHolder; import com.dfsek.terra.biome.palette.PaletteLayer; import com.dfsek.terra.carving.CarverPalette; -import com.dfsek.terra.config.loaders.BlockDataLoader; -import com.dfsek.terra.config.loaders.FloraLayerLoader; -import com.dfsek.terra.config.loaders.FloraSearchLoader; -import com.dfsek.terra.config.loaders.GridSpawnLoader; -import com.dfsek.terra.config.loaders.MaterialLoader; import com.dfsek.terra.config.loaders.MaterialSetLoader; -import com.dfsek.terra.config.loaders.NoiseBuilderLoader; -import com.dfsek.terra.config.loaders.OreConfigLoader; -import com.dfsek.terra.config.loaders.OreTypeLoader; -import com.dfsek.terra.config.loaders.PaletteHolderLoader; -import com.dfsek.terra.config.loaders.PaletteLayerLoader; import com.dfsek.terra.config.loaders.ProbabilityCollectionLoader; import com.dfsek.terra.config.loaders.RangeLoader; -import com.dfsek.terra.config.loaders.TreeLayerLoader; -import com.dfsek.terra.config.loaders.VanillaBiomeLoader; -import com.dfsek.terra.config.loaders.base.CarverPaletteLoader; +import com.dfsek.terra.config.loaders.config.FloraLayerLoader; +import com.dfsek.terra.config.loaders.config.GridSpawnLoader; +import com.dfsek.terra.config.loaders.config.NoiseBuilderLoader; +import com.dfsek.terra.config.loaders.config.OreConfigLoader; +import com.dfsek.terra.config.loaders.config.TreeLayerLoader; +import com.dfsek.terra.config.loaders.palette.CarverPaletteLoader; +import com.dfsek.terra.config.loaders.palette.PaletteHolderLoader; +import com.dfsek.terra.config.loaders.palette.PaletteLayerLoader; import com.dfsek.terra.generation.config.NoiseBuilder; import com.dfsek.terra.generation.items.flora.FloraLayer; import com.dfsek.terra.generation.items.flora.TerraFlora; @@ -27,6 +22,7 @@ import com.dfsek.terra.generation.items.ores.Ore; import com.dfsek.terra.generation.items.ores.OreConfig; import com.dfsek.terra.generation.items.tree.TreeLayer; import com.dfsek.terra.procgen.GridSpawn; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; @@ -46,15 +42,15 @@ public final class ConfigUtil { .registerLoader(GridSpawn.class, new GridSpawnLoader()) .registerLoader(PaletteHolder.class, new PaletteHolderLoader()) .registerLoader(PaletteLayer.class, new PaletteLayerLoader()) - .registerLoader(Biome.class, new VanillaBiomeLoader()) - .registerLoader(BlockData.class, new BlockDataLoader()) - .registerLoader(Material.class, new MaterialLoader()) + .registerLoader(Biome.class, (t, o, l) -> Biome.valueOf((String) o)) + .registerLoader(BlockData.class, (t, o, l) -> Bukkit.createBlockData((String) o)) + .registerLoader(Material.class, (t, o, l) -> Material.matchMaterial((String) o)) .registerLoader(FloraLayer.class, new FloraLayerLoader()) - .registerLoader(Ore.Type.class, new OreTypeLoader()) + .registerLoader(Ore.Type.class, (t, o, l) -> Ore.Type.valueOf((String) o)) .registerLoader(OreConfig.class, new OreConfigLoader()) .registerLoader(NoiseBuilder.class, new NoiseBuilderLoader()) .registerLoader(TreeLayer.class, new TreeLayerLoader()) .registerLoader(MaterialSet.class, new MaterialSetLoader()) - .registerLoader(TerraFlora.Search.class, new FloraSearchLoader()); + .registerLoader(TerraFlora.Search.class, (t, o, l) -> TerraFlora.Search.valueOf((String) o)); } }