wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compolation on older mc versions

Browse Source
This commit is contained in:
coolGi
2023-11-03 23:20:26 +10:30
parent 04ee9d58bc
commit 8a882d7bf4
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java
+1 -1
View File
@@ -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;
fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java
+1 -1
View File
@@ -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;
forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java
+5 -1
View File
@@ -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
{
forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java
+1 -1
View File
@@ -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;