From d15bbb56eef912d161570fbbaaad92d669150f6e Mon Sep 17 00:00:00 2001 From: Caedis Date: Sun, 24 Mar 2024 21:48:09 -0500 Subject: [PATCH] Add void fog option (default false) (#398) --- .../mixins/early/angelica/MixinEntityRenderer.java | 9 +++++++++ src/main/java/jss/notfine/core/Settings.java | 3 ++- .../java/jss/notfine/gui/NotFineGameOptionPages.java | 1 + .../mods/sodium/client/gui/SodiumGameOptionPages.java | 1 + src/main/resources/assets/notfine/lang/de_DE.lang | 1 + src/main/resources/assets/notfine/lang/en_US.lang | 1 + src/main/resources/assets/notfine/lang/pl_PL.lang | 1 + src/main/resources/assets/notfine/lang/zh_CN.lang | 1 + 8 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java index d5f9e8452..e4215086f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java @@ -1,9 +1,13 @@ package com.gtnewhorizons.angelica.mixins.early.angelica; import com.gtnewhorizons.angelica.rendering.RenderingState; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import jss.notfine.core.Settings; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.world.WorldProvider; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -22,4 +26,9 @@ public abstract class MixinEntityRenderer { viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks ); } + + @WrapOperation(method = "setupFog", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/WorldProvider;getWorldHasVoidParticles()Z")) + private boolean angelica$wrapVoidFog(WorldProvider provider, Operation original){ + return ((boolean)Settings.VOID_FOG.option.getStore()) ? original.call(provider) : false; + } } diff --git a/src/main/java/jss/notfine/core/Settings.java b/src/main/java/jss/notfine/core/Settings.java index 7f317771b..cdb4c1e08 100644 --- a/src/main/java/jss/notfine/core/Settings.java +++ b/src/main/java/jss/notfine/core/Settings.java @@ -113,7 +113,8 @@ public enum Settings { public void applyChanges() { RenderStars.reloadStarRenderList(Minecraft.getMinecraft().renderGlobal); } - }; + }, + VOID_FOG(new NotFineOptionTickBox(false, OptionImpact.LOW)); public final NotFineOption option; diff --git a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java index 66f224b86..0387490dd 100644 --- a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java +++ b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java @@ -162,6 +162,7 @@ public class NotFineGameOptionPages { .add(Settings.CLOUD_SCALE.option) .add(Settings.MODE_CLOUD_TRANSLUCENCY.option) .add(Settings.TOTAL_STARS.option) + .add(Settings.VOID_FOG.option) .build()); return new OptionPage(I18n.format("options.button.sky"), ImmutableList.copyOf(groups)); } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index 2137caea3..604a843a7 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -89,6 +89,7 @@ public class SodiumGameOptionPages { .setBinding((opts, value) -> opts.clouds = value, (opts) -> opts.clouds) .setImpact(OptionImpact.LOW) .build()); + firstGroupBuilder.add(Settings.VOID_FOG.option); groups.add(firstGroupBuilder.build()); diff --git a/src/main/resources/assets/notfine/lang/de_DE.lang b/src/main/resources/assets/notfine/lang/de_DE.lang index eb8de8e53..f69b0b3b1 100644 --- a/src/main/resources/assets/notfine/lang/de_DE.lang +++ b/src/main/resources/assets/notfine/lang/de_DE.lang @@ -52,3 +52,4 @@ options.title.particle=Partikeleinstellungen options.title.sky=Atmosphäreneinstellungen options.title.video=Grafikeinstellungen options.total_stars=Sternendichte +options.void_fog=Void Fog diff --git a/src/main/resources/assets/notfine/lang/en_US.lang b/src/main/resources/assets/notfine/lang/en_US.lang index 7d1640aa4..eecc98e10 100644 --- a/src/main/resources/assets/notfine/lang/en_US.lang +++ b/src/main/resources/assets/notfine/lang/en_US.lang @@ -36,3 +36,4 @@ options.title.particle=Particle Settings options.title.sky=Atmosphere Settings options.title.video=Video Settings options.total_stars=Star Density +options.void_fog=Void Fog diff --git a/src/main/resources/assets/notfine/lang/pl_PL.lang b/src/main/resources/assets/notfine/lang/pl_PL.lang index 3e08a7f10..eb6a268a9 100644 --- a/src/main/resources/assets/notfine/lang/pl_PL.lang +++ b/src/main/resources/assets/notfine/lang/pl_PL.lang @@ -66,3 +66,4 @@ options.title.particle=Ustawienia cząsteczek options.title.sky=Ustawienia atmosfery options.title.video=Ustawienia graficzne options.total_stars=Gęstość gwiazd +options.void_fog=Void Fog diff --git a/src/main/resources/assets/notfine/lang/zh_CN.lang b/src/main/resources/assets/notfine/lang/zh_CN.lang index a94e65135..24034a2ad 100644 --- a/src/main/resources/assets/notfine/lang/zh_CN.lang +++ b/src/main/resources/assets/notfine/lang/zh_CN.lang @@ -36,3 +36,4 @@ options.title.particle=粒子设置 options.title.sky=大气设置 options.title.video=视频设置 options.total_stars=星星密度 +options.void_fog=Void Fog