From e28f52171fa5427bb3cf4538baa99eb154cd9a60 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Tue, 23 May 2023 18:25:09 +0200 Subject: [PATCH] 1.20-pre5 --- gradle.properties | 2 +- .../carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java | 7 +++++-- src/main/java/carpet/patches/EntityPlayerMPFake.java | 2 +- src/main/java/carpet/script/api/WorldAccess.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index beb22442..8a95201a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=1.20-pre2 + minecraft_version=1.20-pre5 loader_version=0.14.19 jsr305_version=3.0.2 fabric_version=0.81.2+1.20 diff --git a/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java index 83450966..913c9bca 100644 --- a/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java +++ b/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java @@ -15,6 +15,7 @@ import java.util.stream.Collectors; import carpet.fakes.SimpleEntityLookupInterface; import carpet.fakes.ServerWorldInterface; import net.minecraft.Util; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.server.MinecraftServer; import net.minecraft.server.TickTask; import net.minecraft.server.level.ChunkHolder; @@ -439,12 +440,14 @@ public abstract class ChunkMap_scarpetChunkCreationMixin implements ThreadedAnvi if (futures == null) continue; - report.put("layer_count_" + status.getName(), futures.size()); + String statusName = BuiltInRegistries.CHUNK_STATUS.getKey(status).getPath(); + + report.put("layer_count_" + statusName, futures.size()); final long start = System.currentTimeMillis(); this.waitFor(futures); - report.put("layer_time_" + status.getName(), (int) (System.currentTimeMillis() - start)); + report.put("layer_time_" + statusName, (int) (System.currentTimeMillis() - start)); } diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 2c4b8fc0..3ac3f4e8 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -186,7 +186,7 @@ public class EntityPlayerMPFake extends ServerPlayer @Override protected void checkFallDamage(double y, boolean onGround, BlockState state, BlockPos pos) { - doCheckFallDamage(y, onGround); + doCheckFallDamage(0.0, y, 0.0, onGround); } @Override diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index eaab2eb5..012d931f 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -38,6 +38,7 @@ import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; import net.minecraft.core.QuartPos; import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.DistanceManager; @@ -632,7 +633,7 @@ public class WorldAccess forceLoad = lv.get(blockArgument.offset).getBoolean(); } ChunkAccess chunk = ((CarpetContext) c).level().getChunk(pos.getX() >> 4, pos.getZ() >> 4, ChunkStatus.EMPTY, forceLoad); - return chunk == null ? Value.NULL : new StringValue(chunk.getStatus().getName()); + return chunk == null ? Value.NULL : ValueConversions.of(BuiltInRegistries.CHUNK_STATUS.getKey(chunk.getStatus())); }); expression.addContextFunction("chunk_tickets", -1, (c, t, lv) ->