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

Merge remote-tracking branch 'mcwg/v3.4.3' into v3.4.3

Browse Source
This commit is contained in:
RePixelatedMC
2024-09-28 14:35:37 +02:00
parent 1b0f4e6af6 1a96128321
commit 34a67dc781
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
View File

@@ -161,8 +161,8 @@ public class CommandDeveloper implements DecreeExecutor {
} }
@Decree(description = "Fix biomes in a iris world") @Decree(description = "Fix biomes in a iris world", aliases = {"fb"} )
public void fixBiomes( public void fixbiomes(
@Param(description = "The IrisWorld to fix biomes at") World world) { @Param(description = "The IrisWorld to fix biomes at") World world) {
IrisBiomeFixer biomeFixer = new IrisBiomeFixer(world); IrisBiomeFixer biomeFixer = new IrisBiomeFixer(world);

25
core/src/main/java/com/volmit/iris/core/tools/IrisBiomeFixer.java
View File

@@ -7,6 +7,7 @@ import com.volmit.iris.engine.object.IrisBiomeCustom;
import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.M;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
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.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.ChronoLatch;
import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.J;
import org.bukkit.World; import org.bukkit.World;
@@ -109,16 +110,28 @@ public class IrisBiomeFixer {
for (int y = minY; y < maxY; y++) { for (int y = minY; y < maxY; y++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
Block block = chunk.getBlock(x, y, z); Block block = chunk.getBlock(x, y, z);
Biome bukkitBiome = null; Biome bukkitBiome;
IrisBiome irisBiome = engine.getBiome(x, y, z); IrisBiome irisBiome = engine.getBiome(x, y, z);
IrisBiomeCustom custom = irisBiome.getCustomBiome(rng, x, y, z);
if (custom != null) {
bukkitBiome = Biome.valueOf(custom.getId().toUpperCase());
} else {
try {
// Try to get the custom biome
IrisBiomeCustom custom = irisBiome.getCustomBiome(rng, x, y, z);
if (custom != null) {
bukkitBiome = Biome.valueOf(custom.getId().toUpperCase());
} else {
// Fallback to derivative biome if custom biome is null
bukkitBiome = irisBiome.getDerivative();
}
} catch (NullPointerException e) {
// So else will fail. But this works lol
bukkitBiome = irisBiome.getDerivative();
} }
if (bukkitBiome == null) {
// This should be impossible
bukkitBiome = Biome.CUSTOM;
Iris.warn("Biome NULL! using plains as fallback!");
}
world.setBiome(block.getX(), block.getY(), block.getZ(), bukkitBiome); world.setBiome(block.getX(), block.getY(), block.getZ(), bukkitBiome);
} }
} }