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 27c462caf..ab24e49b2 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 @@ -648,48 +648,4 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper - @Override - public float getShade(EDhDirection lodDirection) - { - EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.Quality.lodShading.get(); - switch (lodShading) - { - default: - case AUTO: - #if MC_VER <= MC_1_12_2 - // 1.12.2 has no getShade, fall through to ENABLED - #else - IClientLevelWrapper level = MinecraftClientWrapper.INSTANCE.getWrappedClientLevel(); - if (level != null) - { - return level.getShade(lodDirection); - } - else - { - return 0.0f; - } - #endif - case ENABLED: - switch (lodDirection) - { - case DOWN: - return 0.5F; - default: - case UP: - return 1.0F; - case NORTH: - case SOUTH: - return 0.8F; - case WEST: - case EAST: - return 0.6F; - } - - case DISABLED: - return 1.0F; - } - } - - - } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java index 23c16ff62..c64bd59be 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java @@ -1,5 +1,6 @@ package com.seibel.distanthorizons.common.wrappers.world; +import com.seibel.distanthorizons.api.enums.config.EDhApiLodShading; import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType; import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; @@ -10,6 +11,7 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; import com.seibel.distanthorizons.common.wrappers.level.KeyedClientLevelManager; import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper; import com.seibel.distanthorizons.core.api.internal.SharedApi; +import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.enums.EDhDirection; @@ -670,16 +672,40 @@ public class ClientLevelWrapper implements IClientLevelWrapper @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 + EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.Quality.lodShading.get(); + switch (lodShading) + { + default: + case AUTO: + #if MC_VER <= MC_1_12_2 + // 1.12.2 level doesn't have a getShade method, fall through to ENABLED + #else + Direction mcDir = McObjectConverter.Convert(lodDirection); + #if MC_VER <= MC_1_21_11 + return this.level.getShade(mcDir, true); + #else + return this.level.cardinalLighting().byFace(mcDir); + #endif + #endif + case ENABLED: + switch (lodDirection) + { + case DOWN: + return 0.5F; + default: + case UP: + return 1.0F; + case NORTH: + case SOUTH: + return 0.8F; + case WEST: + case EAST: + return 0.6F; + } + + case DISABLED: + return 1.0F; + } } //endregion diff --git a/coreSubProjects b/coreSubProjects index 653b86c51..9897570e6 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 653b86c51a3e6c04a61511e6e13eedf5cd2b42aa +Subproject commit 9897570e6cb79ba97cd6fdd23377ee16775485fd