Skip to content

Commit

Permalink
update 1.21 neo
Browse files Browse the repository at this point in the history
  • Loading branch information
eerussianguy committed Aug 22, 2024
1 parent ba919c7 commit 4ae158d
Show file tree
Hide file tree
Showing 26 changed files with 303 additions and 240 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build 1.20.x
name: Build 1.21.x

on:
push:
Expand All @@ -14,10 +14,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'
- name: Get Version
id: version
Expand Down Expand Up @@ -69,7 +69,6 @@ jobs:
version-type: ${{ steps.version_type.outputs.result }}
java: 17
loaders: |
forge
neoforge
changelog-file: CHANGELOG.md
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Test 1.20.x
name: Test 1.21.x

on:
push:
branches:
- 1.20.x
- 1.21.x
pull_request:
branches: [ 1.20.x ]
branches: [ 1.21.x ]

jobs:
main:
Expand All @@ -16,10 +16,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'
- name: Build
uses: gradle/gradle-build-action@v2
Expand Down
72 changes: 0 additions & 72 deletions build.gradle

This file was deleted.

131 changes: 131 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
import groovy.json.JsonOutput
import groovy.json.JsonSlurper

plugins {
id("net.neoforged.moddev") version "2.0.1-beta"
}


// Toolchain versions
val minecraftVersion: String = "1.21"
val neoForgeVersion: String = "21.0.167"
val parchmentVersion: String = "2024.07.07"
val parchmentMinecraftVersion: String = "1.21"

val modId: String = "betterfoliage"
val modVersion: String = System.getenv("VERSION") ?: "0.0.0-indev"
val modJavaVersion: String = "21"
val modIsInCI: Boolean = !modVersion.contains("-indev")


val generateModMetadata = tasks.register<ProcessResources>("generateModMetadata") {
val modReplacementProperties = mapOf(
"modId" to modId,
"modVersion" to modVersion,
"minecraftVersionRange" to "[$minecraftVersion,)",
"neoForgeVersionRange" to "[$neoForgeVersion,)"
)
inputs.properties(modReplacementProperties)
expand(modReplacementProperties)
from("src/main/templates")
into(layout.buildDirectory.dir("generated/sources/modMetadata"))
}


base {
archivesName.set("BetterFoliageRenewed-NeoForge-$minecraftVersion")
group = "com.eerussianguy.betterfoliage"
version = modVersion
}

java {
toolchain.languageVersion.set(JavaLanguageVersion.of(modJavaVersion))
}

repositories {
mavenLocal()
exclusiveContent {
forRepository { maven("https://www.cursemaven.com") }
filter { includeGroup("curse.maven") }
}
}

sourceSets {
main {
resources {
srcDir(generateModMetadata)
}
}
}

dependencies {
}

neoForge {
version.set(neoForgeVersion)
validateAccessTransformers = true

parchment {
minecraftVersion.set(parchmentMinecraftVersion)
mappingsVersion.set(parchmentVersion)
}

runs {
configureEach {
// Only JBR allows enhanced class redefinition, so ignore the option for any other JDKs
jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition", "-ea")
systemProperty("betterfoliage.enableDebugSelfTests", "true")
}
register("client") {
client()
gameDirectory = file("run/client")
}
}

mods {
create(modId) {
sourceSet(sourceSets.main.get())
}
}

ideSyncTask(generateModMetadata)
}

tasks {
processResources {
if (modIsInCI) {
doLast {
val jsonMinifyStart: Long = System.currentTimeMillis()
var jsonMinified: Long = 0
var jsonBytesBefore: Long = 0
var jsonBytesAfter: Long = 0

fileTree(mapOf("dir" to outputs.files.asPath, "include" to "**/*.json")).forEach {
jsonMinified++
jsonBytesBefore += it.length()
try {
it.writeText(JsonOutput.toJson(JsonSlurper().parse(it)).replace("\"__comment__\":\"This file was automatically created by mcresources\",", ""))
} catch (e: Exception) {
println("JSON Error in ${it.path}")
throw e
}

jsonBytesAfter += it.length()
}
println("Minified $jsonMinified json files. Reduced ${jsonBytesBefore / 1024} kB to ${(jsonBytesAfter / 1024)} kB. Took ${System.currentTimeMillis() - jsonMinifyStart} ms")
}
}
}


jar {
manifest {
attributes["Implementation-Version"] = project.version
}
}

named("neoForgeIdeSync") {
dependsOn(generateModMetadata)
}
}

10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
org.gradle.console=plain
org.gradle.jvmargs=-Xmx2G
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
34 changes: 21 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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/.
Expand Down Expand Up @@ -83,10 +85,9 @@ done
# This is normally unused
# shellcheck disable=SC2034
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"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +134,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
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=SC2039,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=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# 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
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
Loading

0 comments on commit 4ae158d

Please sign in to comment.