diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index 6069a78..f6b6561 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -43,9 +43,11 @@ jobs: java-version: 17 curseforge-id: 417553 game-versions: | - 1.20 1.20.1 release-type: release + loaders: | + neoforge + forge version-prefix: 'forge-' secrets: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -59,9 +61,11 @@ jobs: java-version: 17 modrinth-id: yENm0xnb game-versions: | - 1.20 1.20.1 release-type: release + loaders: | + neoforge + forge version-prefix: 'forge-' secrets: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 776e360..44537c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.20.1-1.9.0.0] - 2023-08-09 +### Changed +- changed Forge to NeoForge 1.20.1-47.1.54 (compatible with Forge 47.1.0) +- updated compat with Jade to 1.20.1-11.4.3 +- updated compat with The One Probe to 1.20.1-10.0.1 + ## [1.20-1.8.1.0] - 2023-06-12 ### Changed - re-add Jade (1.20-11.0.3) support #24 diff --git a/build.gradle b/build.gradle index bf5086a..90c8596 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'net.neoforged.gradle' version '[6.0,6.2)' id 'org.spongepowered.mixin' version '0.7.+' } @@ -117,7 +117,7 @@ dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}" + minecraft "net.neoforged:forge:${project.minecraft_version}-${project.forge_version}" // Mixin annotation processor - generates the refmap annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" diff --git a/gradle.properties b/gradle.properties index b1b4f9a..1bfff70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,29 +4,29 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false ## Environment Properties -minecraft_version=1.20 -minecraft_version_range=[1.20,1.21) -forge_version=46.0.1 -forge_version_range=[46.0.1,) -loader_version_range=[46,) +minecraft_version=1.20.1 +minecraft_version_range=[1.20.1,1.21) +forge_version=47.1.54 +forge_version_range=[47.1.0,) +loader_version_range=[47,) mixin_version=0.8.5 ## Mod Properties mod_id=unlitcampfire -mod_version=1.8.1.0 +mod_version=1.9.0.0 mod_group_id=cech12.unlitcampfire mod_name=Unlit Campfire mod_authors=Cech12 mod_license=The MIT License (MIT) mod_url=https://github.com/cech12/UnlitCampfire mod_issue_tracker=https://github.com/cech12/UnlitCampfire/issues -mod_description=A mod were placed Campfires are unlit. +mod_description=A mod where placed campfires are unlit. #the one probe -top_version=1.20.0-9.0.0-1 -top_version_range=[1.20.0-9.0.0,) +top_version=1.20.1-10.0.1-3 +top_version_range=[1.20.1-10.0.1,) #jade -jade_id=4573193 -jade_api_id=4573194 -jade_version_range=[11.0.3,) +jade_id=4681833 +jade_api_id=4681836 +jade_version_range=[11.4.3,) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..c1962a7 100644 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 37aef8d..17a8ddc 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.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/settings.gradle b/settings.gradle index 291d399..09a3d08 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,8 +2,8 @@ pluginManagement { repositories { gradlePluginPortal() maven { - name = 'MinecraftForge' - url = 'https://maven.minecraftforge.net/' + name = 'NeoForge' + url = 'https://maven.neoforged.net' } } }