diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 229a8ecd7..516e22677 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ variables: - forge/build/libs/*.jar - quilt/build/libs/*.jar exclude: - # TODO: There is a lot of duplicate stuff here, fix it later to be smaller + # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller - fabric/build/libs/*-all.jar - fabric/build/libs/*-sources.jar - forge/build/libs/*-all.jar diff --git a/coreSubProjects b/coreSubProjects index 52f9e3e9e..e4ac25f4c 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 52f9e3e9e45ff2f683174c7b908c66daad1771af +Subproject commit e4ac25f4ce5cf9b278a5be1a8644e160b23dbf7e diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java index 6815a95d0..777f3f9f3 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java @@ -55,6 +55,10 @@ public class FabricMain if (Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib")) ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog + #if POST_MC_1_20_1 + if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("sodium")) + ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false); // FIXME: This is a temporary solution to get sodium 0.5 to work + #endif if (ConfigBase.INSTANCE == null) throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method."); diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java index b149f600a..b9e5ccc39 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -126,4 +126,12 @@ public class SodiumAccessor implements ISodiumAccessor { } #endif + /** A temporary overwrite for a config in sodium 0.5 to fix their terrain from showing, will be removed once a proper fix is added */ + // FIXME + @Override + public void setFogOcclusion(boolean b) { + #if POST_MC_1_20_1 + me.jellysquid.mods.sodium.client.SodiumClientMod.options().performance.useFogOcclusion = b; + #endif + } }