From 5b057958b2b786c64fb79523df6d0fe4b9f4ec89 Mon Sep 17 00:00:00 2001 From: ishland Date: Wed, 24 May 2023 21:56:09 +0800 Subject: [PATCH] build: 1.20-pre5 --- .../c2me/base/mixin/profiling/MixinChunkHolder.java | 2 +- .../mixin/region_capture/MixinChunkStatus.java | 6 +++--- .../c2me/threading/worldgen/mixin/MixinChunkStatus.java | 8 +++----- gradle.properties | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/mixin/profiling/MixinChunkHolder.java b/c2me-base/src/main/java/com/ishland/c2me/base/mixin/profiling/MixinChunkHolder.java index 53a2de3c..8e451427 100644 --- a/c2me-base/src/main/java/com/ishland/c2me/base/mixin/profiling/MixinChunkHolder.java +++ b/c2me-base/src/main/java/com/ishland/c2me/base/mixin/profiling/MixinChunkHolder.java @@ -31,7 +31,7 @@ public abstract class MixinChunkHolder { @Inject(method = "getChunkAt", at = @At("RETURN")) private void postGetChunkAt(ChunkStatus targetStatus, ThreadedAnvilChunkStorage chunkStorage, CallbackInfoReturnable>> cir) { if (FlightProfiler.INSTANCE instanceof IVanillaJfrProfiler profiler && this.world instanceof ServerWorld serverWorld && !cir.getReturnValue().isDone()) { - final Finishable finishable = profiler.startChunkLoadSchedule(this.getPos(), serverWorld.getRegistryKey(), targetStatus.getId()); + final Finishable finishable = profiler.startChunkLoadSchedule(this.getPos(), serverWorld.getRegistryKey(), targetStatus.toString()); if (finishable != null) { cir.getReturnValue().exceptionally(unused -> null).thenRun(finishable::finish); } diff --git a/c2me-opts-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/mixin/region_capture/MixinChunkStatus.java b/c2me-opts-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/mixin/region_capture/MixinChunkStatus.java index 27819231..e83e51e0 100644 --- a/c2me-opts-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/mixin/region_capture/MixinChunkStatus.java +++ b/c2me-opts-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/mixin/region_capture/MixinChunkStatus.java @@ -24,11 +24,11 @@ import java.util.function.Function; @Mixin(value = ChunkStatus.class, priority = 990) -public class MixinChunkStatus { +public abstract class MixinChunkStatus { @Shadow @Final private ChunkStatus.GenerationTask generationTask; - @Shadow @Final private String id; + @Shadow public abstract String toString(); /** * @author ishland @@ -46,7 +46,7 @@ public CompletableFuture> runGenerationTask( final ChunkStatus thiz = (ChunkStatus) (Object) this; CurrentWorldGenState.setCurrentRegion(new ChunkRegion(world,chunks, thiz, -1)); Chunk chunk = chunks.get(chunks.size() / 2); - Finishable finishable = FlightProfiler.INSTANCE.startChunkGenerationProfiling(chunk.getPos(), world.getRegistryKey(), this.id); + Finishable finishable = FlightProfiler.INSTANCE.startChunkGenerationProfiling(chunk.getPos(), world.getRegistryKey(), this.toString()); CompletableFuture> completableFuture = this.generationTask.doWork(thiz, executor, world, generator, structureTemplateManager, lightingProvider, fullChunkConverter, chunks, chunk); return completableFuture.thenApply((either) -> { if (chunk instanceof ProtoChunk protoChunk && !protoChunk.getStatus().isAtLeast(thiz)) { diff --git a/c2me-threading-worldgen/src/main/java/com/ishland/c2me/threading/worldgen/mixin/MixinChunkStatus.java b/c2me-threading-worldgen/src/main/java/com/ishland/c2me/threading/worldgen/mixin/MixinChunkStatus.java index 6bf8e63f..be1e8352 100644 --- a/c2me-threading-worldgen/src/main/java/com/ishland/c2me/threading/worldgen/mixin/MixinChunkStatus.java +++ b/c2me-threading-worldgen/src/main/java/com/ishland/c2me/threading/worldgen/mixin/MixinChunkStatus.java @@ -50,15 +50,13 @@ public abstract class MixinChunkStatus implements IChunkStatus { @Final private int taskMargin; - @Shadow - @Final - private String id; - @Shadow public static List createOrderedList() { throw new AbstractMethodError(); } + @Shadow public abstract String toString(); + private int reducedTaskRadius = -1; public void calculateReducedTaskRadius() { @@ -102,7 +100,7 @@ public CompletableFuture> runGenerationTask( final ChunkStatus thiz = (ChunkStatus) (Object) this; final Chunk targetChunk = list.get(list.size() / 2); - Finishable finishable = FlightProfiler.INSTANCE.startChunkGenerationProfiling(targetChunk.getPos(), world.getRegistryKey(), this.id); + Finishable finishable = FlightProfiler.INSTANCE.startChunkGenerationProfiling(targetChunk.getPos(), world.getRegistryKey(), this.toString()); final Supplier>> generationTask = () -> { try { diff --git a/gradle.properties b/gradle.properties index e6eed63c..5a01d829 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=1.20-pre4 -yarn_mappings=1.20-pre4+build.3 +minecraft_version=1.20-pre5 +yarn_mappings=1.20-pre5+build.2 loader_version=0.14.19 # Mod Properties mod_version=0.2.0+alpha.10