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

Populators work now

Browse Source
This commit is contained in:
dfsek
2020-12-10 23:09:53 -07:00
parent c7539dc5dd
commit af5309ff21
11 changed files with 114 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/dfsek/terra/api/generic/generator/TerraChunkGenerator.java
View File

@@ -6,6 +6,7 @@ import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.config.base.ConfigPack;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Random;
public interface TerraChunkGenerator {
@@ -25,4 +26,6 @@ public interface TerraChunkGenerator {
ConfigPack getConfigPack();
List<TerraBlockPopulator> getPopulators();
}

12
src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitWorld.java
View File

@@ -85,4 +85,16 @@ public class BukkitWorld implements World {
public org.bukkit.World getHandle() {
return delegate;
}
@Override
public boolean equals(Object obj) {
if(!(obj instanceof BukkitWorld)) return false;
BukkitWorld other = (BukkitWorld) obj;
return other.getHandle().equals(delegate);
}
@Override
public int hashCode() {
return delegate.hashCode();
}
}

33
src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitChunkGeneratorWrapper.java
View File

@@ -4,10 +4,13 @@ import com.dfsek.terra.api.generic.generator.TerraChunkGenerator;
import com.dfsek.terra.api.implementations.bukkit.BukkitBiomeGrid;
import com.dfsek.terra.api.implementations.bukkit.BukkitWorld;
import org.bukkit.World;
import org.bukkit.generator.BlockPopulator;
import org.bukkit.generator.ChunkGenerator;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
public class BukkitChunkGeneratorWrapper extends ChunkGenerator {
private final TerraChunkGenerator delegate;
@@ -26,4 +29,34 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator {
public TerraChunkGenerator getDelegate() {
return delegate;
}
@Override
public @NotNull List<BlockPopulator> getDefaultPopulators(@NotNull World world) {
return delegate.getPopulators().stream().map(BukkitPopulatorWrapper::new).collect(Collectors.toList());
}
@Override
public boolean isParallelCapable() {
return delegate.isParallelCapable();
}
@Override
public boolean shouldGenerateCaves() {
return delegate.shouldGenerateCaves();
}
@Override
public boolean shouldGenerateDecorations() {
return delegate.shouldGenerateDecorations();
}
@Override
public boolean shouldGenerateMobs() {
return delegate.shouldGenerateMobs();
}
@Override
public boolean shouldGenerateStructures() {
return super.shouldGenerateStructures();
}
}

24
src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitPopulatorWrapper.java Normal file
View File

@@ -0,0 +1,24 @@
package com.dfsek.terra.api.implementations.bukkit.generator;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.implementations.bukkit.BukkitChunk;
import com.dfsek.terra.api.implementations.bukkit.BukkitWorld;
import org.bukkit.Chunk;
import org.bukkit.World;
import org.bukkit.generator.BlockPopulator;
import org.jetbrains.annotations.NotNull;
import java.util.Random;
public class BukkitPopulatorWrapper extends BlockPopulator {
private final TerraBlockPopulator delegate;
public BukkitPopulatorWrapper(TerraBlockPopulator delegate) {
this.delegate = delegate;
}
@Override
public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk source) {
delegate.populate(new BukkitWorld(world), random, new BukkitChunk(source));
}
}

8
src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitMaterialData.java
View File

@@ -40,4 +40,12 @@ public class BukkitMaterialData implements MaterialData {
public int hashCode() {
return delegate.hashCode();
}
@Override
public boolean equals(Object obj) {
if(!(obj instanceof BukkitMaterialData)) return false;
BukkitMaterialData other = (BukkitMaterialData) obj;
return other.getHandle().equals(this.delegate);
}
}

25
src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
View File

@@ -8,25 +8,33 @@ import com.dfsek.terra.api.gaea.population.PopulationManager;
import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
import com.dfsek.terra.api.gaea.profiler.WorldProfiler;
import com.dfsek.terra.api.gaea.world.palette.Palette;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.generator.ChunkGenerator;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.generic.world.BiomeGrid;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.vector.Vector3;
import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.lang.LangUtil;
import com.dfsek.terra.config.templates.BiomeTemplate;
import com.dfsek.terra.debug.Debug;
import com.dfsek.terra.population.CavePopulator;
import com.dfsek.terra.population.FloraPopulator;
import com.dfsek.terra.population.OrePopulator;
import com.dfsek.terra.population.StructurePopulator;
import com.dfsek.terra.population.TreePopulator;
import com.dfsek.terra.util.PaletteUtil;
import com.dfsek.terra.util.SlabUtil;
import org.jetbrains.annotations.NotNull;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.logging.Level;
@@ -35,16 +43,16 @@ public class TerraChunkGenerator implements com.dfsek.terra.api.generic.generato
private static final Map<World, PopulationManager> popMap = new HashMap<>();
private final PopulationManager popMan;
private final ConfigPack configPack;
private final TerraBukkitPlugin main;
private final TerraPlugin main;
private boolean needsLoad = true;
public TerraChunkGenerator(ConfigPack c, TerraBukkitPlugin main) {
public TerraChunkGenerator(ConfigPack c, TerraPlugin main) {
popMan = new PopulationManager(main);
this.configPack = c;
this.main = main;
//popMan.attach(new OrePopulator(main));
//popMan.attach(new TreePopulator(main));
//popMan.attach(new FloraPopulator(main));
popMan.attach(new OrePopulator(main));
popMan.attach(new TreePopulator(main));
popMan.attach(new FloraPopulator(main));
}
public static synchronized void saveAll() {
@@ -93,6 +101,11 @@ public class TerraChunkGenerator implements com.dfsek.terra.api.generic.generato
return configPack;
}
@Override
public List<TerraBlockPopulator> getPopulators() {
return Arrays.asList(new CavePopulator(main), new StructurePopulator(main), popMan);
}
@Override
@SuppressWarnings({"try"})

6
src/main/java/com/dfsek/terra/population/CavePopulator.java
View File

@@ -1,11 +1,11 @@
package com.dfsek.terra.population;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.generic.world.block.MaterialData;
import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
@@ -13,10 +13,10 @@ import java.util.Map;
import java.util.Random;
public class CavePopulator implements TerraBlockPopulator {
private final TerraBukkitPlugin main;
private final TerraPlugin main;
private static final Map<MaterialData, BlockData> shiftStorage = new HashMap<>(); // Persist BlockData created for shifts, to avoid re-calculating each time.
public CavePopulator(TerraBukkitPlugin main) {
public CavePopulator(TerraPlugin main) {
this.main = main;
}

6
src/main/java/com/dfsek/terra/population/FloraPopulator.java
View File

@@ -3,11 +3,11 @@ package com.dfsek.terra.population;
import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.vector.Vector2;
import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
import com.dfsek.terra.generation.items.flora.FloraLayer;
@@ -22,9 +22,9 @@ import java.util.Random;
* Populates Flora and Trees
*/
public class FloraPopulator implements TerraBlockPopulator {
private final TerraBukkitPlugin main;
private final TerraPlugin main;
public FloraPopulator(TerraBukkitPlugin main) {
public FloraPopulator(TerraPlugin main) {
this.main = main;
}

6
src/main/java/com/dfsek/terra/population/OrePopulator.java
View File

@@ -6,11 +6,11 @@ import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.gaea.math.MathUtil;
import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
import com.dfsek.terra.api.gaea.util.FastRandom;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.vector.Vector3;
import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.config.templates.BiomeTemplate;
import org.jetbrains.annotations.NotNull;
@@ -18,9 +18,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.Random;
public class OrePopulator implements TerraBlockPopulator {
private final TerraBukkitPlugin main;
private final TerraPlugin main;
public OrePopulator(TerraBukkitPlugin main) {
public OrePopulator(TerraPlugin main) {
this.main = main;
}

6
src/main/java/com/dfsek/terra/population/StructurePopulator.java
View File

@@ -1,17 +1,17 @@
package com.dfsek.terra.population;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.Random;
public class StructurePopulator implements TerraBlockPopulator {
private final TerraBukkitPlugin main;
private final TerraPlugin main;
public StructurePopulator(TerraBukkitPlugin main) {
public StructurePopulator(TerraPlugin main) {
this.main = main;
}

6
src/main/java/com/dfsek/terra/population/TreePopulator.java
View File

@@ -3,11 +3,11 @@ package com.dfsek.terra.population;
import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.generic.generator.TerraBlockPopulator;
import com.dfsek.terra.api.generic.world.Chunk;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.generic.world.vector.Vector2;
import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
import com.dfsek.terra.generation.items.tree.TreeLayer;
@@ -18,9 +18,9 @@ import java.util.Random;
public class TreePopulator implements TerraBlockPopulator {
private final TerraBukkitPlugin main;
private final TerraPlugin main;
public TreePopulator(TerraBukkitPlugin main) {
public TreePopulator(TerraPlugin main) {
this.main = main;
}