Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-01-06 15:51:30 +00:00
Code Issues Releases Activity

Stability

Browse Source
This commit is contained in:
RePixelatedMC
2024-10-28 11:12:24 +01:00
parent 6c69c69868
commit b1bb01665a
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,12 @@ import org.bukkit.*;
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.generator.ChunkGenerator;
import java.io.File;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Function;
@@ -95,13 +99,15 @@ public class IrisMerger {
ChunkGenerator.ChunkData chunkDataIris = getChunkDataAt(engine.getWorld().realWorld(), x, z);
if (world.isBlank()) {
throw new UnsupportedOperationException("No.");
// memoryWorld = engine.getMemoryWorld();
// bukkit = memoryWorld.getBukkit();
// chunkData = memoryWorld.getChunkData(x, z);
// memoryWorld = engine.getMemoryWorld();
// bukkit = memoryWorld.getBukkit();
// chunkData = memoryWorld.getChunkData(x, z);
} else {
bukkit = Bukkit.getWorld(world);
if (bukkit == null)
throw new IllegalStateException("Somehow world is null? Initialization Failed!");
if (bukkit == null) {
Iris.info("World " + world + " not loaded yet, cannot generate chunk at (" + x + ", " + z + ")");
return;
}
chunkData = getChunkDataAt(bukkit, x, z);
}
@@ -149,7 +155,7 @@ public class IrisMerger {
blockData = dps.createBlockData();
}
} catch (Exception e) {
Iris.error(e.getMessage());
//Iris.error(e.getMessage());
}
}
}
@@ -296,16 +302,30 @@ public class IrisMerger {
return copy;
}
public void loadWorld(Engine engine) {
if (!engine.getDimension().isEnableExperimentalMerger())
return;
J.sfut(() -> {
worldsave = Bukkit.getWorld(world);
if (worldsave == null) {
WorldCreator worldCreator = new WorldCreator(world);
worldsave = Bukkit.createWorld(worldCreator);
}
});
World bukkitWorld = Bukkit.getWorld(world);
if(!new File(Bukkit.getWorldContainer(), world).exists())
throw new IllegalStateException("World does not exist!");
if (bukkitWorld == null) {
Iris.info("World " + world + " is not loaded yet, creating it.");
Bukkit.getPluginManager().registerEvents(new Listener() {
@EventHandler
public void onWorldLoad(WorldLoadEvent event) {
if (event.getWorld().getName().equals(world)) {
worldsave = event.getWorld();
Iris.info("World " + world + " has been loaded.");
}
}
}, Iris.instance);
WorldCreator worldCreator = new WorldCreator(world);
Bukkit.createWorld(worldCreator);
} else {
worldsave = bukkitWorld;
}
}
}

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

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