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/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta index 939b940b..2c82c7f0 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": 48 } } diff --git a/common/src/main/resources/sereneseasons.accesswidener b/common/src/main/resources/sereneseasons.accesswidener index ef13a060..93e821c0 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 4504334a..050f1916 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.6-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 8b727476..5a49c42d 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -61,9 +61,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 4f6209bb..ec2d0b3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ release_channel=beta minecraft_version=1.21.1 # Forge -forge_version=52.0.8 +forge_version=52.0.47 forge_version_range=[52.0.8,) forge_loader_version_range=[52,) 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 a4413138..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.8-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