From 679c20d78e019ad21c25cdbb1fc0cfa79f505e67 Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 28 Oct 2021 00:04:54 -0300 Subject: [PATCH] 21w43a --- gradle.properties | 4 ++-- .../mixins/BarrierBlock_updateSuppressionBlockMixin.java | 2 +- .../mixins/ChunkHolder_scarpetChunkCreationMixin.java | 2 +- ...eadedAnvilChunkStorage_scarpetChunkCreationMixin.java | 2 +- .../java/carpet/mixins/WorldChunk_movableTEMixin.java | 9 +++++---- .../carpet/mixins/World_getOtherEntitiesLimited.java | 2 +- src/main/java/carpet/script/api/WorldAccess.java | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 92334b13..a52cb277 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java b/src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java index 480f85f8..ffa5bfc9 100644 --- a/src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java +++ b/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"); } diff --git a/src/main/java/carpet/mixins/ChunkHolder_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ChunkHolder_scarpetChunkCreationMixin.java index 81ebefa3..46d27686 100644 --- a/src/main/java/carpet/mixins/ChunkHolder_scarpetChunkCreationMixin.java +++ b/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> 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 diff --git a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java index f2c4db11..d98a3534 100644 --- a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java +++ b/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); diff --git a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java index e35a6c37..43c39f3d 100644 --- a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java +++ b/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 registry, long l, @Nullable ChunkSection[] chunkSections, TickScheduler tickScheduler, TickScheduler tickScheduler2) + public WorldChunk_movableTEMixin(ChunkPos chunkPos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry 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 diff --git a/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java b/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java index 3b6eafc0..14b864f7 100644 --- a/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java +++ b/src/main/java/carpet/mixins/World_getOtherEntitiesLimited.java @@ -24,7 +24,7 @@ public abstract class World_getOtherEntitiesLimited implements WorldInterface { @Override public List getOtherEntitiesLimited(@Nullable Entity except, Box box, Predicate predicate, int limit) { - this.getProfiler().visit("getEntities"); + this.getProfiler().method_39278("getEntities"); // visit AtomicInteger checkedEntities = new AtomicInteger(); List list = Lists.newArrayList(); try { diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index c89c84a8..e28aa21c 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/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;