From 32d8553b9b4c0ff79d67ee1d9ca73d12b5139795 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 8 Aug 2023 20:36:35 +0930 Subject: [PATCH 1/4] Added a temporary ci stage to test git --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 229a8ecd7..9108130a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ image: gradle:eclipse-temurin # all stages need to be defined here stages: # TODO: Make stages depend on what is in versionProperties + - test_git - build_1_16_5 - build_1_17_1 - build_1_18_2 @@ -55,6 +56,12 @@ variables: when: always extends: .build_java +test_git: + stage: test_git + script: + - git ls-tree HEAD + extends: .build_java + # 1.16.5 build build_1_16_5: From e4cd89131e5759946c310b6e391208b21be6bbe1 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 8 Aug 2023 20:41:23 +0930 Subject: [PATCH 2/4] Removed test git stage --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9108130a2..516e22677 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,6 @@ image: gradle:eclipse-temurin # all stages need to be defined here stages: # TODO: Make stages depend on what is in versionProperties - - test_git - build_1_16_5 - build_1_17_1 - build_1_18_2 @@ -45,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 @@ -56,12 +55,6 @@ variables: when: always extends: .build_java -test_git: - stage: test_git - script: - - git ls-tree HEAD - extends: .build_java - # 1.16.5 build build_1_16_5: From a3f6f51a7a9d0234f5c68ab6cfc80a904d618bd0 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 8 Aug 2023 21:23:25 +0930 Subject: [PATCH 3/4] Temporary fix for sodium 0.5's fog occlusion --- .../com/seibel/distanthorizons/fabric/FabricMain.java | 4 ++++ .../fabric/wrappers/modAccessor/SodiumAccessor.java | 8 ++++++++ 2 files changed, 12 insertions(+) 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 + } } From 401daf907c7462c546c41f42fa98a39f4e43e517 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 8 Aug 2023 21:23:38 +0930 Subject: [PATCH 4/4] Updated core sub-module --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index dc88c46dc..c2f7ca8f3 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit dc88c46dc98c86cb9d499afc5493897ec328a36c +Subproject commit c2f7ca8f38eac1fe370f8cd1d153dabcd866a0a9