From 78e9f2143939b867bf0aecb72fe61c0beb493013 Mon Sep 17 00:00:00 2001 From: DanMB Date: Tue, 13 Sep 2022 23:32:11 -0400 Subject: [PATCH] f --- .../iris/core/nms/v19_2/NMSBinding19_2.java | 16 ++++++++++++---- .../iris/engine/platform/DummyBiomeProvider.java | 14 -------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java b/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java index 6663b563f..c595ca6ac 100644 --- a/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java +++ b/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java @@ -22,7 +22,9 @@ package com.volmit.iris.core.nms.v19_2; import com.volmit.iris.Iris; import com.volmit.iris.core.nms.INMSBinding; import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.nbt.io.NBTUtil; import com.volmit.iris.util.nbt.mca.NBTWorld; import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer; @@ -37,20 +39,20 @@ import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer; import com.volmit.iris.util.nbt.tag.CompoundTag; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.core.*; +import net.minecraft.core.Registry; import net.minecraft.nbt.NbtIo; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.World; +import net.minecraft.world.level.chunk.LevelChunk; +import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.v1_19_R1.CraftChunk; import org.bukkit.craftbukkit.v1_19_R1.CraftServer; import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData; @@ -333,6 +335,12 @@ public class NMSBinding19_2 implements INMSBinding { return true; } + public void setBiomes(int cx, int cz, World world, Hunk biomes) { + LevelChunk c = ((CraftWorld)world).getHandle().getChunk(cx, cz); + biomes.iterateSync((x,y,z,b) -> c.setBiome(x, y, z, (Holder)b)); + c.setUnsaved(true); + } + @Override public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) { try { diff --git a/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java b/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java index 4b6d74812..5a5f4c4b7 100644 --- a/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java +++ b/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java @@ -15,20 +15,6 @@ public class DummyBiomeProvider extends BiomeProvider { @NotNull @Override public Biome getBiome(@NotNull WorldInfo worldInfo, int x, int y, int z) { - if(x == 10000 && z == 10000) { - try - { - Iris.error("Im biome provider, who am i?"); - Iris.error(getClass().getCanonicalName()); - throw new RuntimeException("WHATS GOING ON"); - } - - catch(Throwable e) - { - e.printStackTrace(); - } - } - return Biome.PLAINS; }