change: update to 1.18 (#105)

* Update to 1.18.

* Add Reeses Sodium Options support

* Fix Sodium versioning

* Bump reeses sodium options version

* Bump reeses sodium options recommendation version

* Fix minor mistake

* Update dependencies

* Update GitHub Actions Java version from 16 to 17

* Bump reeses sodium options recommendation version

* Update to 1.18-rc1

* Update java requirement to 17.

* Temporary fix for GitHub Actions

* Minor change

Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>

* Fix consistency

* Update to 1.18-rc4

* Fix temporary GitHub Actions in rc-4

* Update to 1.18 release, fix Sodium and Reeses Sodium Options

* Revert 'Temporary fix for GitHub Actions'

* Fix cloud height range

* Update fabric

Co-authored-by: Kichura <68134602+Kichura@users.noreply.github.com>
Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>

Author: 3 people

.github/workflows/gradle.yml

@@ -8,10 +8,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
@@ -20,4 +20,4 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: build-artifacts
-          path: build/libs
+          path: build/libs

.github/workflows/publish.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 16
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Upload assets to GitHub
@@ -25,4 +25,4 @@ jobs:
         uses: AButler/upload-release-assets@v2.0
         with:
           files: 'build/libs/*;LICENSE.txt'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,6 +1,6 @@
 # Sodium Extra
 
-![Java 16](https://img.shields.io/badge/language-Java%2016-9b599a.svg?style=flat-square)
+![Java 17](https://img.shields.io/badge/language-Java%2017-9b599a.svg?style=flat-square)
 [![Project License](https://img.shields.io/github/license/FlashyReese/sodium-extra-fabric?style=flat-square)](LICENSE.txt)
 ![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square)
 ![Mod loader: Fabric](https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==)
@@ -15,7 +15,7 @@ Features that shouldn't be in Sodium.
 
 #### Prerequisites
 
-- Java 16 or above
+- Java 17 or above
 
 #### Compiling
 

build.gradle

@@ -3,8 +3,8 @@ plugins {
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}"
 version = project.mod_version
@@ -32,11 +32,10 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     modImplementation "maven.modrinth:sodium:${project.sodium_version}"
+    modImplementation "maven.modrinth:reeses-sodium-options:${project.reeses_sodium_options}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.
-
-    modImplementation("com.github.FlashyReese:reeses-sodium-options:${project.reeses_sodium_options}")
 }
 
 processResources {

gradle.properties

@@ -2,16 +2,16 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
     # check these on https://modmuss50.me/fabric.html
-    minecraft_version=1.17.1
-    yarn_mappings=1.17.1+build.39
-    loader_version=0.12.5
+    minecraft_version=1.18
+    yarn_mappings=1.18+build.1
+    loader_version=0.12.6
 
 # Mod Properties
     mod_version=0.3.6
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra
 
 # Dependencies
-    reeses_sodium_options=mc1.17.1-1.2.0
-    sodium_version=mc1.17.1-0.3.3
-    fabric_version=0.38.1+1.17
+    reeses_sodium_options=mc1.18-1.2.4
+    sodium_version=mc1.18-0.4.0-alpha1
+    fabric_version=0.43.1+1.18

src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java

@@ -297,7 +297,7 @@ public static OptionPage extra() {
                 .add(OptionImpl.createBuilder(int.class, sodiumExtraOpts)
                         .setName(new TranslatableText("sodium-extra.option.cloud_height"))
                         .setTooltip(new TranslatableText("sodium-extra.option.cloud_height.tooltip"))
-                        .setControl(option -> new SliderControl(option, 0, 255, 1, ControlValueFormatter.number()))
+                        .setControl(option -> new SliderControl(option, -64, 319, 1, ControlValueFormatter.number()))
                         .setBinding((options, value) -> options.extraSettings.cloudHeight = value, options -> options.extraSettings.cloudHeight)
                         .build()
                 )

src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java

@@ -157,7 +157,7 @@ public ExtraSettings() {
             this.showFps = false;
             this.showCoords = false;
             this.reduceResolutionOnMac = true;
-            this.cloudHeight = 128;
+            this.cloudHeight = 192;
             this.toasts = true;
             this.instantSneak = false;
             this.preventShaders = false;

src/main/java/me/flashyreese/mods/sodiumextra/mixin/features/cloud/MixinWorldRenderer.java

@@ -1,7 +1,7 @@
 package me.flashyreese.mods.sodiumextra.mixin.features.cloud;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
-import net.minecraft.client.render.SkyProperties;
+import net.minecraft.client.render.DimensionEffects;
 import net.minecraft.client.render.WorldRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -12,10 +12,10 @@ public class MixinWorldRenderer {
 
     @Redirect(
             method = "renderClouds(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Matrix4f;FDDD)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/SkyProperties;getCloudsHeight()F")
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/DimensionEffects;getCloudsHeight()F")
     )
-    private float getCloudHeight(SkyProperties skyProperties) {
-        if (skyProperties.getSkyType() == SkyProperties.SkyType.NORMAL) {
+    private float getCloudHeight(DimensionEffects skyProperties) {
+        if (skyProperties.getSkyType() == DimensionEffects.SkyType.NORMAL) {
             return SodiumExtraClientMod.options().extraSettings.cloudHeight;
         }
         return skyProperties.getCloudsHeight();

src/main/resources/fabric.mod.json

@@ -36,12 +36,11 @@
     "sodium-extra.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.11.3",
+    "fabricloader": ">=0.12.6",
     "fabric": "*",
-    "minecraft": "~1.17",
-    "sodium": "0.3.x"
+    "sodium": "0.4.0-alpha1"
   },
   "recommends": {
-    "reeses-sodium-options": "*"
+    "reeses-sodium-options": ">=1.2.4"
   }
 }

src/main/resources/sodium-extra.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "me.flashyreese.mods.sodiumextra.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
   ],
   "client": [