Skip to content

Commit

Permalink
changed Forge to NeoForge 1.20.1-47.1.54 (compatible with Forge 47.1.0)
Browse files Browse the repository at this point in the history
- updated compat with Jade to 1.20.1-11.4.3
- updated compat with The One Probe to 1.20.1-10.0.1
- updated Gradle
  • Loading branch information
cech12 committed Aug 9, 2023
1 parent 080337c commit d4c6db7
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 24 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/cicd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.+'
}

Expand Down Expand Up @@ -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"
Expand Down
24 changes: 12 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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,)
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -144,15 +141,15 @@ 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
case $MAX_FD in #(
'' | 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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ pluginManagement {
repositories {
gradlePluginPortal()
maven {
name = 'MinecraftForge'
url = 'https://maven.minecraftforge.net/'
name = 'NeoForge'
url = 'https://maven.neoforged.net'
}
}
}
Expand Down

0 comments on commit d4c6db7

Please sign in to comment.