diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
index 341000c0..581841fc 100644
--- a/.github/workflows/gradle-publish.yml
+++ b/.github/workflows/gradle-publish.yml
@@ -15,7 +15,7 @@ jobs:
         fetch-depth: 0
         fetch-tags: true
     - name: Set up JDK 21
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '21'
         distribution: 'oracle'
diff --git a/.gitignore b/.gitignore
index 6c0c4a09..142169a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ build
 # other
 eclipse
 run
-runs
\ No newline at end of file
+runs
+*.cache
\ No newline at end of file
diff --git a/common/src/generated/resources/.cache/34eff76d8db6df414572b0996d464f3a4bc943ee b/common/src/generated/resources/.cache/34eff76d8db6df414572b0996d464f3a4bc943ee
deleted file mode 100644
index 5b155283..00000000
--- a/common/src/generated/resources/.cache/34eff76d8db6df414572b0996d464f3a4bc943ee
+++ /dev/null
@@ -1,22 +0,0 @@
-// 1.21.3	2024-10-29T11:57:32.3272904	Item Models: sereneseasons
-8131cb872e089e4f0ac2bccf3d4d7a25d7d92ec7 assets/sereneseasons/models/item/calendar.json
-cb387a39c39a0f4665c565e7218cd4426875246a assets/sereneseasons/models/item/calendar_00.json
-c154671ec34c7931bc05c47db4f69f21a5e413c7 assets/sereneseasons/models/item/calendar_01.json
-01c1acf59f2e7d7b8319592777b1f2218c208f78 assets/sereneseasons/models/item/calendar_02.json
-d44c9ac4201a4a952696ecccd594fc9689de3576 assets/sereneseasons/models/item/calendar_03.json
-cc3782ec8e516147656f4045139440b5ccadf0b6 assets/sereneseasons/models/item/calendar_04.json
-55827705e48251633ddf7345549e9e3cfc9a7fc9 assets/sereneseasons/models/item/calendar_05.json
-93c14f266f904cc70eede0f028efaf976f348c41 assets/sereneseasons/models/item/calendar_06.json
-ef42e0689c450893ae9666734d540a12d22974cc assets/sereneseasons/models/item/calendar_07.json
-01b281a50b438eb9899a38bb22fbe4a07d524a77 assets/sereneseasons/models/item/calendar_08.json
-b48f883f9a867921ce1cf1d738c929dbf4fa811a assets/sereneseasons/models/item/calendar_09.json
-cfce93d8a9e0dccea5e123e0a0fd61830ef92024 assets/sereneseasons/models/item/calendar_10.json
-f752ad7cd8c2af7907da019e39596dada37fcd0d assets/sereneseasons/models/item/calendar_11.json
-4f091f7f06f8789e698f1298b02436a9063cee2f assets/sereneseasons/models/item/calendar_null.json
-c4e806108e523f09f34968a76f3cdd9c6f985a22 assets/sereneseasons/models/item/ss_icon.json
-ddfc3c7333675fd86b4c43d98957dba35286d21c assets/sereneseasons/models/item/tropical_calendar_00.json
-2ab5c214a2af0899a6d7d6a8c8796ee70e5bb51e assets/sereneseasons/models/item/tropical_calendar_01.json
-5a3146b60ec2bcf9721ed8c6335a1452003e5e6f assets/sereneseasons/models/item/tropical_calendar_02.json
-26179b4c671d541f6c132207f0d4f05ba4e0ebea assets/sereneseasons/models/item/tropical_calendar_03.json
-af77ba9b80f14188dc6369b08d3b1e748ac18969 assets/sereneseasons/models/item/tropical_calendar_04.json
-02753018faf93099950323611f38635a77077719 assets/sereneseasons/models/item/tropical_calendar_05.json
diff --git a/common/src/generated/resources/.cache/51dc2b66606c1345aa908ef96784ba8686abe32c b/common/src/generated/resources/.cache/51dc2b66606c1345aa908ef96784ba8686abe32c
deleted file mode 100644
index 745c7dc8..00000000
--- a/common/src/generated/resources/.cache/51dc2b66606c1345aa908ef96784ba8686abe32c
+++ /dev/null
@@ -1,7 +0,0 @@
-// 1.21.3	2024-10-29T11:57:32.3262892	Block States: sereneseasons
-edf060403d4f871caf88b27e91d713ee2be4ebc1 assets/sereneseasons/blockstates/season_sensor.json
-2797b7f59442c019e778d4e72e49c819153d75b3 assets/sereneseasons/models/block/season_sensor_autumn.json
-607600cb666bf37bc704c834d7d0ffc585b405d0 assets/sereneseasons/models/block/season_sensor_spring.json
-7ed498c84b8810c377d83886277d13204d936b5a assets/sereneseasons/models/block/season_sensor_summer.json
-7013d7e0506d4d1f4bde717ae5fbb71bd269ee86 assets/sereneseasons/models/block/season_sensor_winter.json
-bf0c1df529d4858c45155785e5197da636dbaf3a assets/sereneseasons/models/item/season_sensor.json
diff --git a/common/src/generated/resources/.cache/7dda471881370ae09913a072085433a4eb774f0b b/common/src/generated/resources/.cache/7dda471881370ae09913a072085433a4eb774f0b
deleted file mode 100644
index c96c677a..00000000
--- a/common/src/generated/resources/.cache/7dda471881370ae09913a072085433a4eb774f0b
+++ /dev/null
@@ -1,5 +0,0 @@
-// 1.21.3	2024-10-29T11:57:32.3267901	SS Recipes
-e072858e57ee517a9ad673759ea337523f1faf58 data/sereneseasons/advancement/recipes/redstone/season_sensor.json
-a6e2e9061195651e5a5ebe536429b983725e47a8 data/sereneseasons/advancement/recipes/tools/calendar.json
-8baddb9771f6e76a935fa1bf988623c65578b91f data/sereneseasons/recipe/calendar.json
-1e0108f730fc7055f414ae4274b89cda22b7a722 data/sereneseasons/recipe/season_sensor.json
diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta
index 939b940b..7398ac4b 100644
--- a/common/src/main/resources/pack.mcmeta
+++ b/common/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "Resources used for Serene Seasons",
-    "pack_format": 13
+    "pack_format": 57
   }
 }
diff --git a/common/src/main/resources/sereneseasons.accesswidener b/common/src/main/resources/sereneseasons.accesswidener
index 8587fddd..bf4d2567 100644
--- a/common/src/main/resources/sereneseasons.accesswidener
+++ b/common/src/main/resources/sereneseasons.accesswidener
@@ -1,4 +1,4 @@
-accessWidener v1 named
+accessWidener v2 named
 
 # Block entity registration
 accessible class net/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier
diff --git a/fabric/build.gradle b/fabric/build.gradle
index f90cf86a..050f1916 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.8-SNAPSHOT"
+    id "fabric-loom" version "1.9-SNAPSHOT"
     id "com.matthewprenger.cursegradle" version "1.4.0"
 }
 
diff --git a/forge/build.gradle b/forge/build.gradle
index f666a485..d41a3442 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -63,9 +63,6 @@ dependencies {
     compileOnly project(":Common")
     implementation 'com.github.glitchfiend:GlitchCore-forge:' + minecraft_version + '-' + glitchcore_version
     annotationProcessor 'org.spongepowered:mixin:0.8.5-SNAPSHOT:processor'
-
-    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transtive dependencies request 6.0+
-    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }
 
 tasks.withType(JavaCompile).configureEach {
diff --git a/forge/src/main/java/sereneseasons/forge/core/SereneSeasonsForge.java b/forge/src/main/java/sereneseasons/forge/core/SereneSeasonsForge.java
index 49c38d19..17b553f2 100644
--- a/forge/src/main/java/sereneseasons/forge/core/SereneSeasonsForge.java
+++ b/forge/src/main/java/sereneseasons/forge/core/SereneSeasonsForge.java
@@ -1,32 +1,18 @@
 package sereneseasons.forge.core;
 
-import glitchcore.forge.GlitchCoreForge;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.registries.DeferredRegister;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import sereneseasons.core.SereneSeasons;
-import sereneseasons.season.SeasonColorHandlers;
-import sereneseasons.init.*;
+import sereneseasons.init.ModClient;
 
 @Mod(value = SereneSeasons.MOD_ID)
 public class SereneSeasonsForge
 {
-    public SereneSeasonsForge()
+    public SereneSeasonsForge(FMLJavaModLoadingContext context)
     {
-        IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
+        IEventBus bus = context.getModEventBus();
         bus.addListener(this::clientSetup);
 
         SereneSeasons.init();
diff --git a/gradle.properties b/gradle.properties
index 3331efd0..3900f416 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ release_channel=beta
 minecraft_version=1.21.3
 
 # Forge
-forge_version=53.0.2
+forge_version=53.0.44
 forge_version_range=[53.0.2,)
 forge_loader_version_range=[53,)
 
@@ -40,4 +40,4 @@ org.gradle.daemon=false
 
 # Dependencies
 nightconfig_version=3.6.7
-glitchcore_version=2.2.0.2
+glitchcore_version=2.2.0.5
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd491..a4b76b95 100755
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9355b415..e18bc253 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42..f3b75f3b 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f..9d21a218 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail