palette refactors

This commit is contained in:
dfsek
2021-07-02 09:50:15 -07:00
parent 6755054c97
commit 8ff022cbc8
8 changed files with 13 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.config.templates;
package com.dfsek.terra.addons.palette;
import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.config.loaders.palette;
package com.dfsek.terra.addons.palette.palette;
import com.dfsek.tectonic.config.Configuration;
import com.dfsek.tectonic.exception.LoadException;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.world.palette;
package com.dfsek.terra.addons.palette.palette;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.noise.NoiseSampler;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.config.loaders.palette;
package com.dfsek.terra.addons.palette.palette;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.world.palette;
package com.dfsek.terra.addons.palette.palette;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.noise.NoiseSampler;
@@ -6,6 +6,7 @@ import com.dfsek.terra.api.util.GlueList;
import com.dfsek.terra.api.util.ProbabilityCollection;
import com.dfsek.terra.api.world.generator.Palette;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -14,7 +15,7 @@ import java.util.Random;
* Used to get a section of blocks, based on the depth at which they are found.
*/
public abstract class PaletteImpl implements com.dfsek.terra.api.world.generator.Palette {
private final List<PaletteLayer> pallet = new GlueList<>();
private final List<PaletteLayer> pallet = new ArrayList<>();
/**
* Constructs a blank palette.

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.config.loaders.palette;
package com.dfsek.terra.addons.palette.palette;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.config.loaders.palette.slant;
package com.dfsek.terra.addons.palette.palette.slant;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;

View File

@@ -40,10 +40,10 @@ import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListMut
import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceMutatorTemplate;
import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothMutatorTemplate;
import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
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.config.loaders.palette.slant.SlantHolderLoader;
import com.dfsek.terra.addons.palette.palette.CarverPaletteLoader;
import com.dfsek.terra.addons.palette.palette.PaletteHolderLoader;
import com.dfsek.terra.addons.palette.palette.PaletteLayerLoader;
import com.dfsek.terra.addons.palette.palette.slant.SlantHolderLoader;
import com.dfsek.terra.addons.flora.flora.FloraLayer;
import com.dfsek.terra.addons.flora.flora.TerraFlora;
import com.dfsek.terra.world.population.items.ores.OreConfig;