From 8a882d7bf4a3d25de7235e38662a72f4e1022722 Mon Sep 17 00:00:00 2001 From: coolGi Date: Fri, 3 Nov 2023 23:20:26 +1030 Subject: [PATCH] Fixed compolation on older mc versions --- .../common/wrappers/minecraft/MinecraftRenderWrapper.java | 2 +- .../distanthorizons/fabric/mixins/client/MixinLightmap.java | 2 +- .../com/seibel/distanthorizons/forge/ForgeClientProxy.java | 6 +++++- .../distanthorizons/forge/mixins/client/MixinLightmap.java | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) 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 4c533106e..5108d556d 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 @@ -42,13 +42,13 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; #if PRE_MC_1_19_4 import com.mojang.math.Vector3f; #else -import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; import org.joml.Vector3f; #endif #if MC_1_20_2 import net.minecraft.client.renderer.chunk.SectionRenderDispatcher; #endif +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java index 867fa8f81..92b91265c 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java @@ -29,7 +29,7 @@ public class MixinLightmap // since the light map is always updated on the client render thread we should be able to access the client level at the same time IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); if ( - mc == null && + mc == null || mc.getWrappedClientLevel() == null ) return; diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java index 53b378d39..631b0cb7d 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java @@ -40,11 +40,11 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; #else -import net.minecraftforge.client.event.RenderLevelStageEvent; import net.minecraftforge.event.level.ChunkEvent; import net.minecraftforge.event.level.LevelEvent; #endif +import net.minecraftforge.client.event.RenderLevelStageEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraft.world.level.chunk.ChunkAccess; @@ -298,7 +298,11 @@ public class ForgeClientProxy @SubscribeEvent public void afterLevelRenderEvent(RenderLevelStageEvent event) { + #if POST_MC_1_20_1 if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_LEVEL) + #else + if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_SOLID_BLOCKS) + #endif { try { diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java index 2bceea49f..108390f79 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java @@ -29,7 +29,7 @@ public class MixinLightmap // since the light map is always updated on the client render thread we should be able to access the client level at the same time IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); if ( - mc == null && + mc == null || mc.getWrappedClientLevel() == null ) return;