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

old generators in new api

This commit is contained in:
Huynh Tien 2021-11-09 17:12:58 +07:00
parent 30f59d2a31
commit 3cda4fb985
2 changed files with 107 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java
View File

@ -2,21 +2,21 @@ package world.bentobox.caveblock.generators;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Random; import java.util.Random;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.generator.BiomeProvider;
import org.bukkit.block.data.BlockData; import org.bukkit.generator.BlockPopulator;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;
import org.bukkit.generator.WorldInfo;
import world.bentobox.bentobox.BentoBox; import org.bukkit.generator.WorldInfo;
import world.bentobox.caveblock.CaveBlock; import world.bentobox.caveblock.CaveBlock;
import world.bentobox.caveblock.Settings; import world.bentobox.caveblock.Settings;
import world.bentobox.caveblock.generators.populators.EntitiesPopulator;
import world.bentobox.caveblock.generators.populators.FlatBiomeProvider;
import world.bentobox.caveblock.generators.populators.MaterialPopulator;
/** /**
@ -27,153 +27,79 @@ import world.bentobox.caveblock.Settings;
*/ */
public class ChunkGeneratorWorld extends ChunkGenerator public class ChunkGeneratorWorld extends ChunkGenerator
{ {
private CaveBlock addon; private final CaveBlock addon;
private Settings settings; private final Settings settings;
private Map<Environment, ChunkData> map = new EnumMap<>(Environment.class); private final List<BlockPopulator> blockPopulators;
private final Random r = new Random(); private BiomeProvider biomeProvider;
private Map<Environment, List<Ore>> ores = new EnumMap<>(Environment.class);
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Constructor // Section: Constructor
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/** /**
* @param addon - CaveBlock object * @param addon - CaveBlock object
*/ */
public ChunkGeneratorWorld(CaveBlock addon) public ChunkGeneratorWorld(CaveBlock addon) {
{
super();
this.addon = addon; this.addon = addon;
this.settings = addon.getSettings(); this.settings = addon.getSettings();
// Source https://minecraft.fandom.com/wiki/Blob this.blockPopulators = new ArrayList<>(2);
List<Ore> worldOres = new ArrayList<>();
worldOres.add(new Ore(-64, 16, Material.DIAMOND_ORE, 1, 10, true));
worldOres.add(new Ore(-64, 64, Material.LAPIS_ORE, 1, 7, true));
worldOres.add(new Ore(-64, 30, Material.GOLD_ORE, 2, 9, true));
worldOres.add(new Ore(0, 16, Material.TUFF, 2, 33, false));
worldOres.add(new Ore(-64, 16, Material.REDSTONE_ORE, 8, 8, true));
worldOres.add(new Ore(0, 16, Material.GRAVEL, 8 , 33, false));
worldOres.add(new Ore(0, 79, Material.GRANITE, 5, 33, false));
worldOres.add(new Ore(0, 79, Material.ANDESITE,5, 33, false));
worldOres.add(new Ore(0, 79, Material.DIORITE,5, 33, false));
worldOres.add(new Ore(32, 320, Material.EMERALD_ORE, 11, 1, true));
worldOres.add(new Ore(95, 136, Material.COAL_ORE, 20, 17, false));
worldOres.add(new Ore(0, 96, Material.COPPER_ORE, 20, 9, true));
worldOres.add(new Ore(-64, 320, Material.IRON_ORE, 20, 9, true));
worldOres.add(new Ore(-64, 320, Material.CAVE_AIR, 8 , 33, false));
ores.put(Environment.NORMAL, worldOres);
List<Ore> netherOres = new ArrayList<>();
netherOres.add(new Ore(1, 22, Material.ANCIENT_DEBRIS, 1, 5, true));
netherOres.add(new Ore(-64, 30, Material.NETHER_GOLD_ORE, 2, 9, true));
netherOres.add(new Ore(0, 16, Material.GRAVEL, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.BASALT, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.BLACKSTONE, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.FIRE, 8 , 33, false));
netherOres.add(new Ore(200, 320, Material.GLOWSTONE, 8 , 33, false));
netherOres.add(new Ore(-64, 320, Material.CAVE_AIR, 8 , 33, false));
netherOres.add(new Ore(-64, 320, Material.LAVA, 8 , 33, false));
netherOres.add(new Ore(0, 16, Material.MAGMA_BLOCK, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.CRIMSON_FUNGUS, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.WARPED_FUNGUS, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.CRIMSON_NYLIUM, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.WARPED_NYLIUM, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.SHROOMLIGHT, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.CRIMSON_STEM, 8 , 33, false));
netherOres.add(new Ore(0, 320, Material.WARPED_STEM, 8 , 33, false));
netherOres.add(new Ore(-64, 34, Material.SOUL_SOIL, 20, 17, false));
netherOres.add(new Ore(0, 96, Material.NETHER_QUARTZ_ORE, 20, 9, true));
netherOres.add(new Ore(-64, 320, Material.BONE_BLOCK, 20, 9, true));
ores.put(Environment.NETHER, netherOres);
List<Ore> endOres = new ArrayList<>();
endOres.add(new Ore(32, 320, Material.PURPUR_BLOCK, 11, 1, true));
endOres.add(new Ore(95, 136, Material.OBSIDIAN, 20, 17, false));
endOres.add(new Ore(-64, 320, Material.CAVE_AIR, 8 , 33, false));
ores.put(Environment.THE_END, endOres);
reload();
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Methods // Section: Methods
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@Override private Material getGroundCeilMaterial(World.Environment environment) {
public void generateNoise(WorldInfo worldInfo, Random random, int x, int z, ChunkData chunkData) { return switch (environment) {
switch(worldInfo.getEnvironment()) { case NETHER -> this.settings.isNetherRoof() ? Material.BEDROCK : this.settings.getNetherMainBlock();
default: case THE_END -> this.settings.isEndFloor() ? Material.BEDROCK : this.settings.getEndMainBlock();
chunkData.setRegion(0, worldInfo.getMinHeight(), 0, 16, worldInfo.getMaxHeight(), 16, Material.STONE); default -> this.settings.isNormalFloor() ? Material.BEDROCK : this.settings.getNormalMainBlock();
chunkData.setRegion(0, worldInfo.getMinHeight(), 0, 16, 7, 16, Material.DEEPSLATE); };
chunkData.setRegion(0, worldInfo.getMaxHeight() - 1, 0, 16, worldInfo.getMaxHeight(), 16, Material.BEDROCK);
break;
case NETHER:
chunkData.setRegion(0, worldInfo.getMinHeight(), 0, 16, worldInfo.getMaxHeight(), 16, Material.NETHERRACK);
chunkData.setRegion(0, worldInfo.getMinHeight(), 0, 16, 34, 16, Material.SOUL_SAND);
chunkData.setRegion(0, worldInfo.getMaxHeight() - 1, 0, 16, worldInfo.getMaxHeight(), 16, Material.BEDROCK);
break;
case THE_END:
chunkData.setRegion(0, worldInfo.getMinHeight(), 0, 16, worldInfo.getMaxHeight(), 16, Material.END_STONE);
chunkData.setRegion(0, worldInfo.getMaxHeight() - 1, 0, 16, worldInfo.getMaxHeight(), 16, Material.BEDROCK);
break;
}
// Generate ores
for (int y = worldInfo.getMinHeight(); y < worldInfo.getMaxHeight(); y++) {
for (Ore o: ores.get(worldInfo.getEnvironment())) {
if (y > o.minY() && y < o.maxY() && r.nextInt(100) <= o.chance()) {
pasteBlob(chunkData, y, o);
if (o.cont()) {
break;
}
}
}
}
} }
private void pasteBlob(ChunkData chunkData, int y, Ore o) { private Material getBaseMaterial(World.Environment environment) {
//int blobSize = (int) (((double)r.nextInt(o.blob()) / 3) + 1); return switch (environment) {
int blobSize = 1; case NETHER -> this.settings.getNetherMainBlock();
int offset = r.nextInt(16); case THE_END -> this.settings.getEndMainBlock();
for (int x = Math.max(0, offset - blobSize); x < Math.min(16, offset + blobSize); x++) { default -> this.settings.getNormalMainBlock();
for (int z = Math.max(0, offset - blobSize); z < Math.min(16, offset + blobSize); z++) { };
for (int yy = Math.max(chunkData.getMinHeight(), y - blobSize); yy < Math.min(chunkData.getMaxHeight(),y + blobSize); yy++) {
BlockData bd = chunkData.getBlockData(x, yy, z);
if (bd.getMaterial().isSolid() && r.nextBoolean()) {
chunkData.setBlock(x, yy, z, o.material());
}
}
}
}
}
/*
@Override
public void generateSurface(WorldInfo worldInfo, Random random, int x, int z, ChunkData chunkData) {
//BentoBox.getInstance().logDebug("generateSurface " + x + " " + z + " " + chunkData);
} }
@Override @Override
public void generateBedrock(WorldInfo worldInfo, Random random, int x, int z, ChunkData chunkData) { public void generateBedrock(WorldInfo worldInfo, Random random, int chunkX, int chunkZ, ChunkData chunkData) {
//BentoBox.getInstance().logDebug("generateBedrock " + x + " " + z + " " + chunkData); Material material = getGroundCeilMaterial(worldInfo.getEnvironment());
chunkData.setRegion(0, 0, 0, 16, 1, 16, material);
} }
@Override @Override
public void generateCaves(WorldInfo worldInfo, Random random, int x, int z, ChunkData chunkData) { public void generateSurface(WorldInfo worldInfo, Random random, int chunkX, int chunkZ, ChunkData chunkData) {
//BentoBox.getInstance().logDebug("generateCaves " + x + " " + z + " " + chunkData); final int worldHeight = this.settings.getWorldDepth();
Material material = getGroundCeilMaterial(worldInfo.getEnvironment());
chunkData.setRegion(0, worldHeight - 1, 0, 16, worldHeight, 16, material);
} }
*/
/**
* This method sets if given coordinates can be set as spawn location
*/
@Override @Override
public boolean canSpawn(World world, int x, int z) public void generateNoise(WorldInfo worldInfo, Random random, int chunkX, int chunkZ, ChunkData chunkData) {
{ final int worldHeight = this.settings.getWorldDepth();
return true; Material material = getBaseMaterial(worldInfo.getEnvironment());
chunkData.setRegion(0, 1, 0, 16, worldHeight - 1, 16, material);
}
@Override
public List<BlockPopulator> getDefaultPopulators(final World world) {
return this.blockPopulators;
}
@Override
public BiomeProvider getDefaultBiomeProvider(WorldInfo worldInfo) {
return biomeProvider;
} }
@Override @Override
public boolean shouldGenerateNoise() { public boolean shouldGenerateNoise() {
return false; return true;
} }
@Override @Override
@ -186,11 +112,15 @@ public class ChunkGeneratorWorld extends ChunkGenerator
return true; return true;
} }
@Override /**
public boolean shouldGenerateCaves() { * Called when config is reloaded
return true; */
public void reload() {
this.blockPopulators.clear();
this.blockPopulators.add(new MaterialPopulator(this.addon));
this.blockPopulators.add(new EntitiesPopulator(this.addon));
this.biomeProvider = new FlatBiomeProvider(this.addon);
} }
} }

48
src/main/java/world/bentobox/caveblock/generators/populators/FlatBiomeProvider.java Normal file
View File

@ -0,0 +1,48 @@
package world.bentobox.caveblock.generators.populators;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.generator.BiomeProvider;
import org.bukkit.generator.WorldInfo;
import world.bentobox.caveblock.CaveBlock;
import world.bentobox.caveblock.Settings;
import java.util.Collections;
import java.util.List;
public class FlatBiomeProvider extends BiomeProvider {
private final Settings settings;
// ---------------------------------------------------------------------
// Section: Constructor
// ---------------------------------------------------------------------
/**
* @param addon - CaveBlock object
*/
public FlatBiomeProvider(CaveBlock addon) {
this.settings = addon.getSettings();
}
// ---------------------------------------------------------------------
// Section: Methods
// ---------------------------------------------------------------------
private Biome getBiome(World.Environment environment) {
return switch (environment) {
case NETHER -> this.settings.getDefaultNetherBiome();
case THE_END -> this.settings.getDefaultTheEndBiome();
default -> this.settings.getDefaultBiome();
};
}
@Override
public Biome getBiome(WorldInfo worldInfo, int x, int y, int z) {
return getBiome(worldInfo.getEnvironment());
}
@Override
public List<Biome> getBiomes(WorldInfo worldInfo) {
return Collections.singletonList(getBiome(worldInfo.getEnvironment()));
}
}