From 270776a7822ad218d9db13f7987d3641dc80fb5e Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 4 Oct 2025 10:48:50 -0500 Subject: [PATCH] fix world gen protochunks in 1.21.9 --- .../minecraft/MinecraftClientWrapper.java | 15 ++++++++++++++- .../BatchGenerationEnvironment.java | 7 ++----- coreSubProjects | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java index 5ddbd0cb3..09b6faad8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -33,6 +33,7 @@ import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.enums.EDhDirection; import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import com.seibel.distanthorizons.coreapi.ModInfo; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; @@ -306,10 +307,22 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra return; } + if (!GLProxy.hasInstance()) + { + // rendering setup hasn't finished + return; + } + #if MC_VER < MC_1_19_2 player.sendMessage(new TextComponent(string), getPlayer().getUUID()); - #else + #elif MC_VER < MC_1_21_9 player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false); + #else + + GLProxy.getInstance().queueRunningOnRenderThread(() -> + { + player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false); + }); #endif } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index e33732d6b..ac6351a15 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -63,10 +63,7 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepSurfa import net.minecraft.server.level.*; import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.chunk.ProtoChunk; -import net.minecraft.world.level.chunk.UpgradeData; +import net.minecraft.world.level.chunk.*; import net.minecraft.world.level.chunk.storage.IOWorker; import net.minecraft.world.level.chunk.storage.RegionFileStorage; import net.minecraft.world.level.levelgen.DebugLevelSource; @@ -750,7 +747,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv #elif MC_VER < MC_1_21_9 return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().lookupOrThrow(Registries.BIOME), null); #else - return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, null, null); + return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, PalettedContainerFactory.create(level.registryAccess()), null); #endif } diff --git a/coreSubProjects b/coreSubProjects index 569a5442a..32b3eac58 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 569a5442a9a4be7b62c8ce87f6351254552429c4 +Subproject commit 32b3eac589834e0db81362ab643ee8af97d7ca46