mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-08 08:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring n stuff

Browse Source
This commit is contained in:
dfsek
2020-11-30 17:36:32 -07:00
parent f85d047ee6
commit 0cbc225408
14 changed files with 26 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/dfsek/terra/config/loaders/BlockDataLoader.java
View File

@@ -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<BlockData> {
@Override
public BlockData load(Type type, Object o, ConfigLoader configLoader) {
return Bukkit.createBlockData((String) o);
}
}

15
src/main/java/com/dfsek/terra/config/loaders/FloraSearchLoader.java
View File

@@ -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<TerraFlora.Search> {
@Override
public TerraFlora.Search load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
return TerraFlora.Search.valueOf((String) o);
}
}

15
src/main/java/com/dfsek/terra/config/loaders/MaterialLoader.java
View File

@@ -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<Material> {
@Override
public Material load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
return Material.matchMaterial((String) o);
}
}

15
src/main/java/com/dfsek/terra/config/loaders/OreTypeLoader.java
View File

@@ -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<Ore.Type> {
@Override
public Ore.Type load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
return Ore.Type.valueOf((String) o);
}
}

15
src/main/java/com/dfsek/terra/config/loaders/VanillaBiomeLoader.java
View File

@@ -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<Biome> {
@Override
public Biome load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
return Biome.valueOf((String) o);
}
}

3
src/main/java/com/dfsek/terra/config/loaders/FloraLayerLoader.java → src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java
View File

@@ -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;

2
src/main/java/com/dfsek/terra/config/loaders/GridSpawnLoader.java → src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java
View File

@@ -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;

2
src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java → src/main/java/com/dfsek/terra/config/loaders/config/NoiseBuilderLoader.java
View File

@@ -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;

2
src/main/java/com/dfsek/terra/config/loaders/OreConfigLoader.java → src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java
View File

@@ -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;

3
src/main/java/com/dfsek/terra/config/loaders/TreeLayerLoader.java → src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java
View File

@@ -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;

2
src/main/java/com/dfsek/terra/config/loaders/base/CarverPaletteLoader.java → src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java
View File

@@ -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;

3
src/main/java/com/dfsek/terra/config/loaders/PaletteHolderLoader.java → src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java
View File

@@ -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;

3
src/main/java/com/dfsek/terra/config/loaders/PaletteLayerLoader.java → src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java
View File

@@ -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;

32
src/main/java/com/dfsek/terra/util/ConfigUtil.java
View File

@@ -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));
}
}