mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-02 16:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unused methods from WorldConfig

Browse Source
This commit is contained in:
dfsek 2021-12-02 09:41:08 -07:00
parent fab02d4d16
commit 4a8d19cbf2
8 changed files with 15 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/addons/chunk-generator-layer/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/LayeredChunkGenerator.java
View File

@ -3,6 +3,7 @@ package com.dfsek.terra.addons.chunkgenerator.layer;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.util.math.Sampler;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.WritableWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
@ -21,7 +22,7 @@ public class LayeredChunkGenerator implements ChunkGenerator {
}
@Override
public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth) {
public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth) {
return null;
}

3
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
View File

@ -8,6 +8,7 @@
package com.dfsek.terra.addons.chunkgenerator.generation.generators;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.WritableWorld;
import net.jafama.FastMath;
@ -99,7 +100,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
}
@Override
public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth) {
public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth) {
return new Sampler3D(chunkX, chunkZ, provider, world, elevationSmooth);
}

4
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator3D.java
View File

@ -8,6 +8,8 @@
package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.World;
import net.jafama.FastMath;
import java.util.HashMap;
@ -39,7 +41,7 @@ public class ChunkInterpolator3D implements ChunkInterpolator {
* @param chunkZ Z coordinate of the chunk.
* @param provider Biome Provider to use for biome fetching.
*/
public ChunkInterpolator3D(ServerWorld w, int chunkX, int chunkZ, BiomeProvider provider,
public ChunkInterpolator3D(World w, int chunkX, int chunkZ, BiomeProvider provider,
BiFunction<GenerationSettings, Vector3, Double> noiseGetter) {
this.noiseGetter = noiseGetter;
int xOrigin = chunkX << 4;

3
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java
View File

@ -8,6 +8,7 @@
package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.GenerationSettings;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@ -15,7 +16,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class ElevationInterpolator {
private final double[][] values = new double[18][18];
public ElevationInterpolator(ServerWorld world, int chunkX, int chunkZ, BiomeProvider provider, int smooth) {
public ElevationInterpolator(World world, int chunkX, int chunkZ, BiomeProvider provider, int smooth) {
int xOrigin = chunkX << 4;
int zOrigin = chunkZ << 4;

4
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java
View File

@ -8,6 +8,8 @@
package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.World;
import net.jafama.FastMath;
import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator3D;
@ -20,7 +22,7 @@ public class Sampler3D implements Sampler {
private final ChunkInterpolator3D interpolator;
private final ElevationInterpolator elevationInterpolator;
public Sampler3D(int x, int z, BiomeProvider provider, ServerWorld world, int elevationSmooth) {
public Sampler3D(int x, int z, BiomeProvider provider, World world, int elevationSmooth) {
this.interpolator = new ChunkInterpolator3D(world, x, z, provider, (generator, coord) -> generator.getBaseSampler()
.noise(coord,
world.getSeed()));

16
common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java
View File

@ -19,16 +19,6 @@ import com.dfsek.terra.api.world.chunk.generation.util.math.SamplerProvider;
public interface WorldConfig extends StringIdentifiable {
int elevationBlend();
boolean disableTrees();
boolean disableCarving();
boolean disableOres();
boolean disableFlora();
boolean disableStructures();
<T> Registry<T> getRegistry(Class<T> clazz);
ServerWorld getWorld();
@ -39,11 +29,5 @@ public interface WorldConfig extends StringIdentifiable {
ConfigPack getPack();
String getAuthor();
String getVersion();
Map<String, String> getLocatable();
boolean isDisableSaplings();
}

4
common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java
View File

@ -7,6 +7,8 @@
package com.dfsek.terra.api.world.chunk.generation;
import com.dfsek.terra.api.world.World;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@ -24,7 +26,7 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
public interface ChunkGenerator {
void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WritableWorld world,
int chunkZ, int chunkX);
Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth);
Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth);
List<GenerationStage> getGenerationStages();

40
common/implementation/base/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java
View File

@ -57,31 +57,6 @@ public class WorldConfigImpl implements WorldConfig {
return pack.getTemplate().getElevationBlend();
}
@Override
public boolean disableTrees() {
return pack.getTemplate().disableTrees();
}
@Override
public boolean disableCarving() {
return pack.getTemplate().disableCarvers();
}
@Override
public boolean disableOres() {
return pack.getTemplate().disableOres();
}
@Override
public boolean disableFlora() {
return pack.getTemplate().disableFlora();
}
@Override
public boolean disableStructures() {
return pack.getTemplate().disableStructures();
}
@Override
@SuppressWarnings("unchecked")
public <T> Registry<T> getRegistry(Class<T> clazz) {
@ -108,26 +83,11 @@ public class WorldConfigImpl implements WorldConfig {
return pack;
}
@Override
public String getAuthor() {
return pack.getAuthor();
}
@Override
public String getVersion() {
return pack.getVersion();
}
@Override
public Map<String, String> getLocatable() {
return pack.getLocatable();
}
@Override
public boolean isDisableSaplings() {
return getTemplate().isDisableSaplings();
}
@Override
public String getID() {
return pack.getID();