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 JEI to 1.20.1-15.2.0.23
- 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 0d7ec9e commit b985198
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 17 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/cicd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ jobs:
game-versions: |
1.20.1
release-type: release
loaders: |
neoforge
forge
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
Expand All @@ -64,6 +67,9 @@ jobs:
game-versions: |
1.20.1
release-type: release
loaders: |
neoforge
forge
secrets:
github-token: ${{ secrets.GITHUB_TOKEN }}
modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@ 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-2.1.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 JEI to 1.20.1-15.2.0.23
- Updated compat with The One Probe to 1.20.1-10.0.1

## [1.20.1-2.0.0.0] - 2023-06-19
### Changed
- Update mod to Forge 1.20.1-47.0.1 #21
- Update compat with JEI to 1.20.1-15.0.0.17 #21
- Update compat with The One Probe to 1.20.0-9.0.0 #21

## [1.19.4-1.4.0.0] - 2023-04-04
### Changed
- Update mod to Forge 1.19.4-45.0.40
- Update compat with The One Probe to 1.19.4-8.0.0
- Update compat with JEI to 1.19.4-13.0.0.1
Expand All @@ -18,6 +26,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
- fix startup issue with mod "REI Plugin Compatibilities (REIPC)" version 10.0.45 (thanks to subsonicer for the report)

## [1.19.3-1.3.2.0] - 2023-01-17
### Added
- re-add JEI support

## [1.19.3-1.3.1.0] - 2023-01-02
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)'
}

version = "${minecraft_version}-${mod_version}"
Expand Down Expand Up @@ -106,7 +106,7 @@ repositories {
}

dependencies {
minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
minecraft "net.neoforged:forge:${project.minecraft_version}-${project.forge_version}"

// compile against the JEI API but do not include it at runtime
compileOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}-common-api:${project.jei_version}")
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ org.gradle.daemon=false
## Environment Properties
minecraft_version=1.20.1
minecraft_version_range=[1.20.1,1.21)
forge_version=47.0.1
forge_version_range=[47.0.1,)
forge_version=47.1.54
forge_version_range=[47.1.0,)
loader_version_range=[47,)

mod_id=solarcooker
mod_version=2.0.0.0
mod_version=2.1.0.0
mod_group_id=cech12.solarcooker
mod_name=Solar Cooker
mod_authors=Cech12
Expand All @@ -21,9 +21,9 @@ mod_issue_tracker=https://github.com/cech12/SolarCooker/issues
mod_description=A mod which adds a Solar Cooker.

# jei
jei_version=15.0.0.17
jei_version_range=[15.0.0.17,)
jei_version=15.2.0.23
jei_version_range=[15.2.0.23,)

#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,)
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 b985198

Please sign in to comment.