From 731b78cf9d7797f47e576f68ccb6ff59e9106ec3 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 1 Jul 2020 02:13:43 -0300 Subject: [PATCH] update --- .../mixins/ServerLightingProvider_scarpetMixin.java | 8 +++----- ...readedAnvilChunkStorage_scarpetChunkCreationMixin.java | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/carpet/mixins/ServerLightingProvider_scarpetMixin.java b/src/main/java/carpet/mixins/ServerLightingProvider_scarpetMixin.java index b55e2236..611cdff5 100644 --- a/src/main/java/carpet/mixins/ServerLightingProvider_scarpetMixin.java +++ b/src/main/java/carpet/mixins/ServerLightingProvider_scarpetMixin.java @@ -1,12 +1,10 @@ package carpet.mixins; -import carpet.CarpetSettings; import carpet.fakes.ServerLightingProviderInterface; import net.minecraft.server.world.ServerLightingProvider; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkSectionPos; -import net.minecraft.world.IWorld; import net.minecraft.world.LightType; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkNibbleArray; @@ -39,9 +37,9 @@ public abstract class ServerLightingProvider_scarpetMixin extends LightingProvid { //ChunkPos pos = new ChunkPos(x, z); int j; - for(j = -1; j < 17; ++j) { - super.queueData(LightType.BLOCK, ChunkSectionPos.from(pos, j), new ChunkNibbleArray()); - super.queueData(LightType.SKY, ChunkSectionPos.from(pos, j), new ChunkNibbleArray()); + for(j = -1; j < 17; ++j) { // skip some recomp + super.queueData(LightType.BLOCK, ChunkSectionPos.from(pos, j), new ChunkNibbleArray(), false); + super.queueData(LightType.SKY, ChunkSectionPos.from(pos, j), new ChunkNibbleArray(), false); } for(j = 0; j < 16; ++j) { super.updateSectionStatus(ChunkSectionPos.from(pos, j), true); diff --git a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java index 7b8c1437..0a382051 100644 --- a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java +++ b/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java @@ -72,7 +72,6 @@ public abstract class ThreadedAnvilChunkStorage_scarpetChunkCreationMixin implem @Shadow @Final private ServerLightingProvider serverLightingProvider; - @Shadow @Final private Queue field_19343; @Shadow @Final @@ -114,8 +113,8 @@ public abstract class ThreadedAnvilChunkStorage_scarpetChunkCreationMixin implem @Unique private void addTicket(final ChunkPos pos, final ChunkStatus status) - { - this.ticketManager.addTicketWithLevel(ChunkTicketType.UNKNOWN, pos, 33 + ChunkStatus.getTargetGenerationRadius(status), pos); + { // UNKNOWN + this.ticketManager.addTicketWithLevel(ChunkTicketType.field_14032, pos, 33 + ChunkStatus.getTargetGenerationRadius(status), pos); } @Unique