Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java
#	src/main/java/carpet/script/CarpetExpression.java

src/main/java/carpet/fakes/ChunkTicketManagerInterface.java

@@ -1,6 +1,7 @@
 package carpet.fakes;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import net.minecraft.server.world.ChunkHolder;
 import net.minecraft.server.world.ChunkTicket;
 import net.minecraft.util.collection.SortedArraySet;
 import net.minecraft.util.math.ChunkPos;
@@ -8,5 +9,8 @@ import net.minecraft.util.math.ChunkPos;
 public interface ChunkTicketManagerInterface
 {
     void changeSpawnChunks(ChunkPos pos, int distance);
+
     Long2ObjectOpenHashMap<SortedArraySet<ChunkTicket<?>>> getTicketsByPosition();
+
+    void replaceHolder(ChunkHolder oldHolder, ChunkHolder newHolder);
 }