From 2007a6af2484fb2b57624b81cdf948a82c4b9eb6 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 19 Oct 2025 16:06:19 -0500 Subject: [PATCH] Clean up LodRendering logic --- .../distanthorizons/common/commands/CrashCommand.java | 8 ++++---- .../wrappers/minecraft/MinecraftRenderWrapper.java | 11 +++++++---- coreSubProjects | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/commands/CrashCommand.java b/common/src/main/java/com/seibel/distanthorizons/common/commands/CrashCommand.java index c44700a7c..7c6f09d71 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/commands/CrashCommand.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/commands/CrashCommand.java @@ -17,9 +17,9 @@ public class CrashCommand extends AbstractCommand .requires(this::isPlayerSource) .then(literal("encode") .executes(c -> { - assert SharedApi.getIDhServerWorld() != null; + assert SharedApi.tryGetDhServerWorld() != null; - ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager() + ServerPlayerState serverPlayerState = SharedApi.tryGetDhServerWorld().getServerPlayerStateManager() .getConnectedPlayer(this.getSourcePlayer(c)); if (serverPlayerState != null) { @@ -29,9 +29,9 @@ public class CrashCommand extends AbstractCommand })) .then(literal("decode") .executes(c -> { - assert SharedApi.getIDhServerWorld() != null; + assert SharedApi.tryGetDhServerWorld() != null; - ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager() + ServerPlayerState serverPlayerState = SharedApi.tryGetDhServerWorld().getServerPlayerStateManager() .getConnectedPlayer(this.getSourcePlayer(c)); if (serverPlayerState != null) { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java index a759d61eb..71cdb1bc9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -59,6 +59,12 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAc import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.world.effect.MobEffects; + +import net.minecraft.world.phys.Vec3; +import com.seibel.distanthorizons.core.logging.DhLogger; +import org.jetbrains.annotations.NotNull; +import org.joml.Vector4f; + #if MC_VER < MC_1_17_1 import net.minecraft.tags.FluidTags; import net.minecraft.world.entity.Entity; @@ -67,9 +73,6 @@ import org.lwjgl.opengl.GL15; #else import net.minecraft.world.level.material.FogType; #endif -import net.minecraft.world.phys.Vec3; -import com.seibel.distanthorizons.core.logging.DhLogger; -import org.joml.Vector4f; #if MC_VER >= MC_1_21_5 import com.mojang.blaze3d.opengl.GlTexture; @@ -419,7 +422,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper } @Override - public ILightMapWrapper getLightmapWrapper(ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); } + public ILightMapWrapper getLightmapWrapper(@NotNull ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); } @Override public boolean isFogStateSpecial() diff --git a/coreSubProjects b/coreSubProjects index 0e0e1e1b0..f7ece2b02 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 0e0e1e1b0f84f61e0aba61d84b8a9b964ae31c3e +Subproject commit f7ece2b02e7e55ee02ce1e2878671d49ec8dcda5