21w43a

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=21w42a
-	yarn_mappings=21w42a+build.6
+	minecraft_version=21w43a
+	yarn_mappings=21w43a+build.2
 	loader_version=0.12.3
 	fabric_version=0.41.2+1.18
 

src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java

@@ -33,7 +33,7 @@ public class BarrierBlock_updateSuppressionBlockMixin extends Block {
                 BlockState stateAbove = world.getBlockState(fromPos);
                 if (stateAbove.isOf(Blocks.ACTIVATOR_RAIL) && !stateAbove.get(PoweredRailBlock.POWERED)) {
                     if (CarpetSettings.updateSuppressionBlockSetting > 0) {
-                        world.getBlockTickScheduler().schedule(pos, this, CarpetSettings.updateSuppressionBlockSetting);
+                        world.method_39279(pos, this, CarpetSettings.updateSuppressionBlockSetting);// schedule tick
                     }
                     throw new StackOverflowError("updateSuppressionBlock");
                 }

src/main/java/carpet/mixins/ChunkHolder_scarpetChunkCreationMixin.java

@@ -30,7 +30,7 @@ public abstract class ChunkHolder_scarpetChunkCreationMixin implements ChunkHold
     {
         int i = ChunkStatus.EMPTY.getIndex();
         CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> completableFuture2 = CompletableFuture.supplyAsync(
-                () -> Either.left(new ProtoChunk(chpos, UpgradeData.NO_UPGRADE_DATA, world,  world.getRegistryManager().get(Registry.BIOME_KEY))),
+                () -> Either.left(new ProtoChunk(chpos, UpgradeData.NO_UPGRADE_DATA, world,  world.getRegistryManager().get(Registry.BIOME_KEY), null)), // todo figure out what that does - maybe add an option to reset with blending enabled..?
                 executor
         );
         combineSavingFuture(completableFuture2, "unfull"); // possible debug data

src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java

@@ -389,7 +389,7 @@ public abstract class ThreadedAnvilChunkStorage_scarpetChunkCreationMixin implem
 
             final ChunkHolder oldHolder = this.currentChunkHolders.remove(pos);
             final ChunkHolder newHolder = new ChunkHolder(cPos, oldHolder.getLevel(), world, this.lightingProvider, this.chunkTaskPrioritySystem, (ChunkHolder.PlayersWatchingChunkProvider) this);
-            ((ChunkHolderInterface) newHolder).setDefaultProtoChunk(cPos, this.mainThreadExecutor, world);
+            ((ChunkHolderInterface) newHolder).setDefaultProtoChunk(cPos, this.mainThreadExecutor, world); // enable chunk blending?
             this.currentChunkHolders.put(pos, newHolder);
 
             ((ChunkTicketManagerInterface) this.ticketManager).replaceHolder(oldHolder, newHolder);

src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java

@@ -7,13 +7,14 @@ import net.minecraft.block.BlockEntityProvider;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.PistonExtensionBlock;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.fluid.Fluid;
+import net.minecraft.class_6752;
+//import net.minecraft.fluid.Fluid;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.HeightLimitView;
 import net.minecraft.world.Heightmap;
-import net.minecraft.world.TickScheduler;
+//import net.minecraft.world.TickScheduler;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.Chunk;
@@ -34,9 +35,9 @@ public abstract class WorldChunk_movableTEMixin extends Chunk implements WorldCh
     @Final
     World world;
 
-    public WorldChunk_movableTEMixin(ChunkPos chunkPos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry<Biome> registry, long l, @Nullable ChunkSection[] chunkSections, TickScheduler<Block> tickScheduler, TickScheduler<Fluid> tickScheduler2)
+    public WorldChunk_movableTEMixin(ChunkPos chunkPos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry<Biome> registry, long l, @Nullable ChunkSection[] chunkSections, @Nullable class_6752 arg)
     {
-        super(chunkPos, upgradeData, heightLimitView, registry, l, chunkSections, tickScheduler, tickScheduler2);
+        super(chunkPos, upgradeData, heightLimitView, registry, l, chunkSections, arg);
     }
 
     @Shadow

src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java

@@ -24,7 +24,7 @@ public abstract class World_getOtherEntitiesLimited implements WorldInterface {
 
     @Override
     public List<Entity> getOtherEntitiesLimited(@Nullable Entity except, Box box, Predicate<? super Entity> predicate, int limit) {
-        this.getProfiler().visit("getEntities");
+        this.getProfiler().method_39278("getEntities"); // visit
         AtomicInteger checkedEntities = new AtomicInteger();
         List<Entity> list = Lists.newArrayList();
         try {

src/main/java/carpet/script/api/WorldAccess.java

@@ -1394,7 +1394,7 @@ public class WorldAccess {
             return Value.TRUE;
         });
 
-
+        // todo maybe enable chunk blending?
         expression.addContextFunction("reset_chunk", -1, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;