From 98ed33e2bfda178f1084c2f8beba03e9c60f56d8 Mon Sep 17 00:00:00 2001 From: tom lee Date: Thu, 10 Feb 2022 22:16:30 +0800 Subject: [PATCH] Update core + Config + fix blindness Fog --- .../main/java/com/seibel/lod/common/Config.java | 7 +------ .../wrappers/config/LodConfigWrapperSingleton.java | 14 -------------- .../wrappers/minecraft/MinecraftRenderWrapper.java | 6 +++++- core | 2 +- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/Config.java b/common/src/main/java/com/seibel/lod/common/Config.java index 3d80af5cb..47ad9c74a 100644 --- a/common/src/main/java/com/seibel/lod/common/Config.java +++ b/common/src/main/java/com/seibel/lod/common/Config.java @@ -97,7 +97,7 @@ public class Config extends ConfigGui @ConfigAnnotations.FileComment public static String _lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_DESC; - @ConfigAnnotations.Entry(minValue = 16, maxValue = 8192) + @ConfigAnnotations.Entry(minValue = 16, maxValue = 2048) public static int lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.defaultValue; @ConfigAnnotations.FileComment @@ -153,11 +153,6 @@ public class Config extends ConfigGui @ConfigAnnotations.Entry public static boolean disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DEFAULT; - @ConfigAnnotations.FileComment - public static String _alwaysDrawAtMaxQuality = IAdvancedGraphics.ALWAYS_DRAW_AT_MAD_QUALITY_DESC; - @ConfigAnnotations.Entry - public static boolean alwaysDrawAtMaxQuality = IAdvancedGraphics.ALWAYS_DRAW_AT_MAD_QUALITY_DEFAULT; - @ConfigAnnotations.FileComment public static String _vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DESC; @ConfigAnnotations.Entry diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java index 90a412b27..ac40b5de9 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java @@ -261,20 +261,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.disableDirectionalCulling"); } - - @Override - public boolean getAlwaysDrawAtMaxQuality() - { - return Config.Client.Graphics.AdvancedGraphics.alwaysDrawAtMaxQuality; - } - @Override - public void setAlwaysDrawAtMaxQuality(boolean newAlwaysDrawAtMaxQuality) - { - ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.alwaysDrawAtMaxQuality").value = newAlwaysDrawAtMaxQuality; - ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.alwaysDrawAtMaxQuality"); - } - - @Override public VanillaOverdraw getVanillaOverdraw() { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index 585ffa197..860e3d590 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -36,6 +36,8 @@ import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.core.BlockPos; import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.material.FogType; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; @@ -301,7 +303,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public boolean isFogStateSpecial() { - return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE; + Entity entity = GAME_RENDERER.getMainCamera().getEntity(); + boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS); + return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind; } @Override diff --git a/core b/core index d8c082ba4..e5a636fcc 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d8c082ba4230ef9877c3e36b6aa5ade18aa73b70 +Subproject commit e5a636fccbcf0dab6195efb8ecaac79f7547fa47