mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 08:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove ChunkGenerator#getPack

Browse Source
This commit is contained in:
dfsek 2021-12-02 09:13:40 -07:00
parent fc073325fb
commit fab02d4d16
4 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package com.dfsek.terra.addons.chunkgenerator.layer; package com.dfsek.terra.addons.chunkgenerator.layer;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.util.math.Sampler; import com.dfsek.terra.api.util.math.Sampler;
import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.WritableWorld;
@ -26,11 +25,6 @@ public class LayeredChunkGenerator implements ChunkGenerator {
return null; return null;
} }
@Override
public ConfigPack getConfigPack() {
return null;
}
@Override @Override
public List<GenerationStage> getGenerationStages() { public List<GenerationStage> getGenerationStages() {
return null; return null;

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

@ -103,11 +103,6 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
return new Sampler3D(chunkX, chunkZ, provider, world, elevationSmooth); return new Sampler3D(chunkX, chunkZ, provider, world, elevationSmooth);
} }
@Override
public ConfigPack getConfigPack() {
return configPack;
}
@Override @Override
public List<GenerationStage> getGenerationStages() { public List<GenerationStage> getGenerationStages() {
return generationStages; return generationStages;

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

@ -7,22 +7,18 @@
package com.dfsek.terra.api.world.chunk.generation; package com.dfsek.terra.api.world.chunk.generation;
import com.dfsek.terra.api.util.vector.integer.Vector3Int;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.WritableWorld;
import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.util.math.Sampler; import com.dfsek.terra.api.util.math.Sampler;
import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.util.vector.integer.Vector3Int;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.WritableWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
public interface ChunkGenerator { public interface ChunkGenerator {
@ -30,8 +26,6 @@ public interface ChunkGenerator {
int chunkZ, int chunkX); int chunkZ, int chunkX);
Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth); Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth);
ConfigPack getConfigPack();
List<GenerationStage> getGenerationStages(); List<GenerationStage> getGenerationStages();
BlockState getBlock(ServerWorld world, int x, int y, int z); BlockState getBlock(ServerWorld world, int x, int y, int z);

10
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
View File

@ -60,7 +60,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
@Override @Override
public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z, @NotNull ChunkData chunkData) { public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z, @NotNull ChunkData chunkData) {
if(this.worldConfig == null) { if(this.worldConfig == null) {
this.worldConfig = delegate.getConfigPack().toWorldConfig(BukkitAdapter.adapt(Bukkit.getWorld(worldInfo.getUID()))); this.worldConfig = pack.toWorldConfig(BukkitAdapter.adapt(Bukkit.getWorld(worldInfo.getUID())));
} }
delegate.generateChunkData(new BukkitProtoChunk(chunkData), worldConfig.getWorld(), z, x); delegate.generateChunkData(new BukkitProtoChunk(chunkData), worldConfig.getWorld(), z, x);
} }
@ -77,22 +77,22 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
@Override @Override
public boolean shouldGenerateCaves() { public boolean shouldGenerateCaves() {
return delegate.getConfigPack().vanillaCaves(); return pack.vanillaCaves();
} }
@Override @Override
public boolean shouldGenerateDecorations() { public boolean shouldGenerateDecorations() {
return delegate.getConfigPack().vanillaFlora(); return pack.vanillaFlora();
} }
@Override @Override
public boolean shouldGenerateMobs() { public boolean shouldGenerateMobs() {
return delegate.getConfigPack().vanillaMobs(); return pack.vanillaMobs();
} }
@Override @Override
public boolean shouldGenerateStructures() { public boolean shouldGenerateStructures() {
return delegate.getConfigPack().vanillaStructures(); return pack.vanillaStructures();
} }
public WorldConfig getWorldConfig() { public WorldConfig getWorldConfig() {