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

Move getShade into ClientLevelWrapper.

Browse Source
This commit is contained in:
Acuadragon100
2026-05-31 11:16:01 +02:00
parent 10925d7c57
commit 49e3e11250
3 changed files with 22 additions and 8 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
+3 -7
View File
@@ -659,14 +659,10 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
#if MC_VER <= MC_1_12_2
// 1.12.2 has no getShade, fall through to ENABLED
#else
if (MC.level != null)
IClientLevelWrapper level = MinecraftClientWrapper.INSTANCE.getWrappedClientLevel();
if (level != null)
{
Direction mcDir = McObjectConverter.Convert(lodDirection);
#if MC_VER <= MC_1_21_11
return MC.level.getShade(mcDir, true);
#else
return MC.level.cardinalLighting().byFace(mcDir);
#endif
return level.getShade(lodDirection);
}
else
{
common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
+18
View File
@@ -2,6 +2,7 @@ package com.seibel.distanthorizons.common.wrappers.world;
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
import com.seibel.distanthorizons.common.wrappers.block.ClientBlockStateColorCache;
@@ -11,6 +12,7 @@ import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapp
import com.seibel.distanthorizons.core.api.internal.SharedApi;
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.enums.EDhDirection;
import com.seibel.distanthorizons.core.level.*;
import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -32,6 +34,7 @@ import net.minecraft.block.state.IBlockState;
#else
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkAccess;
@@ -664,6 +667,21 @@ public class ClientLevelWrapper implements IClientLevelWrapper
#endif
}
@Override
public float getShade(EDhDirection lodDirection)
{
#if MC_VER <= MC_1_12_2
return 0; // 1.12.2 has no getShade
#else
Direction mcDir = McObjectConverter.Convert(lodDirection);
#if MC_VER <= MC_1_21_11
return level.getShade(mcDir, true);
#else
return level.cardinalLighting().byFace(mcDir);
#endif
#endif
}
//endregion
coreSubProjects
+1 -1
Submodule coreSubProjects updated: 4f6d78189b...653b86c51a