Upstream
/
AcidIsland
mirror of https://github.com/BentoBoxWorld/AcidIsland.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bugs and code smells.

This commit is contained in:
tastybento 2023-02-09 16:52:06 -08:00
parent 4782d789d8
commit 2039860051
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/world/bentobox/acidisland/world/AcidBiomeProvider.java
View File

@ -27,19 +27,15 @@ public class AcidBiomeProvider extends BiomeProvider {
@Override
public Biome getBiome(WorldInfo worldInfo, int x, int y, int z) {
return switch(worldInfo.getEnvironment()) {
default -> addon.getSettings().getDefaultBiome();
case NETHER -> addon.getSettings().getDefaultNetherBiome();
case THE_END -> addon.getSettings().getDefaultEndBiome();
default -> addon.getSettings().getDefaultBiome();
};
}
@Override
public List<Biome> getBiomes(WorldInfo worldInfo) {
return switch(worldInfo.getEnvironment()) {
default -> List.of(addon.getSettings().getDefaultBiome());
case NETHER -> List.of(addon.getSettings().getDefaultNetherBiome());
case THE_END -> List.of(addon.getSettings().getDefaultEndBiome());
};
return List.of(this.getBiome(worldInfo, 0, 0, 0));
}
}

23
src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
View File

@ -58,25 +58,22 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
chunkData.setRegion(0, worldInfo.getMinHeight(), 0, 16, worldInfo.getMinHeight() + 1, 16, Material.BEDROCK);
chunkData.setRegion(0, worldInfo.getMinHeight() + 1, 0, 16, sh + 1, 16, wc.waterBlock());
// Add some noise
for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) {
int n = (int)(25 * gen.noise((chunkX << 4) + x, (chunkZ << 4) + z, 0.5, 0.5, true));
for (int y = worldInfo.getMinHeight(); y < 25 + n; y++) {
chunkData.setBlock(x, y, z, rand.nextBoolean() ? Material.SAND : Material.SANDSTONE);
}
}
}
addNoise(worldInfo, chunkX, chunkZ, chunkData);
}
if (worldInfo.getEnvironment().equals(Environment.NETHER) && addon.getSettings().isNetherRoof()) {
roofChunk.forEach((k,v) -> chunkData.setBlock(k.getBlockX(), worldInfo.getMaxHeight() + k.getBlockY(), k.getBlockZ(), v));
}
}
@Override
public boolean shouldGenerateBedrock() {
return true;
private void addNoise(@NonNull WorldInfo worldInfo, int chunkX, int chunkZ, @NonNull ChunkData chunkData) {
for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) {
int n = (int)(25 * gen.noise((chunkX << 4) + (double)x, (chunkZ << 4) + (double)z, 0.5, 0.5, true));
for (int y = worldInfo.getMinHeight(); y < 25 + n; y++) {
chunkData.setBlock(x, y, z, rand.nextBoolean() ? Material.SAND : Material.SANDSTONE);
}
}
}
}
@Override