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

cleanup

Browse Source
This commit is contained in:
dfsek
2021-06-23 10:48:57 -07:00
parent 24b8fc859c
commit e34e2dd0b2
33 changed files with 44 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/implementation/src/main/java/com/dfsek/terra/api/util/world/PaletteUtil.java
View File

@@ -4,7 +4,7 @@ import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.generator.Palette;
import com.dfsek.terra.api.world.palette.slant.SlantHolder;
import com.dfsek.terra.config.templates.BiomeTemplate;
import com.dfsek.terra.world.generation.math.samplers.Sampler;
import com.dfsek.terra.api.world.generator.Sampler;
public final class PaletteUtil {
public static Palette getPalette(int x, int y, int z, BiomeTemplate c, Sampler sampler) {

7
common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java
View File

@@ -1,5 +1,6 @@
package com.dfsek.terra.api.world.biome;
import com.dfsek.terra.api.util.ProbabilityCollection;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
import com.dfsek.terra.config.templates.BiomeTemplate;
@@ -12,14 +13,14 @@ import java.util.Set;
*/
public class UserDefinedBiome implements TerraBiome {
private final WorldGenerator gen;
private final ProbabilityCollectionImpl<Biome> vanilla;
private final ProbabilityCollection<Biome> vanilla;
private final String id;
private final BiomeTemplate config;
private final int color;
private final Set<String> tags;
public UserDefinedBiome(ProbabilityCollectionImpl<Biome> vanilla, WorldGenerator gen, BiomeTemplate config) {
public UserDefinedBiome(ProbabilityCollection<Biome> vanilla, WorldGenerator gen, BiomeTemplate config) {
this.vanilla = vanilla;
this.gen = gen;
this.id = config.getID();
@@ -35,7 +36,7 @@ public class UserDefinedBiome implements TerraBiome {
* @return Collection of biomes to represent the custom biome.
*/
@Override
public ProbabilityCollectionImpl<Biome> getVanillaBiomes() {
public ProbabilityCollection<Biome> getVanillaBiomes() {
return vanilla;
}

2
common/implementation/src/main/java/com/dfsek/terra/world/TerraWorld.java
View File

@@ -11,7 +11,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.Palette;
import com.dfsek.terra.config.pack.ConfigPackImpl;
import com.dfsek.terra.config.pack.WorldConfig;
import com.dfsek.terra.world.generation.math.samplers.Sampler;
import com.dfsek.terra.api.world.generator.Sampler;
import net.jafama.FastMath;
public class TerraWorld {

2
common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java
View File

@@ -20,7 +20,7 @@ import com.dfsek.terra.world.Carver;
import com.dfsek.terra.world.TerraWorld;
import com.dfsek.terra.world.carving.NoiseCarver;
import com.dfsek.terra.world.generation.math.SamplerCache;
import com.dfsek.terra.world.generation.math.samplers.Sampler;
import com.dfsek.terra.api.world.generator.Sampler;
import com.dfsek.terra.world.generation.math.samplers.Sampler2D;
import com.dfsek.terra.world.population.CavePopulator;
import com.dfsek.terra.world.population.OrePopulator;

2
common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
View File

@@ -28,7 +28,7 @@ import com.dfsek.terra.api.profiler.ProfileFrame;
import com.dfsek.terra.world.Carver;
import com.dfsek.terra.world.TerraWorld;
import com.dfsek.terra.world.carving.NoiseCarver;
import com.dfsek.terra.world.generation.math.samplers.Sampler;
import com.dfsek.terra.api.world.generator.Sampler;
import com.dfsek.terra.world.generation.math.samplers.Sampler3D;
import com.dfsek.terra.world.population.CavePopulator;
import com.dfsek.terra.world.population.FloraPopulator;

2
common/implementation/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.world.generation.math;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.world.TerraWorld;
import com.dfsek.terra.world.generation.math.samplers.Sampler;
import com.dfsek.terra.api.world.generator.Sampler;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;

10
common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler.java
View File

@@ -1,10 +0,0 @@
package com.dfsek.terra.world.generation.math.samplers;
@FunctionalInterface
public interface Sampler {
double sample(double x, double y, double z);
default double sample(int x, int y, int z) { // Floating-point modulus operations are expensive. This allows implementations to optionally handle integers separately.
return sample((double) x, y, z);
}
}

1
common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler2D.java
View File

@@ -2,6 +2,7 @@ package com.dfsek.terra.world.generation.math.samplers;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.Sampler;
import com.dfsek.terra.world.generation.math.interpolation.ChunkInterpolator2D;
import com.dfsek.terra.world.generation.math.interpolation.ElevationInterpolator;
import net.jafama.FastMath;

1
common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler3D.java
View File

@@ -2,6 +2,7 @@ package com.dfsek.terra.world.generation.math.samplers;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.Sampler;
import com.dfsek.terra.world.generation.math.interpolation.ChunkInterpolator3D;
import com.dfsek.terra.world.generation.math.interpolation.ElevationInterpolator;
import net.jafama.FastMath;

2
common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java
View File

@@ -94,8 +94,6 @@ public class TerraFlora implements Flora {
@Override
public boolean plant(Location location) {
WorldHandle handle = main.getWorldHandle();
boolean doRotation = testRotation.size() > 0;
int size = floraPalette.getSize();
int c = ceiling ? -1 : 1;