Merge pull request grondag#17 from HaXrDEV/dev

Fixed darkNetherFog & darkEndFog options not working

.github/workflows/publish.yml

@@ -36,6 +36,22 @@ jobs:
           name: v${{github.ref_name}} for Fabric 1.20.1
           files: 'versions/1.20.1-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
 
+      - name: Publish-1.20.2-Fabric-Curseforge
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          curseforge-id: 906926
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          name: v${{github.ref_name}} for Fabric 1.20.2
+          files: 'versions/1.20.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+
+      - name: Publish-1.20.2-Fabric-Modrinth
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          modrinth-id: Pf8PJBb5
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          name: v${{github.ref_name}} for Fabric 1.20.2
+          files: 'versions/1.20.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+
       - name: Publish-1.20.4-Fabric-Curseforge
         uses: Kir-Antipov/mc-publish@v3.3.0
         with:

CHANGELOG.md

@@ -1,3 +1,4 @@
-- Changed description in Mod Menu.
+- Fixed *Dark Nether Fog* & *Dark End Fog* options not working.
 - Changed *Dark Nether Fog* & *Dark End Fog* option fields into sliders.
+- Changed description in Mod Menu.
 - Switched to use Stonecutter toolchain for development.

settings.gradle.kts

@@ -15,7 +15,7 @@ stonecutter {
     centralScript = "build.gradle.kts"
 
     shared {
-        versions("1.20.1", "1.20.4", "1.20.6", "1.21.1")
+        versions("1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1")
     }
     create(rootProject)
 }

src/client/java/grondag/darkness/Darkness.java

@@ -44,9 +44,9 @@ public class Darkness {
     static double darkNetherFogEffective;
     static double darkEndFogEffective;
 
-    // boolean test = CONFIG.darkEnd();
-
     /*
+    public static Logger LOG = LogManager.getLogger(DarknessInit.MOD_NAME);
+
      * static { try { DarknessConfig.getInstance().darkNetherFog =
      * Mth.clamp(DarknessConfig.getInstance().darkNetherFog, 0.0, 1.0); } catch
      * (final Exception e) { DarknessConfig.getInstance().darkNetherFog = 0.5; LOG.
@@ -63,15 +63,13 @@ private static void computeConfigValues() {
         darkEndFogEffective = CONFIG.darkEnd() ? CONFIG.darkEndFog() : 1.0;
     }
 
-    public static boolean blockLightOnly() {
-        return CONFIG.blockLightOnly();
-    }
-
     public static double darkNetherFog() {
+        computeConfigValues();
         return darkNetherFogEffective;
     }
 
     public static double darkEndFog() {
+        computeConfigValues();
         return darkEndFogEffective;
     }
 

src/main/java/grondag/darkness/DarknessInit.java

@@ -14,7 +14,6 @@
 public class DarknessInit implements ModInitializer {
     public static final String MOD_ID = "darkness";
     public static final String MOD_NAME = "TrueDarknessRefabricated";
-    public static Logger LOG = LogManager.getLogger(MOD_NAME);
     public static final DarknessConfig CONFIG = DarknessConfig.createAndLoad();
 
     @Override

versions/1.20.2/gradle.properties

@@ -0,0 +1,11 @@
+deps.yarn_build=10
+deps.fabric_api=0.91.6+1.20.2
+deps.apoli=2.11.11
+deps.origins=1.12.10
+deps.owo_lib=0.11.4+1.20.2
+deps.mod_menu=TwfjidT5
+
+mod.mc_dep=1.20.2
+mod.mc_title=1.20.2
+mod.mc_targets=1.20.2
+mod.loader=fabric