overworld bump

Predict the ETA for pregeneration more rapidly

.github/ISSUE_TEMPLATE/bug.yml

@@ -40,6 +40,9 @@ body:
         - 1.17.1
         - 1.18
         - 1.19
+        - 1.20
+        - 1.21
+        - 1.22
     validations:
       required: true
   - type: input

build.gradle

@@ -24,11 +24,11 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.6.2-1.19.4'
-def nmsVersion = "1.19.4" //[NMS]
-def apiVersion = '1.19'
+version '2.7.4-1.20.1'
+def nmsVersion = '1.20.1' //[NMS]
+def apiVersion = '1.20'
 def specialSourceVersion = '1.11.0' //[NMS]
-def spigotJarVersion = '1.19.4-R0.1-SNAPSHOT' //[NMS]
+def spigotJarVersion = '1.20.1-R0.1-SNAPSHOT' //[NMS]
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.iris.Iris'
 
@@ -83,6 +83,7 @@ repositories {
     maven { url "https://mvn.lumine.io/repository/maven/" }
     maven { url "https://repo.triumphteam.dev/snapshots" }
     maven { url "https://repo.mineinabyss.com/releases" }
+    maven { url = 'https://hub.jeff-media.com/nexus/repository/jeff-media-public/' }
 }
 
 /**
@@ -129,11 +130,12 @@ dependencies {
     // Provided or Classpath
     compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
-    implementation 'org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT'
-    implementation 'org.bukkit:craftbukkit:1.19.4-R0.1-SNAPSHOT:remapped-mojang' //[NMS]
+    implementation 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
+    implementation 'org.bukkit:craftbukkit:1.20.1-R0.1-SNAPSHOT:remapped-mojang' //[NMS]
 
     // Third Party Integrations
-    implementation 'com.github.oraxen:oraxen:1.152.5'
+    implementation 'com.ticxo.playeranimator:PlayerAnimator:R1.2.7'
+    implementation 'com.github.oraxen:oraxen:1.158.0'
     implementation 'com.github.LoneDev6:api-itemsadder:3.4.1-r4'
     implementation 'me.clip:placeholderapi:2.11.3'
     //implementation files('libs/CustomItems.jar')

src/main/java/com/volmit/iris/Iris.java

@@ -28,7 +28,7 @@ import com.volmit.iris.core.link.MultiverseCoreLink;
 import com.volmit.iris.core.link.MythicMobsLink;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.nms.v19_4.NMSBinding19_4;
+import com.volmit.iris.core.nms.v20.NMSBinding1_20_1;
 import com.volmit.iris.core.pregenerator.LazyPregenerator;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
@@ -91,7 +91,7 @@ import java.util.Map;
 
 @SuppressWarnings("CanBeFinal")
 public class Iris extends VolmitPlugin implements Listener {
-    public static final String OVERWORLD_TAG = "3002";
+    public static final String OVERWORLD_TAG = "3600";
 
     private static final Queue<Runnable> syncJobs = new ShurikenQueue<>();
 
@@ -579,13 +579,13 @@ public class Iris extends VolmitPlugin implements Listener {
     private boolean setupChecks() {
         boolean passed = true;
         Iris.info("Version Information: " + instance.getServer().getVersion() + " | " + instance.getServer().getBukkitVersion());
-        if (!instance.getServer().getBukkitVersion().contains(NMSBinding19_4.NMS_VERSION)) {
+        if (!instance.getServer().getBukkitVersion().contains(NMSBinding1_20_1.NMS_VERSION)) {
             passed = false;
             Iris.warn("============================================");
             Iris.warn("=");
             Iris.warn("=");
             Iris.warn("=");
-            Iris.warn("Iris is not compatible with this version of Minecraft.\nPlease use " + NMSBinding19_4.NMS_VERSION + " or use an older version of Iris.");
+            Iris.warn("Iris is not compatible with this version of Minecraft.\nPlease use " + NMSBinding1_20_1.NMS_VERSION + " or use an older version of Iris.");
             Iris.warn("=");
             Iris.warn("=");
             Iris.warn("=");

src/main/java/com/volmit/iris/core/IrisSettings.java

@@ -156,6 +156,8 @@ public class IrisSettings {
         public int spinh = -20;
         public int spins = 7;
         public int spinb = 8;
+        public String cartographerMessage = "Iris does not allow cartographers in its world due to crashes.";
+
 
         @SuppressWarnings("BooleanMethodIsAlwaysInverted")
         public boolean canUseCustomColors(VolmitSender volmitSender) {

src/main/java/com/volmit/iris/core/commands/CommandPregen.java

@@ -50,7 +50,7 @@ public class CommandPregen implements DecreeExecutor {
             int w = (radius >> 9 + 1) * 2;
             IrisToolbelt.pregenerate(PregenTask
                     .builder()
-                    .center(new Position2(center))
+                    .center(new Position2(center.getBlockX() >> 9, center.getBlockZ() >> 9))
                     .width(w)
                     .height(w)
                     .build(), world);

src/main/java/com/volmit/iris/core/nms/INMS.java

@@ -1,77 +1,77 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.core.nms;
-
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.nms.v19_4.NMSBinding19_4;
-import com.volmit.iris.core.nms.v1X.NMSBinding1X;
-import com.volmit.iris.util.collection.KMap;
-import org.bukkit.Bukkit;
-
-public class INMS {
-    //@builder
-    private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
-            .qput("v1_19_R3", NMSBinding19_4.class);
-    //@done
-    private static final INMSBinding binding = bind();
-
-    public static INMSBinding get() {
-        return binding;
-    }
-
-    public static String getNMSTag() {
-        if (IrisSettings.get().getGeneral().isDisableNMS()) {
-            return "BUKKIT";
-        }
-
-        try {
-            return Bukkit.getServer().getClass().getCanonicalName().split("\\Q.\\E")[3];
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            Iris.error("Failed to determine server nms version!");
-            e.printStackTrace();
-        }
-
-        return "BUKKIT";
-    }
-
-    private static INMSBinding bind() {
-        String code = getNMSTag();
-        Iris.info("Locating NMS Binding for " + code);
-
-        if (bindings.containsKey(code)) {
-            try {
-                INMSBinding b = bindings.get(code).getConstructor().newInstance();
-                Iris.info("Craftbukkit " + code + " <-> " + b.getClass().getSimpleName() + " Successfully Bound");
-
-                return b;
-            } catch (Throwable e) {
-                Iris.reportError(e);
-                e.printStackTrace();
-            }
-        }
-
-        Iris.info("Craftbukkit " + code + " <-> " + NMSBinding1X.class.getSimpleName() + " Successfully Bound");
-        Iris.warn("Note: Some features of Iris may not work the same since you are on an unsupported version of Minecraft.");
-        Iris.warn("Note: If this is a new version, expect an update soon.");
-
-        return new NMSBinding1X();
-    }
-}
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.core.nms;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.nms.v20.NMSBinding1_20_1;
+import com.volmit.iris.core.nms.v1X.NMSBinding1X;
+import com.volmit.iris.util.collection.KMap;
+import org.bukkit.Bukkit;
+
+public class INMS {
+    //@builder
+    private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
+            .qput("v1_20_R1", NMSBinding1_20_1.class);
+    //@done
+    private static final INMSBinding binding = bind();
+
+    public static INMSBinding get() {
+        return binding;
+    }
+
+    public static String getNMSTag() {
+        if (IrisSettings.get().getGeneral().isDisableNMS()) {
+            return "BUKKIT";
+        }
+
+        try {
+            return Bukkit.getServer().getClass().getCanonicalName().split("\\Q.\\E")[3];
+        } catch (Throwable e) {
+            Iris.reportError(e);
+            Iris.error("Failed to determine server nms version!");
+            e.printStackTrace();
+        }
+
+        return "BUKKIT";
+    }
+
+    private static INMSBinding bind() {
+        String code = getNMSTag();
+        Iris.info("Locating NMS Binding for " + code);
+
+        if (bindings.containsKey(code)) {
+            try {
+                INMSBinding b = bindings.get(code).getConstructor().newInstance();
+                Iris.info("Craftbukkit " + code + " <-> " + b.getClass().getSimpleName() + " Successfully Bound");
+
+                return b;
+            } catch (Throwable e) {
+                Iris.reportError(e);
+                e.printStackTrace();
+            }
+        }
+
+        Iris.info("Craftbukkit " + code + " <-> " + NMSBinding1X.class.getSimpleName() + " Successfully Bound");
+        Iris.warn("Note: Some features of Iris may not work the same since you are on an unsupported version of Minecraft.");
+        Iris.warn("Note: If this is a new version, expect an update soon.");
+
+        return new NMSBinding1X();
+    }
+}

src/main/java/com/volmit/iris/core/nms/v20/CustomBiomeSource.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.core.nms.v19_4;
+package com.volmit.iris.core.nms.v20;
 
 import com.mojang.serialization.Codec;
 import com.volmit.iris.Iris;
@@ -12,20 +12,21 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.biome.Climate;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock;
-
+import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlock;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 public class CustomBiomeSource extends BiomeSource {
@@ -118,15 +119,26 @@ public class CustomBiomeSource extends BiomeSource {
                 ((CraftWorld) engine.getWorld().realWorld()).getHandle().registryAccess().registry(Registries.BIOME).orElse(null),
                 engine).stream();
     }
-
     private KMap<String, Holder<Biome>> fillCustomBiomes(Registry<Biome> customRegistry, Engine engine) {
         KMap<String, Holder<Biome>> m = new KMap<>();
 
         for (IrisBiome i : engine.getAllBiomes()) {
             if (i.isCustom()) {
                 for (IrisBiomeCustom j : i.getCustomDerivitives()) {
-                    m.put(j.getId(), customRegistry.getHolder(customRegistry.getResourceKey(customRegistry
-                            .get(new ResourceLocation(engine.getDimension().getLoadKey() + ":" + j.getId()))).get()).get());
+                    ResourceLocation resourceLocation = new ResourceLocation(engine.getDimension().getLoadKey() + ":" + j.getId());
+                    Biome biome = customRegistry.get(resourceLocation);
+                    Optional<ResourceKey<Biome>> optionalBiomeKey = customRegistry.getResourceKey(biome);
+                    if (optionalBiomeKey.isEmpty()) {
+                        Iris.error("Cannot find biome for IrisBiomeCustom " + j.getId() + " from engine " + engine.getName());
+                        continue;
+                    }
+                    ResourceKey<Biome> biomeKey = optionalBiomeKey.get();
+                    Optional<Holder.Reference<Biome>> optionalReferenceHolder = customRegistry.getHolder(biomeKey);
+                    if (optionalReferenceHolder.isEmpty()) {
+                        Iris.error("Cannot find reference to biome " + biomeKey + " for engine " + engine.getName());
+                        continue;
+                    }
+                    m.put(j.getId(), optionalReferenceHolder.get());
                 }
             }
         }

src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20_1.java

@@ -1,453 +1,454 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.core.nms.v19_4;
-
-
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.nms.INMSBinding;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.matter.MatterBiomeInject;
-import com.volmit.iris.util.nbt.io.NBTUtil;
-import com.volmit.iris.util.nbt.mca.NBTWorld;
-import com.volmit.iris.util.nbt.mca.palette.*;
-import com.volmit.iris.util.nbt.tag.CompoundTag;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Holder;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.registries.Registries;
-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 net.minecraft.world.level.chunk.ChunkStatus;
-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_R3.CraftChunk;
-import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData;
-import org.bukkit.entity.Entity;
-import org.bukkit.generator.ChunkGenerator;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class NMSBinding19_4 implements INMSBinding {
-
-    public static final String NMS_VERSION = "1.19.4";
-    private final KMap<Biome, Object> baseBiomeCache = new KMap<>();
-    private final BlockData AIR = Material.AIR.createBlockData();
-    private final AtomicCache<MCAIdMap<net.minecraft.world.level.biome.Biome>> biomeMapCache = new AtomicCache<>();
-    private final AtomicCache<MCAIdMapper<BlockState>> registryCache = new AtomicCache<>();
-    private final AtomicCache<MCAPalette<BlockState>> globalCache = new AtomicCache<>();
-    private final AtomicCache<RegistryAccess> registryAccess = new AtomicCache<>();
-    private final AtomicCache<Method> byIdRef = new AtomicCache<>();
-    private Field biomeStorageCache = null;
-
-    private static Object getFor(Class<?> type, Object source) {
-        Object o = fieldFor(type, source);
-
-        if (o != null) {
-            return o;
-        }
-
-        return invokeFor(type, source);
-    }
-
-    private static Object invokeFor(Class<?> returns, Object in) {
-        for (Method i : in.getClass().getMethods()) {
-            if (i.getReturnType().equals(returns)) {
-                i.setAccessible(true);
-                try {
-                    Iris.debug("[NMS] Found " + returns.getSimpleName() + " in " + in.getClass().getSimpleName() + "." + i.getName() + "()");
-                    return i.invoke(in);
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private static Object fieldFor(Class<?> returns, Object in) {
-        return fieldForClass(returns, in.getClass(), in);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T> T fieldForClass(Class<T> returnType, Class<?> sourceType, Object in) {
-        for (Field i : sourceType.getDeclaredFields()) {
-            if (i.getType().equals(returnType)) {
-                i.setAccessible(true);
-                try {
-                    Iris.debug("[NMS] Found " + returnType.getSimpleName() + " in " + sourceType.getSimpleName() + "." + i.getName());
-                    return (T) i.get(in);
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return null;
-    }
-
-    private static Class<?> getClassType(Class<?> type, int ordinal) {
-        return type.getDeclaredClasses()[ordinal];
-    }
-
-    @Override
-    public boolean hasTile(Location l) {
-        return ((CraftWorld) l.getWorld()).getHandle().getBlockEntity(new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()), false) != null;
-    }
-
-    @Override
-    public CompoundTag serializeTile(Location location) {
-        BlockEntity e = ((CraftWorld) location.getWorld()).getHandle().getBlockEntity(new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()), true);
-
-        if (e == null) {
-            return null;
-        }
-
-        net.minecraft.nbt.CompoundTag tag = e.saveWithFullMetadata();
-        return convert(tag);
-    }
-
-    private CompoundTag convert(net.minecraft.nbt.CompoundTag tag) {
-        try {
-            ByteArrayOutputStream boas = new ByteArrayOutputStream();
-            DataOutputStream dos = new DataOutputStream(boas);
-            tag.write(dos);
-            dos.close();
-            return (CompoundTag) NBTUtil.read(new ByteArrayInputStream(boas.toByteArray()), false).getTag();
-        } catch (Throwable ex) {
-            ex.printStackTrace();
-        }
-
-        return null;
-    }
-
-    private net.minecraft.nbt.CompoundTag convert(CompoundTag tag) {
-        try {
-            ByteArrayOutputStream boas = new ByteArrayOutputStream();
-            NBTUtil.write(tag, boas, false);
-            DataInputStream din = new DataInputStream(new ByteArrayInputStream(boas.toByteArray()));
-            net.minecraft.nbt.CompoundTag c = NbtIo.read(din);
-            din.close();
-            return c;
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    @Override
-    public void deserializeTile(CompoundTag c, Location pos) {
-        ((CraftWorld) pos.getWorld()).getHandle().getChunkAt(new BlockPos(pos.getBlockX(), 0, pos.getBlockZ())).setBlockEntityNbt(convert(c));
-    }
-
-    @Override
-    public CompoundTag serializeEntity(Entity location) {
-        return null;// TODO:
-    }
-
-    @Override
-    public Entity deserializeEntity(CompoundTag s, Location newPosition) {
-        return null;// TODO:
-    }
-
-    @Override
-    public boolean supportsCustomHeight() {
-        return true;
-    }
-
-    private RegistryAccess registry() {
-        return registryAccess.aquire(() -> (RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()));
-    }
-
-    private Registry<net.minecraft.world.level.biome.Biome> getCustomBiomeRegistry() {
-        return registry().registry(Registries.BIOME).orElse(null);
-    }
-
-    private Registry<Block> getBlockRegistry() {
-        return registry().registry(Registries.BLOCK).orElse(null);
-    }
-
-    @Override
-    public Object getBiomeBaseFromId(int id) {
-        return getCustomBiomeRegistry().getHolder(id);
-    }
-
-    @Override
-    public int getMinHeight(World world) {
-        return world.getMinHeight();
-    }
-
-    @Override
-    public boolean supportsCustomBiomes() {
-        return true;
-    }
-
-    @Override
-    public int getTrueBiomeBaseId(Object biomeBase) {
-        return getCustomBiomeRegistry().getId(((Holder<net.minecraft.world.level.biome.Biome>) biomeBase).value());
-    }
-
-    @Override
-    public Object getTrueBiomeBase(Location location) {
-        return ((CraftWorld) location.getWorld()).getHandle().getBiome(new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
-    }
-
-    @Override
-    public String getTrueBiomeBaseKey(Location location) {
-        return getKeyForBiomeBase(getTrueBiomeBase(location));
-    }
-
-    @Override
-    public Object getCustomBiomeBaseFor(String mckey) {
-        return getCustomBiomeRegistry().get(new ResourceLocation(mckey));
-    }
-
-    @Override
-    public Object getCustomBiomeBaseHolderFor(String mckey) {
-        return getCustomBiomeRegistry().getHolder(getTrueBiomeBaseId(getCustomBiomeRegistry().get(new ResourceLocation(mckey)))).get();
-    }
-
-    public int getBiomeBaseIdForKey(String key) {
-        return getCustomBiomeRegistry().getId(getCustomBiomeRegistry().get(new ResourceLocation(key)));
-    }
-
-    @Override
-    public String getKeyForBiomeBase(Object biomeBase) {
-        return getCustomBiomeRegistry().getKey((net.minecraft.world.level.biome.Biome) biomeBase).getPath(); // something, not something:something
-    }
-
-    @Override
-    public Object getBiomeBase(World world, Biome biome) {
-        return CraftBlock.biomeToBiomeBase(((CraftWorld) world).getHandle()
-                .registryAccess().registry(Registries.BIOME).orElse(null), biome);
-    }
-
-    @Override
-    public Object getBiomeBase(Object registry, Biome biome) {
-        Object v = baseBiomeCache.get(biome);
-
-        if (v != null) {
-            return v;
-        }
-        //noinspection unchecked
-        v = CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, biome);
-        if (v == null) {
-            // Ok so there is this new biome name called "CUSTOM" in Paper's new releases.
-            // But, this does NOT exist within CraftBukkit which makes it return an error.
-            // So, we will just return the ID that the plains biome returns instead.
-            //noinspection unchecked
-            return CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, Biome.PLAINS);
-        }
-        baseBiomeCache.put(biome, v);
-        return v;
-    }
-
-    @Override
-    public boolean isBukkit() {
-        return true;
-    }
-
-    @Override
-    public int getBiomeId(Biome biome) {
-        for (World i : Bukkit.getWorlds()) {
-            if (i.getEnvironment().equals(World.Environment.NORMAL)) {
-                Registry<net.minecraft.world.level.biome.Biome> registry = ((CraftWorld) i).getHandle().registryAccess().registry(Registries.BIOME).orElse(null);
-                return registry.getId((net.minecraft.world.level.biome.Biome) getBiomeBase(registry, biome));
-            }
-        }
-
-        return biome.ordinal();
-    }
-
-    private MCAIdMap<net.minecraft.world.level.biome.Biome> getBiomeMapping() {
-        return biomeMapCache.aquire(() -> new MCAIdMap<>() {
-            @NotNull
-            @Override
-            public Iterator<net.minecraft.world.level.biome.Biome> iterator() {
-                return getCustomBiomeRegistry().iterator();
-            }
-
-            @Override
-            public int getId(net.minecraft.world.level.biome.Biome paramT) {
-                return getCustomBiomeRegistry().getId(paramT);
-            }
-
-            @Override
-            public net.minecraft.world.level.biome.Biome byId(int paramInt) {
-                return (net.minecraft.world.level.biome.Biome) getBiomeBaseFromId(paramInt);
-            }
-        });
-    }
-
-    @NotNull
-    private MCABiomeContainer getBiomeContainerInterface(MCAIdMap<net.minecraft.world.level.biome.Biome> biomeMapping, MCAChunkBiomeContainer<net.minecraft.world.level.biome.Biome> base) {
-        return new MCABiomeContainer() {
-            @Override
-            public int[] getData() {
-                return base.writeBiomes();
-            }
-
-            @Override
-            public void setBiome(int x, int y, int z, int id) {
-                base.setBiome(x, y, z, biomeMapping.byId(id));
-            }
-
-            @Override
-            public int getBiome(int x, int y, int z) {
-                return biomeMapping.getId(base.getBiome(x, y, z));
-            }
-        };
-    }
-
-    @Override
-    public MCABiomeContainer newBiomeContainer(int min, int max) {
-        MCAChunkBiomeContainer<net.minecraft.world.level.biome.Biome> base = new MCAChunkBiomeContainer<>(getBiomeMapping(), min, max);
-        return getBiomeContainerInterface(getBiomeMapping(), base);
-    }
-
-    @Override
-    public MCABiomeContainer newBiomeContainer(int min, int max, int[] data) {
-        MCAChunkBiomeContainer<net.minecraft.world.level.biome.Biome> base = new MCAChunkBiomeContainer<>(getBiomeMapping(), min, max, data);
-        return getBiomeContainerInterface(getBiomeMapping(), base);
-    }
-
-    @Override
-    public int countCustomBiomes() {
-        AtomicInteger a = new AtomicInteger(0);
-
-        getCustomBiomeRegistry().keySet().forEach((i) -> {
-            if (i.getNamespace().equals("minecraft")) {
-                return;
-            }
-
-            a.incrementAndGet();
-            Iris.debug("Custom Biome: " + i);
-        });
-
-        return a.get();
-    }
-
-    public boolean supportsDataPacks() {
-        return true;
-    }
-
-    public void setBiomes(int cx, int cz, World world, Hunk<Object> biomes) {
-        LevelChunk c = ((CraftWorld) world).getHandle().getChunk(cx, cz);
-        biomes.iterateSync((x, y, z, b) -> c.setBiome(x, y, z, (Holder<net.minecraft.world.level.biome.Biome>) b));
-        c.setUnsaved(true);
-    }
-
-    @Override
-    public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) {
-        try {
-            ChunkAccess s = (ChunkAccess) getFieldForBiomeStorage(chunk).get(chunk);
-            Holder<net.minecraft.world.level.biome.Biome> biome = (Holder<net.minecraft.world.level.biome.Biome>) somethingVeryDirty;
-            s.setBiome(x, y, z, biome);
-        } catch (IllegalAccessException e) {
-            Iris.reportError(e);
-            e.printStackTrace();
-        }
-    }
-
-    private Field getFieldForBiomeStorage(Object storage) {
-        Field f = biomeStorageCache;
-
-        if (f != null) {
-            return f;
-        }
-        try {
-            f = storage.getClass().getDeclaredField("biome");
-            f.setAccessible(true);
-            return f;
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            e.printStackTrace();
-            Iris.error(storage.getClass().getCanonicalName());
-        }
-
-        biomeStorageCache = f;
-        return null;
-    }
-
-    @Override
-    public MCAPaletteAccess createPalette() {
-        MCAIdMapper<BlockState> registry = registryCache.aquireNasty(() -> {
-            Field cf = net.minecraft.core.IdMapper.class.getDeclaredField("tToId");
-            Field df = net.minecraft.core.IdMapper.class.getDeclaredField("idToT");
-            Field bf = net.minecraft.core.IdMapper.class.getDeclaredField("nextId");
-            cf.setAccessible(true);
-            df.setAccessible(true);
-            bf.setAccessible(true);
-            net.minecraft.core.IdMapper<BlockState> blockData = Block.BLOCK_STATE_REGISTRY;
-            int b = bf.getInt(blockData);
-            Object2IntMap<BlockState> c = (Object2IntMap<BlockState>) cf.get(blockData);
-            List<BlockState> d = (List<BlockState>) df.get(blockData);
-            return new MCAIdMapper<BlockState>(c, d, b);
-        });
-        MCAPalette<BlockState> global = globalCache.aquireNasty(() -> new MCAGlobalPalette<>(registry, ((CraftBlockData) AIR).getState()));
-        MCAPalettedContainer<BlockState> container = new MCAPalettedContainer<>(global, registry,
-                i -> ((CraftBlockData) NBTWorld.getBlockData(i)).getState(),
-                i -> NBTWorld.getCompound(CraftBlockData.fromData(i)),
-                ((CraftBlockData) AIR).getState());
-        return new MCAWrappedPalettedContainer<>(container,
-                i -> NBTWorld.getCompound(CraftBlockData.fromData(i)),
-                i -> ((CraftBlockData) NBTWorld.getBlockData(i)).getState());
-    }
-
-    @Override
-    public void injectBiomesFromMantle(Chunk e, Mantle mantle) {
-        ChunkAccess chunk = ((CraftChunk) e).getHandle(ChunkStatus.FULL);
-        AtomicInteger c = new AtomicInteger();
-        AtomicInteger r = new AtomicInteger();
-        mantle.iterateChunk(e.getX(), e.getZ(), MatterBiomeInject.class, (x, y, z, b) -> {
-            if (b != null) {
-                if (b.isCustom()) {
-                    chunk.setBiome(x, y, z, getCustomBiomeRegistry().getHolder(b.getBiomeId()).get());
-                    c.getAndIncrement();
-                } else {
-                    chunk.setBiome(x, y, z, (Holder<net.minecraft.world.level.biome.Biome>) getBiomeBase(e.getWorld(), b.getBiome()));
-                    r.getAndIncrement();
-                }
-            }
-        });
-    }
-}
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.core.nms.v20;
+
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.nms.INMSBinding;
+import com.volmit.iris.engine.data.cache.AtomicCache;
+import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.hunk.Hunk;
+import com.volmit.iris.util.mantle.Mantle;
+import com.volmit.iris.util.matter.MatterBiomeInject;
+import com.volmit.iris.util.nbt.io.NBTUtil;
+import com.volmit.iris.util.nbt.mca.NBTWorld;
+import com.volmit.iris.util.nbt.mca.palette.*;
+import com.volmit.iris.util.nbt.tag.CompoundTag;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
+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 net.minecraft.world.level.chunk.ChunkStatus;
+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_20_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData;
+import org.bukkit.entity.Entity;
+import org.bukkit.generator.ChunkGenerator;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NMSBinding1_20_1 implements INMSBinding {
+
+    public static final String NMS_VERSION = "1.20.1";
+    private final KMap<Biome, Object> baseBiomeCache = new KMap<>();
+    private final BlockData AIR = Material.AIR.createBlockData();
+    private final AtomicCache<MCAIdMap<net.minecraft.world.level.biome.Biome>> biomeMapCache = new AtomicCache<>();
+    private final AtomicCache<MCAIdMapper<BlockState>> registryCache = new AtomicCache<>();
+    private final AtomicCache<MCAPalette<BlockState>> globalCache = new AtomicCache<>();
+    private final AtomicCache<RegistryAccess> registryAccess = new AtomicCache<>();
+    private final AtomicCache<Method> byIdRef = new AtomicCache<>();
+    private Field biomeStorageCache = null;
+
+    private static Object getFor(Class<?> type, Object source) {
+        Object o = fieldFor(type, source);
+
+        if (o != null) {
+            return o;
+        }
+
+        return invokeFor(type, source);
+    }
+
+    private static Object invokeFor(Class<?> returns, Object in) {
+        for (Method i : in.getClass().getMethods()) {
+            if (i.getReturnType().equals(returns)) {
+                i.setAccessible(true);
+                try {
+                    Iris.debug("[NMS] Found " + returns.getSimpleName() + " in " + in.getClass().getSimpleName() + "." + i.getName() + "()");
+                    return i.invoke(in);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private static Object fieldFor(Class<?> returns, Object in) {
+        return fieldForClass(returns, in.getClass(), in);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> T fieldForClass(Class<T> returnType, Class<?> sourceType, Object in) {
+        for (Field i : sourceType.getDeclaredFields()) {
+            if (i.getType().equals(returnType)) {
+                i.setAccessible(true);
+                try {
+                    Iris.debug("[NMS] Found " + returnType.getSimpleName() + " in " + sourceType.getSimpleName() + "." + i.getName());
+                    return (T) i.get(in);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return null;
+    }
+
+    private static Class<?> getClassType(Class<?> type, int ordinal) {
+        return type.getDeclaredClasses()[ordinal];
+    }
+
+    @Override
+    public boolean hasTile(Location l) {
+        return ((CraftWorld) l.getWorld()).getHandle().getBlockEntity(new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()), false) != null;
+    }
+
+    @Override
+    public CompoundTag serializeTile(Location location) {
+        BlockEntity e = ((CraftWorld) location.getWorld()).getHandle().getBlockEntity(new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()), true);
+
+        if (e == null) {
+            return null;
+        }
+
+        net.minecraft.nbt.CompoundTag tag = e.saveWithFullMetadata();
+        return convert(tag);
+    }
+
+    private CompoundTag convert(net.minecraft.nbt.CompoundTag tag) {
+        try {
+            ByteArrayOutputStream boas = new ByteArrayOutputStream();
+            DataOutputStream dos = new DataOutputStream(boas);
+            tag.write(dos);
+            dos.close();
+            return (CompoundTag) NBTUtil.read(new ByteArrayInputStream(boas.toByteArray()), false).getTag();
+        } catch (Throwable ex) {
+            ex.printStackTrace();
+        }
+
+        return null;
+    }
+
+    private net.minecraft.nbt.CompoundTag convert(CompoundTag tag) {
+        try {
+            ByteArrayOutputStream boas = new ByteArrayOutputStream();
+            NBTUtil.write(tag, boas, false);
+            DataInputStream din = new DataInputStream(new ByteArrayInputStream(boas.toByteArray()));
+            net.minecraft.nbt.CompoundTag c = NbtIo.read(din);
+            din.close();
+            return c;
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    @Override
+    public void deserializeTile(CompoundTag c, Location pos) {
+        ((CraftWorld) pos.getWorld()).getHandle().getChunkAt(new BlockPos(pos.getBlockX(), 0, pos.getBlockZ())).setBlockEntityNbt(convert(c));
+    }
+
+    @Override
+    public CompoundTag serializeEntity(Entity location) {
+        return null;// TODO:
+    }
+
+    @Override
+    public Entity deserializeEntity(CompoundTag s, Location newPosition) {
+        return null;// TODO:
+    }
+
+    @Override
+    public boolean supportsCustomHeight() {
+        return true;
+    }
+
+    private RegistryAccess registry() {
+        return registryAccess.aquire(() -> (RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()));
+    }
+
+    private Registry<net.minecraft.world.level.biome.Biome> getCustomBiomeRegistry() {
+        return registry().registry(Registries.BIOME).orElse(null);
+    }
+
+    private Registry<Block> getBlockRegistry() {
+        return registry().registry(Registries.BLOCK).orElse(null);
+    }
+
+    @Override
+    public Object getBiomeBaseFromId(int id) {
+        return getCustomBiomeRegistry().getHolder(id);
+    }
+
+    @Override
+    public int getMinHeight(World world) {
+        return world.getMinHeight();
+    }
+
+    @Override
+    public boolean supportsCustomBiomes() {
+        return true;
+    }
+
+    @Override
+    public int getTrueBiomeBaseId(Object biomeBase) {
+        return getCustomBiomeRegistry().getId(((Holder<net.minecraft.world.level.biome.Biome>) biomeBase).value());
+    }
+
+    @Override
+    public Object getTrueBiomeBase(Location location) {
+        return ((CraftWorld) location.getWorld()).getHandle().getBiome(new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
+    }
+
+    @Override
+    public String getTrueBiomeBaseKey(Location location) {
+        return getKeyForBiomeBase(getTrueBiomeBase(location));
+    }
+
+    @Override
+    public Object getCustomBiomeBaseFor(String mckey) {
+        return getCustomBiomeRegistry().get(new ResourceLocation(mckey));
+    }
+
+    @Override
+    public Object getCustomBiomeBaseHolderFor(String mckey) {
+        return getCustomBiomeRegistry().getHolder(getTrueBiomeBaseId(getCustomBiomeRegistry().get(new ResourceLocation(mckey)))).get();
+    }
+
+    public int getBiomeBaseIdForKey(String key) {
+        return getCustomBiomeRegistry().getId(getCustomBiomeRegistry().get(new ResourceLocation(key)));
+    }
+
+    @Override
+    public String getKeyForBiomeBase(Object biomeBase) {
+        return getCustomBiomeRegistry().getKey((net.minecraft.world.level.biome.Biome) biomeBase).getPath(); // something, not something:something
+    }
+
+    @Override
+    public Object getBiomeBase(World world, Biome biome) {
+        return CraftBlock.biomeToBiomeBase(((CraftWorld) world).getHandle()
+                .registryAccess().registry(Registries.BIOME).orElse(null), biome);
+    }
+
+    @Override
+    public Object getBiomeBase(Object registry, Biome biome) {
+        Object v = baseBiomeCache.get(biome);
+
+        if (v != null) {
+            return v;
+        }
+        //noinspection unchecked
+        v = CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, biome);
+        if (v == null) {
+            // Ok so there is this new biome name called "CUSTOM" in Paper's new releases.
+            // But, this does NOT exist within CraftBukkit which makes it return an error.
+            // So, we will just return the ID that the plains biome returns instead.
+            //noinspection unchecked
+            return CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, Biome.PLAINS);
+        }
+        baseBiomeCache.put(biome, v);
+        return v;
+    }
+
+    @Override
+    public boolean isBukkit() {
+        return true;
+    }
+
+    @Override
+    public int getBiomeId(Biome biome) {
+        for (World i : Bukkit.getWorlds()) {
+            if (i.getEnvironment().equals(World.Environment.NORMAL)) {
+                Registry<net.minecraft.world.level.biome.Biome> registry = ((CraftWorld) i).getHandle().registryAccess().registry(Registries.BIOME).orElse(null);
+                return registry.getId((net.minecraft.world.level.biome.Biome) getBiomeBase(registry, biome));
+            }
+        }
+
+        return biome.ordinal();
+    }
+
+    private MCAIdMap<net.minecraft.world.level.biome.Biome> getBiomeMapping() {
+        return biomeMapCache.aquire(() -> new MCAIdMap<>() {
+            @NotNull
+            @Override
+            public Iterator<net.minecraft.world.level.biome.Biome> iterator() {
+                return getCustomBiomeRegistry().iterator();
+            }
+
+            @Override
+            public int getId(net.minecraft.world.level.biome.Biome paramT) {
+                return getCustomBiomeRegistry().getId(paramT);
+            }
+
+            @Override
+            public net.minecraft.world.level.biome.Biome byId(int paramInt) {
+                return (net.minecraft.world.level.biome.Biome) getBiomeBaseFromId(paramInt);
+            }
+        });
+    }
+
+    @NotNull
+    private MCABiomeContainer getBiomeContainerInterface(MCAIdMap<net.minecraft.world.level.biome.Biome> biomeMapping, MCAChunkBiomeContainer<net.minecraft.world.level.biome.Biome> base) {
+        return new MCABiomeContainer() {
+            @Override
+            public int[] getData() {
+                return base.writeBiomes();
+            }
+
+            @Override
+            public void setBiome(int x, int y, int z, int id) {
+                base.setBiome(x, y, z, biomeMapping.byId(id));
+            }
+
+            @Override
+            public int getBiome(int x, int y, int z) {
+                return biomeMapping.getId(base.getBiome(x, y, z));
+            }
+        };
+    }
+
+    @Override
+    public MCABiomeContainer newBiomeContainer(int min, int max) {
+        MCAChunkBiomeContainer<net.minecraft.world.level.biome.Biome> base = new MCAChunkBiomeContainer<>(getBiomeMapping(), min, max);
+        return getBiomeContainerInterface(getBiomeMapping(), base);
+    }
+
+    @Override
+    public MCABiomeContainer newBiomeContainer(int min, int max, int[] data) {
+        MCAChunkBiomeContainer<net.minecraft.world.level.biome.Biome> base = new MCAChunkBiomeContainer<>(getBiomeMapping(), min, max, data);
+        return getBiomeContainerInterface(getBiomeMapping(), base);
+    }
+
+    @Override
+    public int countCustomBiomes() {
+        AtomicInteger a = new AtomicInteger(0);
+
+        getCustomBiomeRegistry().keySet().forEach((i) -> {
+            if (i.getNamespace().equals("minecraft")) {
+                return;
+            }
+
+            a.incrementAndGet();
+            Iris.debug("Custom Biome: " + i);
+        });
+
+        return a.get();
+    }
+
+    public boolean supportsDataPacks() {
+        return true;
+    }
+
+    public void setBiomes(int cx, int cz, World world, Hunk<Object> biomes) {
+        LevelChunk c = ((CraftWorld) world).getHandle().getChunk(cx, cz);
+        biomes.iterateSync((x, y, z, b) -> c.setBiome(x, y, z, (Holder<net.minecraft.world.level.biome.Biome>) b));
+        c.setUnsaved(true);
+    }
+
+    @Override
+    public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) {
+        try {
+            ChunkAccess s = (ChunkAccess) getFieldForBiomeStorage(chunk).get(chunk);
+            Holder<net.minecraft.world.level.biome.Biome> biome = (Holder<net.minecraft.world.level.biome.Biome>) somethingVeryDirty;
+            s.setBiome(x, y, z, biome);
+        } catch (IllegalAccessException e) {
+            Iris.reportError(e);
+            e.printStackTrace();
+        }
+    }
+
+    private Field getFieldForBiomeStorage(Object storage) {
+        Field f = biomeStorageCache;
+
+        if (f != null) {
+            return f;
+        }
+        try {
+            f = storage.getClass().getDeclaredField("biome");
+            f.setAccessible(true);
+            return f;
+        } catch (Throwable e) {
+            Iris.reportError(e);
+            e.printStackTrace();
+            Iris.error(storage.getClass().getCanonicalName());
+        }
+
+        biomeStorageCache = f;
+        return null;
+    }
+
+    @Override
+    public MCAPaletteAccess createPalette() {
+        MCAIdMapper<BlockState> registry = registryCache.aquireNasty(() -> {
+            Field cf = net.minecraft.core.IdMapper.class.getDeclaredField("tToId");
+            Field df = net.minecraft.core.IdMapper.class.getDeclaredField("idToT");
+            Field bf = net.minecraft.core.IdMapper.class.getDeclaredField("nextId");
+            cf.setAccessible(true);
+            df.setAccessible(true);
+            bf.setAccessible(true);
+            net.minecraft.core.IdMapper<BlockState> blockData = Block.BLOCK_STATE_REGISTRY;
+            int b = bf.getInt(blockData);
+            Object2IntMap<BlockState> c = (Object2IntMap<BlockState>) cf.get(blockData);
+            List<BlockState> d = (List<BlockState>) df.get(blockData);
+            return new MCAIdMapper<BlockState>(c, d, b);
+        });
+        MCAPalette<BlockState> global = globalCache.aquireNasty(() -> new MCAGlobalPalette<>(registry, ((CraftBlockData) AIR).getState()));
+        MCAPalettedContainer<BlockState> container = new MCAPalettedContainer<>(global, registry,
+                i -> ((CraftBlockData) NBTWorld.getBlockData(i)).getState(),
+                i -> NBTWorld.getCompound(CraftBlockData.fromData(i)),
+                ((CraftBlockData) AIR).getState());
+        return new MCAWrappedPalettedContainer<>(container,
+                i -> NBTWorld.getCompound(CraftBlockData.fromData(i)),
+                i -> ((CraftBlockData) NBTWorld.getBlockData(i)).getState());
+    }
+
+    @Override
+    public void injectBiomesFromMantle(Chunk e, Mantle mantle) {
+        ChunkAccess chunk = ((CraftChunk) e).getHandle(ChunkStatus.FULL);
+        AtomicInteger c = new AtomicInteger();
+        AtomicInteger r = new AtomicInteger();
+        mantle.iterateChunk(e.getX(), e.getZ(), MatterBiomeInject.class, (x, y, z, b) -> {
+            if (b != null) {
+                if (b.isCustom()) {
+                    chunk.setBiome(x, y, z, getCustomBiomeRegistry().getHolder(b.getBiomeId()).get());
+                    c.getAndIncrement();
+                } else {
+                    chunk.setBiome(x, y, z, (Holder<net.minecraft.world.level.biome.Biome>) getBiomeBase(e.getWorld(), b.getBiome()));
+                    r.getAndIncrement();
+                }
+            }
+        });
+    }
+}

src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java

@@ -111,8 +111,12 @@ public class IrisPregenerator {
     }
 
     private long computeETA() {
-        return (long) ((totalChunks.get() - generated.get()) *
-                ((double) (M.ms() - startTime.get()) / (double) generated.get()));
+        return (long) (totalChunks.get() > 1024 ? // Generated chunks exceed 1/8th of total?
+                // If yes, use smooth function (which gets more accurate over time since its less sensitive to outliers)
+                ((totalChunks.get() - generated.get()) * ((double) (M.ms() - startTime.get()) / (double) generated.get())) :
+                // If no, use quick function (which is less accurate over time but responds better to the initial delay)
+                ((totalChunks.get() - generated.get()) / chunksPerSecond.getAverage()) * 1000 //
+        );
     }
 
     public void close() {

src/main/java/com/volmit/iris/core/service/DolphinSVC.java

@@ -1,95 +1,95 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.core.service;
-
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.documentation.ChunkCoordinates;
-import com.volmit.iris.util.function.Consumer4;
-import com.volmit.iris.util.math.Spiraler;
-import com.volmit.iris.util.matter.MatterStructurePOI;
-import com.volmit.iris.util.plugin.IrisService;
-import net.minecraft.core.BlockPos;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.SoundCategory;
-import org.bukkit.craftbukkit.v1_19_R3.entity.CraftDolphin;
-import org.bukkit.entity.Dolphin;
-import org.bukkit.entity.EntityType;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.generator.structure.StructureType;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-public class DolphinSVC implements IrisService {
-
-    @Override
-    public void onEnable() {
-
-    }
-
-    @Override
-    public void onDisable() {
-
-    }
-
-    @EventHandler
-    public void on(PlayerInteractEntityEvent event) {
-        if (!IrisToolbelt.isIrisWorld(event.getPlayer().getWorld())) {
-            return;
-        }
-
-        Material hand = event.getPlayer().getInventory().getItem(event.getHand()).getType();
-        if (event.getRightClicked().getType().equals(EntityType.DOLPHIN) && (hand.equals(Material.TROPICAL_FISH) || hand.equals(Material.PUFFERFISH) || hand.equals(Material.COD) || hand.equals(Material.SALMON))) {
-            Engine e = IrisToolbelt.access(event.getPlayer().getWorld()).getEngine();
-            searchNearestTreasure(e, event.getPlayer().getLocation().getBlockX() >> 4, event.getPlayer().getLocation().getBlockZ() >> 4, e.getMantle().getRadius() - 1, StructureType.BURIED_TREASURE, (x, y, z, p) -> {
-                event.setCancelled(true);
-                Dolphin d = (Dolphin) event.getRightClicked();
-                CraftDolphin cd = (CraftDolphin) d;
-                d.getWorld().playSound(d, Sound.ENTITY_DOLPHIN_EAT, SoundCategory.NEUTRAL, 1, 1);
-                cd.getHandle().setTreasurePos(new BlockPos(x, y, z));
-                cd.getHandle().setGotFish(true);
-            });
-
-        }
-    }
-
-    @ChunkCoordinates
-    public void findTreasure(Engine engine, int chunkX, int chunkY, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
-        AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
-        engine.getMantle().getMantle().iterateChunk(chunkX, chunkY, MatterStructurePOI.class, ref.get() == null ? (x, y, z, d) -> {
-            if (d.getType().equals(type.getKey().getKey())) {
-                ref.set(d);
-                consumer.accept(x, y, z, d);
-            }
-        } : (x, y, z, d) -> {
-        });
-    }
-
-    @ChunkCoordinates
-    public void searchNearestTreasure(Engine engine, int chunkX, int chunkY, int radius, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
-        AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
-        new Spiraler(radius * 2, radius * 2, (x, z) -> findTreasure(engine, x, z, type, ref.get() == null ? (i, d, g, a) -> {
-            ref.set(a);
-            consumer.accept(i, d, g, a);
-        } : (i, d, g, a) -> {
-        })).setOffset(chunkX, chunkY).drain();
-    }
-}
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.core.service;
+
+import com.volmit.iris.core.tools.IrisToolbelt;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.util.documentation.ChunkCoordinates;
+import com.volmit.iris.util.function.Consumer4;
+import com.volmit.iris.util.math.Spiraler;
+import com.volmit.iris.util.matter.MatterStructurePOI;
+import com.volmit.iris.util.plugin.IrisService;
+import net.minecraft.core.BlockPos;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.SoundCategory;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftDolphin;
+import org.bukkit.entity.Dolphin;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.generator.structure.StructureType;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+public class DolphinSVC implements IrisService {
+
+    @Override
+    public void onEnable() {
+
+    }
+
+    @Override
+    public void onDisable() {
+
+    }
+
+    @EventHandler
+    public void on(PlayerInteractEntityEvent event) {
+        if (!IrisToolbelt.isIrisWorld(event.getPlayer().getWorld())) {
+            return;
+        }
+
+        Material hand = event.getPlayer().getInventory().getItem(event.getHand()).getType();
+        if (event.getRightClicked().getType().equals(EntityType.DOLPHIN) && (hand.equals(Material.TROPICAL_FISH) || hand.equals(Material.PUFFERFISH) || hand.equals(Material.COD) || hand.equals(Material.SALMON))) {
+            Engine e = IrisToolbelt.access(event.getPlayer().getWorld()).getEngine();
+            searchNearestTreasure(e, event.getPlayer().getLocation().getBlockX() >> 4, event.getPlayer().getLocation().getBlockZ() >> 4, e.getMantle().getRadius() - 1, StructureType.BURIED_TREASURE, (x, y, z, p) -> {
+                event.setCancelled(true);
+                Dolphin d = (Dolphin) event.getRightClicked();
+                CraftDolphin cd = (CraftDolphin) d;
+                d.getWorld().playSound(d, Sound.ENTITY_DOLPHIN_EAT, SoundCategory.NEUTRAL, 1, 1);
+                cd.getHandle().setTreasurePos(new BlockPos(x, y, z));
+                cd.getHandle().setGotFish(true);
+            });
+
+        }
+    }
+
+    @ChunkCoordinates
+    public void findTreasure(Engine engine, int chunkX, int chunkY, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
+        AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
+        engine.getMantle().getMantle().iterateChunk(chunkX, chunkY, MatterStructurePOI.class, ref.get() == null ? (x, y, z, d) -> {
+            if (d.getType().equals(type.getKey().getKey())) {
+                ref.set(d);
+                consumer.accept(x, y, z, d);
+            }
+        } : (x, y, z, d) -> {
+        });
+    }
+
+    @ChunkCoordinates
+    public void searchNearestTreasure(Engine engine, int chunkX, int chunkY, int radius, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
+        AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
+        new Spiraler(radius * 2, radius * 2, (x, z) -> findTreasure(engine, x, z, type, ref.get() == null ? (i, d, g, a) -> {
+            ref.set(a);
+            consumer.accept(i, d, g, a);
+        } : (i, d, g, a) -> {
+        })).setOffset(chunkX, chunkY).drain();
+    }
+}

src/main/java/com/volmit/iris/core/service/VillageSVC.java

@@ -19,6 +19,7 @@
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.format.C;
@@ -70,7 +71,7 @@ public class VillageSVC implements IrisService {
 
             List<Player> playersInWorld = event.getEntity().getWorld().getPlayers();
 
-            String message = C.GOLD + "Iris does not allow cartographers in its world due to crashes.";
+            String message = C.GOLD + IrisSettings.get().getGeneral().cartographerMessage;
 
             Iris.info("Cancelled Cartographer Villager to prevent server crash at " + eventLocation + "!");
 

src/main/java/com/volmit/iris/engine/IrisWorldManager.java

@@ -552,7 +552,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
                 public void execute(Future<Chunk> chunkFuture) {
                     try {
                         chunkFuture.get();
-                    } catch (InterruptedException | ExecutionException e) {
+                    } catch (InterruptedException | ExecutionException ignored) {
 
                     }
                 }
@@ -597,6 +597,10 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
 
             for (String i : mark.getSpawners()) {
                 IrisSpawner m = getData().getSpawnerLoader().load(i);
+                if (m == null) {
+                    Iris.error("Cannot load spawner: " + i + " for marker on " + getName());
+                    continue;
+                }
                 m.setReferenceMarker(mark);
 
                 // This is so fucking incorrect its a joke

src/main/java/com/volmit/iris/engine/object/IrisLoot.java

@@ -40,7 +40,7 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.TagParser;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;

src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.platform;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.nms.v19_4.CustomBiomeSource;
+import com.volmit.iris.core.nms.v20.CustomBiomeSource;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.IrisEngine;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
@@ -46,7 +46,7 @@ import net.minecraft.server.level.ServerLevel;
 import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/resources/plugin.yml

@@ -20,5 +20,5 @@ libraries:
 commands:
   iris:
     aliases: [ ir, irs ]
-api-version: ${apiversion}
+api-version: '${apiversion}'
 hotload-dependencies: false