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

yey

Browse Source
This commit is contained in:
RePixelatedMC 2024-10-22 21:20:29 +02:00
parent 9950551ecb
commit b7dcdd2921
3 changed files with 108 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java
View File

@ -18,29 +18,20 @@
package com.volmit.iris.engine.actuator; package com.volmit.iris.engine.actuator;
import com.volmit.iris.Iris;
import com.volmit.iris.core.nms.IMemoryWorld; import com.volmit.iris.core.nms.IMemoryWorld;
import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.framework.EngineAssignedActuator;
import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisMerger;
import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.engine.object.IrisRegion;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.context.ChunkContext; import com.volmit.iris.util.context.ChunkContext;
import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.BlockCoordinates;
import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.Hunk;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.misc.E;
import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import io.papermc.lib.PaperLib;
import lombok.Getter; import lombok.Getter;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator;
import javax.annotation.Nullable;
import java.util.concurrent.atomic.AtomicReference;
public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData> { public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData> {
private static final BlockData AIR = Material.AIR.createBlockData(); private static final BlockData AIR = Material.AIR.createBlockData();
@ -49,6 +40,7 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData>
private static final BlockData LAVA = Material.LAVA.createBlockData(); private static final BlockData LAVA = Material.LAVA.createBlockData();
private static final BlockData GLASS = Material.GLASS.createBlockData(); private static final BlockData GLASS = Material.GLASS.createBlockData();
private static final BlockData CAVE_AIR = Material.CAVE_AIR.createBlockData(); private static final BlockData CAVE_AIR = Material.CAVE_AIR.createBlockData();
private static final BlockData FILLER = Material.STONE.createBlockData();
private IMemoryWorld memoryWorld; private IMemoryWorld memoryWorld;
@Getter @Getter
private final RNG rng; private final RNG rng;
@ -156,7 +148,10 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator<BlockData>
continue; continue;
} }
getDimension().getMerger().generateVanillaUnderground(x, z, h, getEngine()); if (getDimension().isEnableExperimentalMerger()) {
h.set(xf, i, zf, FILLER);
continue;
}
BlockData ore = biome.generateOres(realX, i, realZ, rng, getData()); BlockData ore = biome.generateOres(realX, i, realZ, rng, getData());
ore = ore == null ? region.generateOres(realX, i, realZ, rng, getData()) : ore; ore = ore == null ? region.generateOres(realX, i, realZ, rng, getData()) : ore;

141
core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java
View File

@ -3,29 +3,39 @@ package com.volmit.iris.engine.object;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.nms.IMemoryWorld; import com.volmit.iris.core.nms.IMemoryWorld;
import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.core.nms.container.Pair;
import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.context.ChunkedDataCache; import com.volmit.iris.util.context.ChunkedDataCache;
import com.volmit.iris.util.format.Form; import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.Hunk;
import com.volmit.iris.util.hunk.view.ChunkDataHunkView; import com.volmit.iris.util.hunk.view.ChunkDataHunkView;
import com.volmit.iris.util.math.Position2;
import com.volmit.iris.util.math.RollingSequence; import com.volmit.iris.util.math.RollingSequence;
import com.volmit.iris.util.misc.E; import com.volmit.iris.util.misc.E;
import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.BurstExecutor;
import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.parallel.MultiBurst;
import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import com.volmit.iris.util.scheduling.Queue;
import com.volmit.iris.util.scheduling.ShurikenQueue;
import it.unimi.dsi.fastutil.Hash;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Function;
import static org.bukkit.Bukkit.createChunkData; import static org.bukkit.Bukkit.createChunkData;
@ -36,6 +46,11 @@ import static org.bukkit.Bukkit.createChunkData;
public class IrisMerger { public class IrisMerger {
private transient RollingSequence mergeDuration = new RollingSequence(20); private transient RollingSequence mergeDuration = new RollingSequence(20);
private transient World worldsave; private transient World worldsave;
private transient ReentrantLock lock = new ReentrantLock();
private transient ChunkGenerator chunkGenerator;
private static final BlockData FILLER = Material.STONE.createBlockData();
private transient KMap<Pair<Position2, Hunk<BlockData>>, Boolean> chunks = new KMap<>();
private transient Queue<Pair<Position2, Hunk<BlockData>>> queue = new ShurikenQueue<>();
@Desc("Selected Generator") @Desc("Selected Generator")
private String generator; private String generator;
@ -58,11 +73,48 @@ public class IrisMerger {
@Desc("Splits in the engine height") @Desc("Splits in the engine height")
private int split = 0; private int split = 0;
// /**
// * @param position x,z of the chunk
// * @param h copies the exact current state of the hunk.
// */
// public void queueChunk(Position2 position, Hunk<BlockData> h) {
// chunks.put(new Pair<>(position, copyHunkParallel(Hunk.newHunk(h.getWidth(), h.getHeight(), h.getDepth()), Function.identity())), false);
// }
//
// /**
// * Register the chunk as completed.
// * @param position x,z of the chunk
// */
// public void registerChunk(Position2 position, Engine engine) {
// for (Pair<Position2, Hunk<BlockData>> pair : chunks.keySet()) {
// if (!pair.getA().equals(position))
// return;
// if (chunks.get(pair))
// throw new IllegalStateException("Chunk " + pair.getA() + " is already registered");
// chunks.put(pair, true);
// queue.queue(pair);
// chunks.remove(pair);
// }
// executor(engine);
// }
//
// private void executor(Engine engine) {
// if (!lock.isLocked()) {
// lock.lock();
// while (queue.hasNext()) {
// Pair<Position2, Hunk<BlockData>> chunk = queue.next();
// generateVanillaUnderground(chunk.getA().getX(), chunk.getA().getZ(), chunk.getB(), engine);
// }
// lock.unlock();
// }
// }
/** /**
* Merges underground from a selected chunk into the corresponding chunk in the outcome world. * Merges underground from a selected chunk into the corresponding chunk in the outcome world.
*/ */
@Deprecated @Deprecated
public void generateVanillaUnderground(int x, int z, Hunk<BlockData> h, Engine engine) { public void generateVanillaUnderground(int x, int z, Engine engine) {
if (engine.getMemoryWorld() == null) if (engine.getMemoryWorld() == null)
throw new IllegalStateException("MemoryWorld is null. Ensure that it has been initialized."); throw new IllegalStateException("MemoryWorld is null. Ensure that it has been initialized.");
if (engine.getWorld().realWorld() == null) if (engine.getWorld().realWorld() == null)
@ -75,6 +127,7 @@ public class IrisMerger {
World bukkit; World bukkit;
ChunkGenerator.ChunkData chunkData; ChunkGenerator.ChunkData chunkData;
ChunkGenerator.ChunkData chunkDataIris = getChunkDataAt(engine.getWorld().realWorld(), x, z);
if (world.isBlank()) { if (world.isBlank()) {
throw new UnsupportedOperationException("No."); throw new UnsupportedOperationException("No.");
// memoryWorld = engine.getMemoryWorld(); // memoryWorld = engine.getMemoryWorld();
@ -119,36 +172,40 @@ public class IrisMerger {
} }
BlockData blockData = vh.get(xx, y, zz); BlockData blockData = vh.get(xx, y, zz);
h.set(xx, y, zz, blockData);
// nms.setBlock(
// world,
// wX + xx,
// y - minHeight,
// wZ + zz,
// blockData,
// flag,
// 0
// );
// if (nms.hasTile(blockData.getMaterial())) { if (chunkDataIris.getBlockData(xx, y - minHeight, zz).getMaterial() != FILLER.getMaterial() && blockData.getMaterial().isOccluding()) {
// var tile = nms.serializeTile(new Location(bukkit, wX + xx, y - minHeight, wZ + zz)); blockData = chunkDataIris.getBlockData(xx, y - minHeight, zz);
// if (tile != null) { }
// nms.deserializeTile(tile, new Location(world, wX + xx, y - minHeight, wZ + zz));
// }
// }
// if (x % 4 == 0 && z % 4 == 0 && y % 4 == 0) { nms.setBlock(
// Biome biome; world,
// try { wX + xx,
// biome = chunkData.getBiome(xx, y, zz); y - minHeight,
// } catch (UnsupportedOperationException e) { wZ + zz,
// biome = bukkit.getBiome(wX + xx, y, wZ + zz); blockData,
// } flag,
// 0
// if (caveBiomes.contains(biome)) { );
// world.setBiome(wX + xx, y - minHeight, wZ + zz, biome);
// } if (nms.hasTile(blockData.getMaterial())) {
// } var tile = nms.serializeTile(new Location(bukkit, wX + xx, y - minHeight, wZ + zz));
if (tile != null) {
nms.deserializeTile(tile, new Location(world, wX + xx, y - minHeight, wZ + zz));
}
}
if (x % 4 == 0 && z % 4 == 0 && y % 4 == 0) {
Biome biome;
try {
biome = chunkData.getBiome(xx, y, zz);
} catch (UnsupportedOperationException e) {
biome = bukkit.getBiome(wX + xx, y, wZ + zz);
}
if (caveBiomes.contains(biome)) {
world.setBiome(wX + xx, y - minHeight, wZ + zz, biome);
}
}
} }
} }
} }
@ -222,6 +279,20 @@ public class IrisMerger {
return chunkData; return chunkData;
} }
public static <T> Hunk<T> copyHunkParallel(Hunk<T> original, Function<T, T> elementCopier) {
Hunk<T> copy = Hunk.newHunk(original.getWidth(), original.getHeight(), original.getDepth());
original.compute3D((ox, oy, oz, section) -> {
Hunk<T> copySection = copy.croppedView(ox, oy, oz, ox + section.getWidth(), oy + section.getHeight(), oz + section.getDepth());
section.iterate((x, y, z, value) -> {
T copiedValue = value != null ? elementCopier.apply(value) : null;
copySection.set(x, y, z, copiedValue);
});
});
return copy;
}
public void loadWorld(Engine engine) { public void loadWorld(Engine engine) {
if (!engine.getDimension().isEnableExperimentalMerger()) if (!engine.getDimension().isEnableExperimentalMerger())
return; return;
@ -232,17 +303,5 @@ public class IrisMerger {
worldsave = Bukkit.createWorld(worldCreator); worldsave = Bukkit.createWorld(worldCreator);
} }
}); });
// new Thread(() -> {
// try {
// boolean wait = true;
// while (wait) {
// Thread.sleep(100);
// if (Bukkit.getWorld(world) != null)
// wait = false;
// }
// } catch (Exception e) {
// e.printStackTrace();
// }
// });
} }
} }

5
core/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
View File

@ -385,8 +385,9 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
@EventHandler @EventHandler
private void onChunkGeneration(ChunkLoadEvent event) { private void onChunkGeneration(ChunkLoadEvent event) {
//if(!event.isNewChunk() || !engine.getWorld().realWorld().equals(event.getWorld()) || !engine.getDimension().isEnableExperimentalMerger() || engine.getMemoryWorld() == null) return; if (!event.isNewChunk() || !engine.getWorld().realWorld().equals(event.getWorld()) || !engine.getDimension().isEnableExperimentalMerger() || engine.getMemoryWorld() == null)
//engine.getMerger().generateVanillaUnderground(event.getChunk().getX(), event.getChunk().getZ(), engine); return;
engine.getMerger().generateVanillaUnderground(event.getChunk().getX(), event.getChunk().getZ(), engine);
} }
@Override @Override