mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-18 10:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor some biome stuff

Browse Source
This commit is contained in:
dfsek 2020-11-13 23:34:34 -07:00
parent b3dac9f37e
commit bfd57e38d8
17 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
package com.dfsek.terra; package com.dfsek.terra;
import com.dfsek.terra.biome.BiomeZone; 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.biome.grid.TerraBiomeGrid;
import com.dfsek.terra.biome.grid.UserDefinedGrid;
import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.base.WorldConfig; import com.dfsek.terra.config.base.WorldConfig;
import com.dfsek.terra.config.genconfig.BiomeGridConfig; import com.dfsek.terra.config.genconfig.BiomeGridConfig;

2
src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.async; package com.dfsek.terra.async;
import com.dfsek.terra.biome.TerraBiomeGrid; import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.async; package com.dfsek.terra.async;
import com.dfsek.terra.Terra; import com.dfsek.terra.Terra;
import com.dfsek.terra.biome.TerraBiomeGrid; import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;

2
src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.async; package com.dfsek.terra.async;
import com.dfsek.terra.TerraWorld; import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.biome.TerraBiomeGrid;
import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import com.dfsek.terra.config.genconfig.structure.StructureConfig; import com.dfsek.terra.config.genconfig.structure.StructureConfig;
import com.dfsek.terra.structure.Rotation; import com.dfsek.terra.structure.Rotation;
import com.dfsek.terra.structure.Structure; import com.dfsek.terra.structure.Structure;

2
src/main/java/com/dfsek/terra/biome/BiomeZone.java
View File

@ -40,7 +40,7 @@ public class BiomeZone {
* @param z Z coordinate * @param z Z coordinate
* @return BiomeGrid at coordinates. * @return BiomeGrid at coordinates.
*/ */
protected BiomeGrid getGrid(int x, int z) { public BiomeGrid getGrid(int x, int z) {
return grids[NormalizationUtil.normalize(useImage ? Objects.requireNonNull(imageLoader).getNoiseVal(x, z, channel) : noise.getNoise(x, z), grids.length, 4)]; return grids[NormalizationUtil.normalize(useImage ? Objects.requireNonNull(imageLoader).getNoiseVal(x, z, channel) : noise.getNoise(x, z), grids.length, 4)];
} }

6
src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java → src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java
View File

@ -1,5 +1,9 @@
package com.dfsek.terra.biome; package com.dfsek.terra.biome.grid;
import com.dfsek.terra.biome.BiomeZone;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.postprocessing.CoordinatePerturb;
import com.dfsek.terra.biome.postprocessing.ErosionNoise;
import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.base.ConfigUtil; import com.dfsek.terra.config.base.ConfigUtil;
import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.config.lang.LangUtil;

3
src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java → src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java
View File

@ -1,5 +1,6 @@
package com.dfsek.terra.biome; package com.dfsek.terra.biome.grid;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.config.base.WorldConfig; import com.dfsek.terra.config.base.WorldConfig;
import com.dfsek.terra.image.ImageLoader; import com.dfsek.terra.image.ImageLoader;
import org.bukkit.Location; import org.bukkit.Location;

2
src/main/java/com/dfsek/terra/biome/CoordinatePerturb.java → src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.biome; package com.dfsek.terra.biome.postprocessing;
import com.dfsek.terra.procgen.math.Vector2; import com.dfsek.terra.procgen.math.Vector2;
import org.polydev.gaea.math.FastNoiseLite; import org.polydev.gaea.math.FastNoiseLite;

4
src/main/java/com/dfsek/terra/biome/ErosionNoise.java → src/main/java/com/dfsek/terra/biome/postprocessing/ErosionNoise.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.biome; package com.dfsek.terra.biome.postprocessing;
import org.polydev.gaea.math.FastNoiseLite; import org.polydev.gaea.math.FastNoiseLite;
@ -26,7 +26,7 @@ public class ErosionNoise {
* @param z Z coordinate * @param z Z coordinate
* @return Whether location is eroded * @return Whether location is eroded
*/ */
boolean isEroded(int x, int z) { public boolean isEroded(int x, int z) {
double abs = Math.pow(noise.getNoise(x, z), 2); double abs = Math.pow(noise.getNoise(x, z), 2);
return abs < thresh; return abs < thresh;
} }

2
src/main/java/com/dfsek/terra/command/biome/BiomeCommand.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.command.biome; package com.dfsek.terra.command.biome;
import com.dfsek.terra.TerraWorld; import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.biome.TerraBiomeGrid;
import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.config.lang.LangUtil;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.Command; import org.bukkit.command.Command;

2
src/main/java/com/dfsek/terra/config/genconfig/BiomeGridConfig.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.config.genconfig; package com.dfsek.terra.config.genconfig;
import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.UserDefinedGrid; import com.dfsek.terra.biome.grid.UserDefinedGrid;
import com.dfsek.terra.config.TerraConfig; import com.dfsek.terra.config.TerraConfig;
import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.base.WorldConfig; import com.dfsek.terra.config.base.WorldConfig;

2
src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.generation; package com.dfsek.terra.generation;
import com.dfsek.terra.biome.TerraBiomeGrid; import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import org.bukkit.World; import org.bukkit.World;
import org.polydev.gaea.generation.GenerationPhase; import org.polydev.gaea.generation.GenerationPhase;
import org.polydev.gaea.math.FastNoiseLite; import org.polydev.gaea.math.FastNoiseLite;

2
src/main/java/com/dfsek/terra/image/ImageLoader.java
View File

@ -2,7 +2,7 @@ package com.dfsek.terra.image;
import com.dfsek.terra.TerraWorld; 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.grid.TerraBiomeGrid;
import com.dfsek.terra.config.base.ConfigUtil; import com.dfsek.terra.config.base.ConfigUtil;
import com.dfsek.terra.debug.gui.DebugGUI; import com.dfsek.terra.debug.gui.DebugGUI;
import org.bukkit.World; import org.bukkit.World;

2
src/main/java/com/dfsek/terra/image/WorldImageGenerator.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.image; package com.dfsek.terra.image;
import com.dfsek.terra.TerraWorld; import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.biome.TerraBiomeGrid; import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import org.bukkit.World; import org.bukkit.World;
import org.polydev.gaea.biome.NormalizationUtil; import org.polydev.gaea.biome.NormalizationUtil;

2
src/main/java/com/dfsek/terra/population/FloraPopulator.java
View File

@ -3,8 +3,8 @@ package com.dfsek.terra.population;
import com.dfsek.terra.Terra; import com.dfsek.terra.Terra;
import com.dfsek.terra.TerraProfiler; import com.dfsek.terra.TerraProfiler;
import com.dfsek.terra.TerraWorld; import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.biome.TerraBiomeGrid;
import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.genconfig.biome.BiomeConfig; import com.dfsek.terra.config.genconfig.biome.BiomeConfig;
import com.dfsek.terra.config.genconfig.biome.BiomeFloraConfig; import com.dfsek.terra.config.genconfig.biome.BiomeFloraConfig;

2
src/main/java/com/dfsek/terra/population/SnowPopulator.java
View File

@ -2,8 +2,8 @@ package com.dfsek.terra.population;
import com.dfsek.terra.TerraProfiler; import com.dfsek.terra.TerraProfiler;
import com.dfsek.terra.TerraWorld; import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.biome.TerraBiomeGrid;
import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import com.dfsek.terra.config.base.ConfigUtil; import com.dfsek.terra.config.base.ConfigUtil;
import com.dfsek.terra.config.genconfig.biome.BiomeConfig; import com.dfsek.terra.config.genconfig.biome.BiomeConfig;
import com.dfsek.terra.util.DataUtil; import com.dfsek.terra.util.DataUtil;

2
src/main/java/com/dfsek/terra/population/StructurePopulator.java
View File

@ -3,8 +3,8 @@ package com.dfsek.terra.population;
import com.dfsek.terra.Debug; import com.dfsek.terra.Debug;
import com.dfsek.terra.TerraProfiler; import com.dfsek.terra.TerraProfiler;
import com.dfsek.terra.TerraWorld; import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.biome.TerraBiomeGrid;
import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.TerraBiomeGrid;
import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.genconfig.structure.StructureConfig; import com.dfsek.terra.config.genconfig.structure.StructureConfig;
import com.dfsek.terra.procgen.math.Vector2; import com.dfsek.terra.procgen.math.Vector2;