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

Fix feature placements

Browse Source
This commit is contained in:
Daniel Mills 2021-08-03 23:02:46 -04:00
parent 412c67b47a
commit ee78249c2f
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@ -19,6 +19,7 @@
package com.volmit.iris.engine;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedWorldManager;
import com.volmit.iris.engine.object.*;
@ -44,7 +45,7 @@ import java.util.stream.Stream;
public class IrisWorldManager extends EngineAssignedWorldManager {
private final int art;
private final KMap<UUID, Long> spawnCooldowns;
private final KMap<Long, Long> chunkCooldowns;
private int entityCount = 0;
private final ChronoLatch cl;
private int actuallySpawned = 0;
@ -52,7 +53,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
public IrisWorldManager(Engine engine) {
super(engine);
cl = new ChronoLatch(5000);
spawnCooldowns = new KMap<>();
chunkCooldowns = new KMap<>();
art = J.ar(this::onAsyncTick, 7);
}
@ -71,33 +72,26 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
}
int maxGroups = 3;
int biomeBaseCooldownSeconds = IrisSettings.get().getGeneral().isDebug() ? 0 : 15;
int chunkCooldownSeconds = 60;
for (UUID i : spawnCooldowns.k()) {
if (M.ms() - spawnCooldowns.get(i) > TimeUnit.SECONDS.toMillis(biomeBaseCooldownSeconds)) {
spawnCooldowns.remove(i);
for (Long i : chunkCooldowns.k()) {
if (M.ms() - chunkCooldowns.get(i) > TimeUnit.SECONDS.toMillis(chunkCooldownSeconds)) {
chunkCooldowns.remove(i);
}
}
KMap<UUID, KList<Chunk>> data = mapChunkBiomes();
int spawnBuffer = 32;
for (UUID i : data.k().shuffleCopy(RNG.r)) {
if (spawnCooldowns.containsKey(i)) {
continue;
}
for (Chunk c : getEngine().getWorld().realWorld().getLoadedChunks()) {
if (spawnBuffer-- < 0) {
break;
}
for (int ig = 0; ig < data.get(i).size() / 8; ig++) {
Chunk c = data.get(i).getRandom();
IrisBiome biome = getEngine().getSurfaceBiome(c);
IrisRegion region = getEngine().getRegion(c);
spawnIn(c, biome, region, i, maxGroups);
spawnCooldowns.put(i, M.ms());
}
spawnIn(c, biome, region, maxGroups);
chunkCooldowns.put(Cache.key(c), M.ms());
}
if (actuallySpawned <= 0) {
@ -105,7 +99,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
}
}
private void spawnIn(Chunk c, IrisBiome biome, IrisRegion region, UUID id, int max) {
private void spawnIn(Chunk c, IrisBiome biome, IrisRegion region, int max) {
if (c.getEntities().length > 2) {
return;
}
@ -130,11 +124,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
.shuffleCopy(RNG.r).stream().filter(this::canSpawn)
.flatMap(this::stream)))
.collect(Collectors.toList()))
.popRandom(RNG.r, max).forEach((i) -> spawn(c, id, i));
.popRandom(RNG.r, max).forEach((i) -> spawn(c, i));
//@done
}
private void spawn(Chunk c, UUID id, IrisEntitySpawn i) {
private void spawn(Chunk c, IrisEntitySpawn i) {
if (i.spawn(getEngine(), c, RNG.r)) {
actuallySpawned++;
getCooldown(i.getReferenceSpawner()).spawn(getEngine());

8
src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java
View File

@ -597,12 +597,12 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
double a = Math.max(v.getW(), v.getD());
for (IrisFeaturePositional k : rw.getFeatures()) {
if (k.getX() == xx && k.getZ() == zz) {
if (k.getX() == xx+1 && k.getZ() == zz-1) {
break;
}
}
rw.getFeatures().add(new IrisFeaturePositional(xx, zz, j.getZone()));
rw.getFeatures().add(new IrisFeaturePositional(xx+1, zz-1, j.getZone()));
}
}
}
@ -660,12 +660,12 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
double a = Math.max(v.getW(), v.getD());
for (IrisFeaturePositional k : rw.getFeatures()) {
if (k.getX() == xx && k.getZ() == zz) {
if (k.getX() == xx+1 && k.getZ() == zz-1) {
continue placing;
}
}
rw.getFeatures().add(new IrisFeaturePositional(xx, zz, j.getZone()));
rw.getFeatures().add(new IrisFeaturePositional(xx+1, zz-1, j.getZone()));
}
}
}

2
src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java
View File

@ -21,6 +21,7 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.documentation.ChunkCoordinates;
import com.volmit.iris.util.math.RNG;
import lombok.Data;
@ -37,6 +38,7 @@ public class IrisFeaturePotential {
@Desc("")
private IrisFeature zone = new IrisFeature();
@ChunkCoordinates
public boolean hasZone(RNG rng, int cx, int cz) {
return rng.nextInt(rarity) == 0;
}