mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-06 07:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Faster Schematic Placement

Browse Source
This commit is contained in:
Daniel Mills
2020-01-08 13:50:43 -05:00
parent 4094034aaf
commit ad7a4503e0
7 changed files with 201 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java
View File

@@ -20,8 +20,7 @@ import ninja.bytecode.iris.generator.layer.GenLayerOreGold;
import ninja.bytecode.iris.generator.layer.GenLayerOreIron;
import ninja.bytecode.iris.generator.layer.GenLayerOreLapis;
import ninja.bytecode.iris.generator.layer.GenLayerRidge;
import ninja.bytecode.iris.generator.populator.BiomeBiasSchematicPopulator;
import ninja.bytecode.iris.schematic.Schematic;
import ninja.bytecode.iris.generator.populator.ObjectPopulator;
import ninja.bytecode.iris.schematic.SchematicGroup;
import ninja.bytecode.iris.spec.IrisBiome;
import ninja.bytecode.iris.spec.IrisDimension;
@@ -255,28 +254,13 @@ public class IrisGenerator extends ParallelChunkGenerator
if(Iris.settings.gen.doSchematics)
{
int b = 0;
int sch = 0;
for(IrisBiome i : IrisBiome.getAllBiomes().copy().add(dim.getBiomes()))
{
b++;
L.i("Processing Populators for Biome " + i.getName());
for(String j : i.getSchematicGroups().keySet())
{
SchematicGroup gs = loadSchematics(j);
sch += gs.size();
p.add(new BiomeBiasSchematicPopulator(i.getSchematicGroups().get(j), i, gs.getSchematics().toArray(new Schematic[gs.size()])));
}
}
L.i("Initialized " + b + " Biomes with " + p.size() + " Populators using " + sch + " Schematics");
p.add(new ObjectPopulator(this));
}
return p;
}
private SchematicGroup loadSchematics(String folder)
public SchematicGroup loadSchematics(String folder)
{
return Iris.schematics.get(folder);
}

121
src/main/java/ninja/bytecode/iris/generator/populator/ObjectPopulator.java Normal file
View File

@@ -0,0 +1,121 @@
package ninja.bytecode.iris.generator.populator;
import java.util.Random;
import org.bukkit.Chunk;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.generator.BlockPopulator;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.generator.IrisGenerator;
import ninja.bytecode.iris.schematic.SchematicGroup;
import ninja.bytecode.iris.spec.IrisBiome;
import ninja.bytecode.shuriken.collections.GMap;
import ninja.bytecode.shuriken.collections.GSet;
import ninja.bytecode.shuriken.math.M;
public class ObjectPopulator extends BlockPopulator
{
private GMap<Biome, IrisBiome> biomeMap;
private GMap<Biome, GMap<SchematicGroup, Double>> populationCache;
public ObjectPopulator(IrisGenerator generator)
{
biomeMap = new GMap<>();
populationCache = new GMap<>();
for(IrisBiome i : generator.getLoadedBiomes())
{
biomeMap.put(i.getRealBiome(), i);
GMap<SchematicGroup, Double> gk = new GMap<>();
for(String j : i.getSchematicGroups().k())
{
gk.put(Iris.schematics.get(j), i.getSchematicGroups().get(j));
}
populationCache.put(i.getRealBiome(), gk);
}
}
@Override
public void populate(World world, Random random, Chunk source)
{
GSet<Biome> hits = new GSet<>();
for(int i = 0; i < Iris.settings.performance.decorationAccuracy; i++)
{
int x = (source.getX() << 4) + random.nextInt(16);
int z = (source.getZ() << 4) + random.nextInt(16);
Biome biome = world.getBiome(x, z);
if(hits.contains(biome))
{
continue;
}
IrisBiome ibiome = biomeMap.get(biome);
if(ibiome == null)
{
continue;
}
GMap<SchematicGroup, Double> objects = populationCache.get(biome);
if(objects == null)
{
continue;
}
hits.add(biome);
populate(world, random, source, biome, objects);
}
}
private void populate(World world, Random random, Chunk source, Biome biome, GMap<SchematicGroup, Double> objects)
{
for(SchematicGroup i : objects.k())
{
for(int j = 0; j < getTries(objects.get(i)); j++)
{
int x = (source.getX() << 4) + random.nextInt(16);
int z = (source.getZ() << 4) + random.nextInt(16);
Block b = world.getHighestBlockAt(x, z);
if(!b.getRelative(BlockFace.DOWN).getType().isSolid())
{
return;
}
i.getSchematics().get(random.nextInt(i.getSchematics().size())).place(world, x, b.getY() - 1, z);
}
}
}
public int getTries(double chance)
{
if(chance <= 0)
{
return 0;
}
if(Math.floor(chance) == chance)
{
return (int) chance;
}
int floor = (int) Math.floor(chance);
if(chance - floor > 0 && M.r(chance - floor))
{
floor++;
}
return floor;
}
}