diff --git a/.gitignore b/.gitignore index c134175e62..9d00886d54 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ forgedev #idea /.idea +/build-logic/.idea/ /*/out /classes *.iml @@ -36,7 +37,9 @@ src/minecraft /projects/**/build/ /projects/**/out/ /projects/**/run/ +/*/runs/ /projects/**/*.launch +*.launch /repo/ /rejects-*/ src/*/generated/**/.cache/ diff --git a/build-logic/build.gradle b/build-logic/build.gradle new file mode 100644 index 0000000000..b2b08c4272 --- /dev/null +++ b/build-logic/build.gradle @@ -0,0 +1,42 @@ +plugins { + id("groovy-gradle-plugin") + alias(libs.plugins.licenser) +} + +repositories { + mavenCentral() + gradlePluginPortal() + maven { url = 'https://maven.minecraftforge.net/' } + //mavenLocal() +} + +dependencies { + compileOnly gradleApi() + + // Manually import plugins so that we can apply them by id. + implementation plugin('licenser') + implementation plugin('gradleutils') + implementation plugin('gitversion') + implementation plugin('changelog') + implementation plugin('forgedev') +} + +gradlePlugin { + plugins { + register('convention') { + id = 'net.minecraftforge.forge.build.convention' + implementationClass = 'net.minecraftforge.forge.build.ConventionPlugin' + } + } +} + +final Provider plugin(String alias) { + return (Provider)project.extensions.getByType(VersionCatalogsExtension) + .named("libs") + .findPlugin(alias).get() + .map { it.pluginId + ":" + it.pluginId + ".gradle.plugin:" + it.version } +} + +license { + header = file('../LICENSE-header.txt') +} diff --git a/build-logic/gradle/wrapper/gradle-wrapper.jar b/build-logic/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..8bdaf60c75 Binary files /dev/null and b/build-logic/gradle/wrapper/gradle-wrapper.jar differ diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..c42672d95b --- /dev/null +++ b/build-logic/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/build-logic/gradlew b/build-logic/gradlew new file mode 100644 index 0000000000..ef07e0162b --- /dev/null +++ b/build-logic/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# 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 -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 + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + 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=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=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + 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 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" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/build-logic/gradlew.bat b/build-logic/gradlew.bat new file mode 100644 index 0000000000..db3a6ac207 --- /dev/null +++ b/build-logic/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@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 ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +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 + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle new file mode 100644 index 0000000000..58bda31eae --- /dev/null +++ b/build-logic/settings.gradle @@ -0,0 +1,30 @@ +pluginManagement { + + repositories { + gradlePluginPortal() + maven { url = 'https://maven.minecraftforge.net/' } + mavenLocal() + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} + +//enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS' + +dependencyResolutionManagement.versionCatalogs { + register('bootLibs') { + description = 'Important version numbers that are externally declared for easy modification.' + from(files('../minecraft.versions.toml')) + } + + create('libs') { + description = 'Libraries used by Forge and its subprojects.' + from(files("../gradle/libs.versions.toml")) + } +} + +if (new File('forgedev/settings.gradle').exists()) + includeBuild '../forgedev' + diff --git a/build-logic/src/main/groovy/net/minecraftforge/forge/build/ConventionExtension.groovy b/build-logic/src/main/groovy/net/minecraftforge/forge/build/ConventionExtension.groovy new file mode 100644 index 0000000000..6c36a720f5 --- /dev/null +++ b/build-logic/src/main/groovy/net/minecraftforge/forge/build/ConventionExtension.groovy @@ -0,0 +1,147 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.forge.build + +import groovy.transform.CompileStatic +import org.gradle.api.Action +import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.api.artifacts.Dependency +import org.gradle.api.artifacts.ExternalModuleDependencyBundle +import org.gradle.api.artifacts.MinimalExternalModuleDependency +import org.gradle.api.model.ObjectFactory +import org.gradle.api.provider.Provider +import org.gradle.api.provider.ProviderFactory +import org.gradle.api.publish.maven.MavenPublication +import org.gradle.api.tasks.TaskProvider +import org.gradle.jvm.tasks.Jar +import org.jspecify.annotations.Nullable + +import javax.inject.Inject + +@CompileStatic +abstract class ConventionExtension implements Meta { + private final Project project; + private final Runs runs + + protected abstract @Inject ObjectFactory getObjects() + protected abstract @Inject ProviderFactory getProviders() + + @Inject + ConventionExtension(Project project) { + this.project = project + this.runs = objects.newInstance(Runs, this) + } + + @Override + Project getProject() { + this.project + } + + void manifest(String pkg) { + this.project.tasks.named('jar', Jar).configure { + this.gradleutils.manifestDefaults(it.manifest, pkg) + } + } + void manifest(String pkg, Map info) { + manifest(pkg) + this.project.tasks.named('jar', Jar).configure { + it.manifest.getAttributes().with { + for (var entry : info.entrySet()) + put(entry.key, entry.value) + } + } + } + + // region Maven publishing ============================================================== + void publish() { + publish(pub -> pub.from(project.components.getByName('java'))) + } + void publish(Action config) { + project.with { + publishing.with { + repositories.with { + maven gradleutils.publishingForgeMaven + } + publications.register('mavenJava', MavenPublication) { + changelog.publish(it) + gradleutils.promote(it) + + // The actual artifacts to be published should be configured, so run the config + config.execute(it) + + it.pom.with { + description = project.description + gradleutils.pom.addRemoteDetails(it) + license.with { + gradleutils.pom.licenses.LGPLv2_1 + } + } + } + } + } + } + // endregion + + // region Runs ================================================================ + private TaskProvider genAllData = null + TaskProvider getGenAllData() { + if (genAllData == null) + genAllData = this.project.tasks.register('genAllData') + return genAllData + } + TaskProvider getGenAllData(Action config) { + getGenAllData().configure(config) + return getGenAllData() + } + + void basicRuns() { + this.runs.apply(null, null) + } + + void basicRuns(String mods, File output) { + this.runs.apply(mods, output) + } + void testRuns(String mods, File output) { + this.runs.applyTest(mods, output) + } + // endregion + + // region Forge Version Json =================================================== + private TaskProvider writeForgeVersionJson = null + TaskProvider getForgeVersionJson() { + if (writeForgeVersionJson == null) { + writeForgeVersionJson = this.project.tasks.register('writeForgeVersionJson', WriteForgeVersionJson) + final versions = this.versions + writeForgeVersionJson.configure { + it.forgeVersion.set(versions.forge) + it.minecraftVersion.set(versions.minecraft) + it.mcpVersion.set(versions.mcp) + } + } + return writeForgeVersionJson + } + TaskProvider forgeVersionJson(Action config) { + forgeVersionJson.configure(config) + return forgeVersionJson + } + // endregion + + // region Natives helper ========================================================= + // See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070) + // We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so + // that they can be finalized after configuration. + List nativeVariants(Provider bundle) { + final natives = "natives-" + forgedev.os + final deps = this.project.dependencies + bundle.get().collect { dep -> + (deps.variantOf(providers.provider { (MinimalExternalModuleDependency)dep }) { + it.classifier(natives) + }).get() + } + } + // endregion +} diff --git a/build-logic/src/main/groovy/net/minecraftforge/forge/build/ConventionPlugin.groovy b/build-logic/src/main/groovy/net/minecraftforge/forge/build/ConventionPlugin.groovy new file mode 100644 index 0000000000..9d600cebab --- /dev/null +++ b/build-logic/src/main/groovy/net/minecraftforge/forge/build/ConventionPlugin.groovy @@ -0,0 +1,95 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.forge.build + +import groovy.transform.CompileStatic +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.tasks.compile.JavaCompile +import org.gradle.jvm.toolchain.JavaLanguageVersion + +@CompileStatic +class ConventionPlugin implements Plugin, Meta { + Project project + @Override + Project getProject() { + this.project + } + + @Override + void apply(Project project) { + this.project = project + project.with { + pluginManager.with { + apply 'java-library' + apply 'maven-publish' + apply pluginId('licenser') + apply pluginId('gradleutils') + apply pluginId('gitversion') + apply pluginId('changelog') + apply pluginId('forgedev') + } + + final versions = extensions.create("versions", VersionsExtension, project) + final convention = extensions.create('convention', ConventionExtension, project) + + logger.lifecycle(name + " " + version) + + gradleutils.with { + vendor.set('Forge Development LLC') + version.set(gitversion.version) + } + project.setGroup('net.minecraftforge') + + java.with { + toolchain.languageVersion.set(JavaLanguageVersion.of(versions.java)) + // This is needed for IDE runtime classpath to be correct/not have multiple of the same artifact + consistentResolution { + it.useCompileClasspathVersions() + } + // Forge needs to build its own sources jar due to patching, everything else should use the default + if (project != rootProject) + it.withSourcesJar() + } + + tasks.withType(JavaCompile).configureEach { + it.options.with { + encoding = 'UTF-8' + compilerArgs << '-Xlint:-unchecked' // This is mainly for vanilla code, but just makes it quiet down outside the IDE + } + } + + // NOTE: We are adding dependencies to projects instead of through settings, so we don't have to apply forgedev in settings. + // Applying forgedev in settings will break IDE linting support, which makes it very hard to work with. + // We can reconsider this if/when JetBrains gets their shit together. + // - I doubt they will ever fix their shit 8/28/2006 - Lex + repositories.with { + // Libraries has to be before maven central because Mojang hosts a classifer that central doesn't (org.lwjgl:lwjgl-freetype:3.3.3:natives-macos-patch) + maven { url = 'https://libraries.minecraft.net/' } + mavenCentral() + maven gradleutils.forgeMaven + project.pluginManager.withPlugin('net.minecraftforge.forgedev') { + maven forgedev.mavenizer + } + + mavenLocal() + } + + changelog.with { + from versions.changelogBase + } + + license.with { + header = rootProject.file('LICENSE-header.txt') + } + + // Common dependencies, + project.dependencies.with { + add('compileOnly', libs.findLibrary('jetbrains.annotations').get()) + } + } + } +} diff --git a/build-logic/src/main/groovy/net/minecraftforge/forge/build/Meta.groovy b/build-logic/src/main/groovy/net/minecraftforge/forge/build/Meta.groovy new file mode 100644 index 0000000000..e2100afa7a --- /dev/null +++ b/build-logic/src/main/groovy/net/minecraftforge/forge/build/Meta.groovy @@ -0,0 +1,72 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.forge.build + +import groovy.transform.CompileStatic +import net.minecraftforge.forgedev.ForgeDevExtension +import net.minecraftforge.gitversion.gradle.GitVersionExtension +import net.minecraftforge.gitversion.gradle.changelog.ChangelogExtension +import net.minecraftforge.gradleutils.GradleUtilsExtensionForProject +import net.minecraftforge.licenser.LicenseExtension +import org.gradle.api.Project +import org.gradle.api.artifacts.VersionCatalog +import org.gradle.api.artifacts.VersionCatalogsExtension +import org.gradle.api.plugins.ExtraPropertiesExtension +import org.gradle.api.plugins.JavaPluginExtension +import org.gradle.api.publish.PublishingExtension + +@CompileStatic +interface Meta { + Project getProject(); + + default VersionCatalog getLibs() { + project.extensions.getByType(VersionCatalogsExtension).named("libs") + } + + default ExtraPropertiesExtension getExt() { + project.extensions.getByType(ExtraPropertiesExtension) + } + + default JavaPluginExtension getJava() { + project.extensions.getByType(JavaPluginExtension) + } + + default GradleUtilsExtensionForProject getGradleutils() { + project.extensions.getByType(GradleUtilsExtensionForProject) + } + + default GitVersionExtension getGitversion() { + project.extensions.getByType(GitVersionExtension) + } + + default ForgeDevExtension getForgedev() { + project.extensions.getByType(ForgeDevExtension) + } + + default ChangelogExtension getChangelog() { + project.extensions.getByType(ChangelogExtension) + } + + default LicenseExtension getLicense() { + project.extensions.getByType(LicenseExtension) + } + + default PublishingExtension getPublishing() { + project.extensions.getByType(PublishingExtension) + } + + default VersionsExtension getVersions() { + project.extensions.getByType(VersionsExtension) + } + + default ConventionExtension getConvention() { + project.extensions.getByType(ConventionExtension) + } + + default String pluginId(String alias) { + getLibs().findPlugin(alias).orElseThrow { new IllegalStateException("Could not find plugin " + alias) }.get().pluginId + } +} diff --git a/build-logic/src/main/groovy/net/minecraftforge/forge/build/Runs.groovy b/build-logic/src/main/groovy/net/minecraftforge/forge/build/Runs.groovy new file mode 100644 index 0000000000..f7c873a138 --- /dev/null +++ b/build-logic/src/main/groovy/net/minecraftforge/forge/build/Runs.groovy @@ -0,0 +1,163 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.forge.build + +import groovy.transform.CompileStatic +import org.gradle.api.Project +import org.gradle.api.tasks.SourceSet +import org.jspecify.annotations.Nullable + +import javax.inject.Inject + +@CompileStatic +class Runs implements Meta { + private final ConventionExtension ext + private boolean hasDependency = false + + @Inject + Runs(ConventionExtension ext) { + this.ext = ext + } + + @Override + Project getProject() { + this.ext.project + } + + void apply(@Nullable String mods, @Nullable File output) { + final project = this.project + final genAllData = this.ext.genAllData + + project.with { + if (!hasDependency && project != project.rootProject) { + dependencies.with { + add('implementation', it.project(':')) // Root project is forge itself + } + hasDependency = true + } + final SourceSet sourceSet = getJava().getSourceSets().named("main").get() + + forgedev.runs.with { + final File existing = sourceSet.getResources().getSrcDirs()[0] + + configureEach { + it.with { + cache.set(project.layout.projectDirectory.dir('runs/cache')) + eclipsePrefix = project.name + + // If we're not forge, we need to get the metadata from the forge project + if (project != project.rootProject) + metadata = project.files(getForgedev().consumeFile('metadata', project.rootProject)) + + var runName = it.name.toLowerCase(Locale.ENGLISH) + + if (runName.contains('client') || runName.contains('data')) { + options.with { + args '--assetsDir', '{assets_root}', '--assetIndex', '{asset_index}' + systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll' + } + } + + if (runName.contains('data')) { + options.with(sourceSet).with { + if (mods != null) args('--mod', mods) + if (output != null) args('--output', output) + } + } + + options.with { + getWorkingDir().set(project.layout.projectDirectory.dir("runs/$name")) + getMainClass().set('net.minecraftforge.bootstrap.ForgeBootstrap') + args '--gameDir', '.' + jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32' + + systemProperty 'bsl.debug', 'true' + systemProperty 'terminal.jline', 'true' + systemProperty 'forge.enableGameTest', 'true' + systemProperty 'eventbus.api.strictRuntimeChecks', 'true' + } + } + } + + maybeCreate('client').with { + options.with { + args '--launchTarget', 'forge_dev_client', + '--username', 'Dev', + '--version', project.name, + '--accessToken', '0', + '--userType', 'mojang', + '--versionType', 'release' + } + } + + maybeCreate('server').with { + options.with { + args '--launchTarget', 'forge_dev_server' + } + } + + maybeCreate('gameTestServer').with { + options.with { + args '--launchTarget', 'forge_dev_server_gametest', + '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs + } + } + + maybeCreate('data').with { + options.with { + args '--launchTarget', 'forge_dev_data', + '--all', + '--existing', existing + } + } + + maybeCreate('clientData').with { + options.with { + args '--launchTarget', 'forge_dev_client_data', + '--all', + '--existing', existing + } + } + } + genAllData.configure { + it.dependsOn forgedev.runs.getByName('data').with(sourceSet).run, forgedev.runs.getByName('clientData').with(sourceSet).run + } + } + } + + + void applyTest(@Nullable String mods, @Nullable File output) { + final project = this.project + final genAllData = this.ext.genAllData + + project.with { + final SourceSet sourceSet = getJava().getSourceSets().named("test").get() + forgedev.runs.with { + final File existing = sourceSet.getResources().getSrcDirs()[0] + + configureEach { + it.with { + var runName = it.name.toLowerCase(Locale.ENGLISH) + options.with(sourceSet).with { + systemProperty 'forgedev.enableTestMods', 'true' + } + + if (runName.contains('data')) { + options.with(sourceSet).with { + if (mods != null) args('--mod', mods) + if (output != null) args('--output', output) + args('--existing', existing) + } + } + } + } + } + genAllData.configure { + it.dependsOn forgedev.runs.getByName('data').with(sourceSet).run, forgedev.runs.getByName('clientData').with(sourceSet).run + } + } + } +} diff --git a/build-logic/src/main/groovy/net/minecraftforge/forge/build/VersionsExtension.java b/build-logic/src/main/groovy/net/minecraftforge/forge/build/VersionsExtension.java new file mode 100644 index 0000000000..e8437511f7 --- /dev/null +++ b/build-logic/src/main/groovy/net/minecraftforge/forge/build/VersionsExtension.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.forge.build; + +import net.minecraftforge.gitversion.gradle.GitVersionExtension; +import org.gradle.api.Project; +import org.gradle.api.artifacts.VersionCatalog; +import org.gradle.api.artifacts.VersionCatalogsExtension; + +import javax.inject.Inject; + +public abstract class VersionsExtension { + private final VersionCatalog libs; + + public final String java, minecraft, forge, forgeSpec, minecraftNext, mcp, changelogBase; + + @Inject + public VersionsExtension(Project project) { + final var extensions = project.getExtensions(); + final var gitversion = extensions.getByType(GitVersionExtension.class); + libs = extensions.getByType(VersionCatalogsExtension.class).named("bootLibs"); + java = get("java"); + minecraft = get("minecraft"); + minecraftNext = get("minecraft.next"); + mcp = get("mcp"); + changelogBase = get("changelog.base"); + forge = gitversion.of(project.getRootProject()).getVersion(); + forgeSpec = forge.split("\\.")[0]; + project.setVersion(minecraft + '-' + gitversion.getVersion()); + } + + private String get(String name) { + var ver = this.libs.findVersion(name); + if (ver.isEmpty()) + throw new IllegalStateException("No version found for " + name); + return ver.get().toString(); + } +} diff --git a/build-logic/src/main/groovy/net/minecraftforge/forge/build/WriteForgeVersionJson.groovy b/build-logic/src/main/groovy/net/minecraftforge/forge/build/WriteForgeVersionJson.groovy new file mode 100644 index 0000000000..84d1a4bdc3 --- /dev/null +++ b/build-logic/src/main/groovy/net/minecraftforge/forge/build/WriteForgeVersionJson.groovy @@ -0,0 +1,42 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.forge.build + +import groovy.json.JsonBuilder +import groovy.transform.CompileDynamic +import groovy.transform.CompileStatic +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction + +import javax.inject.Inject + +@CompileStatic +abstract class WriteForgeVersionJson extends DefaultTask { + abstract @Input Property getForgeVersion() + abstract @Input Property getMinecraftVersion() + abstract @Input Property getMcpVersion() + + abstract @OutputFile RegularFileProperty getOutputFile() + + @Inject + WriteForgeVersionJson() {} + + @TaskAction + @CompileDynamic + void exec() { + var json = new JsonBuilder() + json { + forge this.forgeVersion.get() + mc this.minecraftVersion.get() + mcp this.mcpVersion.get() + } + this.outputFile.asFile.get().text = json.toPrettyString() + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 762fc532af..2cdd674095 100644 --- a/build.gradle +++ b/build.gradle @@ -1,37 +1,20 @@ import org.apache.tools.ant.filters.ReplaceTokens plugins { - id 'java-library' - id 'idea' id 'eclipse' - id 'maven-publish' - alias libs.plugins.licenser alias libs.plugins.versions - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog alias libs.plugins.jarsigner - id 'net.minecraftforge.forgedev' + alias libs.plugins.forgedev id 'net.minecraftforge.forge.build.convention' } gradleutils.displayName = 'Forge' -group = 'net.minecraftforge' description = 'Modifications to Minecraft to enable mod developers.' -// NOTE: See settings.gradle for all the referenceable version variables. -// All subprojects (that apply 'net.minecraftforge.forge.build.convention') will have these available. -println "Version: $version" - -java.toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - jarSigner.autoDetect('forge') // We have to tell ForgeDev to use the exact versions of tools we ship in the installer fdtools { - configure('mavenizer') { - version = '0.5.22' - } configure('binpatcher') { version = buildLibs.binarypatcher.get().version } @@ -47,18 +30,19 @@ fdtools { forgedev.validatePublish { task { baseBranch = 'upstream/26.1.2' - versionPrefix = minecraftVersion + versionPrefix = versions.minecraft } } */ -final minecraftFiles = forgedev.minecraftFiles(minecraftVersion) +final minecraftFiles = forgedev.minecraftFiles(versions.minecraft) final mcpBase = forgedev.mcpBase { - mcpVersion = "${minecraftVersion}-${project.ext.mcpVersion}" + mcpVersion = "${versions.minecraft}-${versions.mcp}" accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg') sideAnnotationStrippers.from file('src/main/resources/forge.sas') } +forgedev.provideFile('metadata', mcpBase.metadata) forgedev.patches { base = mcpBase @@ -81,8 +65,6 @@ sourceSets { } license { - header = file('LICENSE-header.txt') - include 'net/minecraftforge/' exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java' @@ -98,7 +80,6 @@ license { } changelog { - from changelogBase publishAll = false } @@ -120,10 +101,7 @@ configurations { named('api') { extendsFrom(installer) - } - - named('implementation') { - // Inherit vanilla Minecraft's dependencies + // Inherit vanilla Minecraft's dependencies, and let downstream access them extendsFrom(mcpBase.dependencyConfiguration) } } @@ -174,110 +152,13 @@ dependencies { annotationProcessor libs.eventbus.validator } +convention.basicRuns('forge', file('src/main/generated/')) +convention.testRuns('.+', file('src/test/generated/')) + final EXTRA_TXTS = [ - file('LICENSE.txt'), - changelog.task.flatMap(task -> task.outputFile) + file('LICENSE.txt'), + changelog.task.flatMap(task -> task.outputFile) ] -forgedev.runs { - configureEach { - options { - workingDir = layout.projectDirectory.dir("runs/$name") - - mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap' - args '--gameDir', '.' - jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32' - - systemProperty 'bsl.debug', 'true' - systemProperty 'terminal.jline', 'true' - } - } - create('client') { - options { - systemProperty 'eventbus.api.strictRuntimeChecks', 'true' - systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll' - - args '--launchTarget', 'forge_dev_client', - '--username', 'Dev', - '--version', project.name, - '--accessToken', '0', - '--userType', 'mojang', - '--versionType', 'release', - '--assetsDir', '{assets_root}', - '--assetIndex', '{asset_index}' - - with(sourceSets.test) { - systemProperty 'forge.enableGameTest', 'true' - systemProperty 'forgedev.enableTestMods', 'true' - } - } - } - - create('server') { - options { - args '--launchTarget', 'forge_dev_server' - } - } - - create('gameTestServer') { - options { - systemProperty 'forge.enableGameTest', 'true' - args '--launchTarget', 'forge_dev_server_gametest' - args '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs - - with(sourceSets.test) { - systemProperty 'forgedev.enableTestMods', 'true' - } - } - } - - create('data') { - options { - args '--launchTarget', 'forge_dev_data', - '--all', - '--existing', sourceSets.main.resources.srcDirs[0], - '--assetsDir', '{assets_root}', - '--assetIndex', '{asset_index}' - - with(sourceSets.main) { - args '--mod', 'forge', - '--output', rootProject.file('src/main/generated/') - } - - with(sourceSets.test) { - systemProperty 'forge.enableGameTest', 'true' - systemProperty 'forgedev.enableTestMods', 'true' - args '--mod', '.+', - '--existing', sourceSets.test.resources.srcDirs[0], - '--output', rootProject.file('src/test/generated/') - } - } - } - - create('clientData') { - options { - args '--launchTarget', 'forge_dev_client_data', - '--all', - '--existing', sourceSets.main.resources.srcDirs[0], - '--assetsDir', '{assets_root}', - '--assetIndex', '{asset_index}' - - with(sourceSets.main) { - args '--mod', 'forge', - '--output', rootProject.file('src/main/generated/') - } - - with(sourceSets.test) { - systemProperty 'forgedev.enableTestMods', 'true' - args '--mod', '.+', - '--existing', sourceSets.test.resources.srcDirs[0], - '--output', rootProject.file('src/test/generated/') - } - } - } -} -tasks.register('genAllData') { - dependsOn forgedev.runs.data.run, forgedev.runs.data.runTest, forgedev.runs.clientData.run, forgedev.runs.clientData.runTest -} final serverShim = forgedev.shim { config { @@ -304,7 +185,7 @@ final finalizeSpawn = forgedev.methodCallFinder('findFinalizeSpawnTargets') { } forgedev.validateDeprecations(tasks.named('jar', Jar)) { - mcVersion = minecraftVersion + mcVersion = versions.minecraft } forgedev.checks() { @@ -343,24 +224,15 @@ tasks.named('jar', Jar) { manifest { attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.forge' + 'Automatic-Module-Name': 'net.minecraftforge.forge' + ]) + gradleutils.manifestDefaults(it, 'net/minecraftforge/versions/forge/') + gradleutils.manifestDefaults(it, 'net/minecraftforge/versions/mcp/', [ + 'Specification-Title' : 'Minecraft', + 'Specification-Version' : versions.minecraft, + 'Implementation-Title' : 'MCP', + 'Implementation-Version': versions.mcp ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : gradleutils.vendor.get(), - 'Specification-Version' : gitversion.info.tag, - 'Implementation-Title' : project.group, - 'Implementation-Vendor' : gradleutils.vendor.get(), - 'Implementation-Version': forgeVersion - ], 'net/minecraftforge/versions/forge/') - attributes([ - 'Specification-Title' : 'Minecraft', - 'Specification-Vendor' : gradleutils.vendor.get(), - 'Specification-Version' : minecraftVersion, - 'Implementation-Title' : 'MCP', - 'Implementation-Vendor' : gradleutils.vendor.get(), - 'Implementation-Version': mcpVersion - ], 'net/minecraftforge/versions/mcp/') } jarSigner.sign(it) } @@ -452,7 +324,7 @@ forgedev.userDev { } } -forgedev.userdevCompatibility(minecraftVersion) { +forgedev.userdevCompatibility(versions.minecraft) { clean = mcpBase.classes dirty = tasks.named('jar', Jar) } @@ -490,7 +362,7 @@ forgedev.installer { launcherLibraries configurations.installer - final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}" + final launcherId = "${versions.minecraft}-${project.name}-${versions.forge}" final installertools = tool(buildLibs.installertools) final binarypatcher = tool(buildLibs.binarypatcher) @@ -533,12 +405,12 @@ forgedev.installer { json { icon = rootProject.file('icon.ico') executable serverShim.jar - minecraft = minecraftVersion + minecraft = versions.minecraft profileVersion = launcherId final projectArtifact = "${project.group}:${project.name}:${project.version}" - data 'MC_UNPACKED', "[net.minecraft:client:${minecraftVersion}]", "[net.minecraft:server:${minecraftVersion}:unpacked]" + data 'MC_UNPACKED', "[net.minecraft:client:${versions.minecraft}]", "[net.minecraft:server:${versions.minecraft}:unpacked]" data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted data 'BINPATCH', '/data/client.lzma', '/data/server.lzma' @@ -599,7 +471,7 @@ forgedev.installer { librariesLast = false // Makes libraries be added before args id = launcherId - inheritsFrom = minecraftVersion + inheritsFrom = versions.minecraft mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap' gameArgs = [ '--launchTarget', 'forge_client' ] jvmArgs = [ '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32' ] @@ -633,12 +505,12 @@ final mdkZip = tasks.register('mdkZip', Zip) { exclude it } filter(ReplaceTokens, tokens: [ - FORGE_VERSION: forgeVersion, + FORGE_VERSION: versions.forge, FORGE_GROUP: project.group, FORGE_NAME: project.name, - MC_VERSION: minecraftVersion, - FORGE_SPEC_VERSION: gitversion.info.tag.split("\\.")[0], - MC_NEXT_VERSION: minecraftNextVersion, + MC_VERSION: versions.minecraft, + FORGE_SPEC_VERSION: versions.forgeSpec, + MC_NEXT_VERSION: versions.minecraftNext, EVENTBUS_VERSION: libs.versions.eventbus.get() ]) rename 'gitignore\\.txt', '.gitignore' @@ -717,8 +589,8 @@ tasks.named('javadoc', Javadoc) { bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1." windowTitle = "Minecraft Forge API ${version}" - docTitle = "Minecraft Forge API - ${forgeVersion} for Minecraft ${minecraftVersion}" - header = "
${forgeVersion} for Minecraft ${minecraftVersion}
" + docTitle = "Minecraft Forge API - ${versions.forge} for Minecraft ${versions.minecraft}" + header = "
${versions.forge} for Minecraft ${versions.minecraft}
" } doLast { @@ -731,51 +603,31 @@ tasks.named('javadoc', Javadoc) { } */ -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - artifact universalJar - artifact forgedev.installer.jar - artifact mdkZip - artifact forgedev.userDev.jar - artifact sourcesJar - artifact serverShim.jar - - pom { - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } +convention.publish { + artifact universalJar + artifact forgedev.installer.jar + artifact mdkZip + artifact forgedev.userDev.jar + artifact sourcesJar + artifact serverShim.jar } - /* // These are debugging tasks that are only used when developing ForgeDevPlugin, to bulk test task's config/caching // region ForgeDev Tests def all = tasks.register('all') {} afterEvaluate { if (gradle.startParameter.taskNames.contains('all')) { - tasks.forEach { task -> // This forces everything to be realized, which is why we have the startParameter check - if (!gradle.startParameter.isTaskGraph() && task.name.startsWith('run')) return + tasks.forEach { task -> // This forces everything to be realized, which is why we have the startParameter check + if (!gradle.startParameter.isTaskGraph() && task.name.startsWith('run')) return if (task.name in [all.name, 'dependencyInsight', 'dependencies', 'dependencyUpdates', 'init', 'buildEnvironment', 'idea', 'eclipse', 'javaToolchains', 'outgoingVariants', 'projects', 'properties', 'resolvableConfigurations', 'tasks', 'updateDaemonJvm', 'generateActionsWorkflow' ]) return if (task.name.startsWith('clean')) return if (task.name == 'checkJarCompatibility') return // This doesn't work in FG6 dev, I think it's cuz we check vs srg names. Will need to look at later - all.configure { dependsOn(task) } - } + all.configure { dependsOn(task) } + } } } */ @@ -789,8 +641,7 @@ tasks.withType(AbstractTestTask).configureEach { [ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar', 'sourcesJarAll' ] .each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }} forgedev.runs.configureEach { - run.configure { dependsOn finalizeSpawn} - runTest.configure { dependsOn finalizeSpawn} + run.configure { dependsOn finalizeSpawn } } // run gradlew dependencyUpdates --no-parallel //noinspection UnnecessaryQualifiedReference diff --git a/fmlcore/build.gradle b/fmlcore/build.gradle index d6adcbbea8..a55c7c1be1 100644 --- a/fmlcore/build.gradle +++ b/fmlcore/build.gradle @@ -1,78 +1,20 @@ plugins { - id 'java-library' - id 'maven-publish' - alias libs.plugins.licenser - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog id 'net.minecraftforge.forge.build.convention' } gradleutils.displayName = 'FML' -final vendor = 'Forge Development LLC' -description = 'Modifications to Minecraft to enable mod developers.' +description = 'Core library used for Forge ModLoader.' dependencies { - compileOnly libs.jetbrains.annotations - api libs.eventbus implementation projects.fmlloader implementation libs.commons.io } -java { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - withSourcesJar() -} +convention.manifest('net/minecraftforge/fml/', [ + 'Automatic-Module-Name': 'net.minecraftforge.fmlcore', + 'FMLModType' : 'LIBRARY' +]) -license { - header = rootProject.file('LICENSE-header.txt') -} -changelog { - from changelogBase -} - -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << '-Xlint:-unchecked' -} - -tasks.named('jar', Jar) { - manifest { - attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.fmlcore', - 'FMLModType' : 'LIBRARY' - ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : vendor, - 'Specification-Version' : '1', - 'Implementation-Title' : gradleutils.displayName.get(), - 'Implementation-Version': '1.0', - 'Implementation-Vendor' : vendor - ], 'net/minecraftforge/fml/') - } -} - -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - from components.java - - pom { - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } -} +convention.publish() diff --git a/fmlearlydisplay/build.gradle b/fmlearlydisplay/build.gradle index a682731335..802115ea73 100644 --- a/fmlearlydisplay/build.gradle +++ b/fmlearlydisplay/build.gradle @@ -1,49 +1,14 @@ import org.gradle.api.plugins.jvm.JvmTestSuite -import org.gradle.internal.os.OperatingSystem plugins { - id 'java-library' id 'jvm-test-suite' - id 'maven-publish' - alias libs.plugins.licenser - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog id 'net.minecraftforge.forge.build.convention' } -switch (OperatingSystem.current()) { - case OperatingSystem.LINUX: - project.ext.lwjglNatives = "natives-linux" - break - case OperatingSystem.MAC_OS: - project.ext.lwjglNatives = "natives-macos" - break - case OperatingSystem.WINDOWS: - project.ext.lwjglNatives = "natives-windows" - break -} - gradleutils.displayName = 'FML Early Display' -final vendor = 'Forge Development LLC' description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.' -java { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - withSourcesJar() -} - -license { - header = rootProject.file('LICENSE-header.txt') -} - -changelog { - from changelogBase -} - dependencies { - compileOnly libs.jetbrains.annotations - implementation projects.fmlloader implementation projects.fmlcore implementation libs.bundles.lwjgl @@ -51,67 +16,19 @@ dependencies { implementation libs.jopt.simple } -// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070) -// We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so that they can be finalized after configuration. -var lwjglTestLibs = [ - dependencies.variantOf(earlyDisplayTestLibs.lwjgl) { classifier lwjglNatives }, - dependencies.variantOf(earlyDisplayTestLibs.lwjgl.opengl) { classifier lwjglNatives }, - dependencies.variantOf(earlyDisplayTestLibs.lwjgl.stb) { classifier lwjglNatives }, - dependencies.variantOf(earlyDisplayTestLibs.lwjgl.sdl) { classifier lwjglNatives } -].with { list -> - provider { list.collect { it.get() } } -} - testing.suites.named('test', JvmTestSuite) { useJUnitJupiter('5.8.2') dependencies { implementation earlyDisplayTestLibs.powermock.core runtimeOnly earlyDisplayLibs.slf4j.jdk14 - runtimeOnly.bundle lwjglTestLibs + runtimeOnly.bundle convention.nativeVariants(earlyDisplayTestLibs.bundles.lwjgl) } } -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << '-Xlint:unchecked' -} +convention.manifest('net/minecraftforge/fml/earlydisplay/', [ + 'Automatic-Module-Name': 'net.minecraftforge.earlydisplay', + 'Forge-Module-Layer' : 'boot' +]) -tasks.named('jar', Jar) { - manifest { - attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.earlydisplay', - 'Forge-Module-Layer' : 'boot' - ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : vendor, - 'Specification-Version' : '1', - 'Implementation-Title' : gradleutils.displayName.get(), - 'Implementation-Vendor' : vendor, - 'Implementation-Version': '1.0' - ], 'net/minecraftforge/fml/earlydisplay/') - } -} - -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - from components.java - - pom { - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } -} \ No newline at end of file +convention.publish() \ No newline at end of file diff --git a/fmlloader/build.gradle b/fmlloader/build.gradle index 21a9112b80..1c17837a2b 100644 --- a/fmlloader/build.gradle +++ b/fmlloader/build.gradle @@ -1,44 +1,17 @@ -import groovy.transform.CompileDynamic -import groovy.transform.CompileStatic -import groovy.transform.PackageScope import net.minecraftforge.forgedev.legacy.tasks.JarJarMetadataOptions import org.gradle.api.plugins.jvm.JvmTestSuite -import javax.inject.Inject - plugins { - id 'java-library' id 'jvm-test-suite' - id 'maven-publish' - alias libs.plugins.licenser - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog - alias libs.plugins.apt id 'net.minecraftforge.forge.build.convention' + alias libs.plugins.apt } gradleutils.displayName = 'FMLLoader' -final vendor = 'Forge Development LLC' -description = 'Modifications to Minecraft to enable mod developers.' - -java { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - withSourcesJar() -} - -license { - header = rootProject.file('LICENSE-header.txt') -} - -changelog { - from changelogBase -} +description = 'Mod Locator and manager for Minecraft Forge.' dependencies { - compileOnly libs.jetbrains.annotations - - // TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the isntaller + // TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the installer api(libs.bundles.asm ){ transitive = false } // Needed by all the black magic api(libs.forgespi ){ transitive = false } api(libs.mergetool.api ){ transitive = false } @@ -73,86 +46,19 @@ testing.suites.named('test', JvmTestSuite) { } } -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << '-Xlint:unchecked' -} +convention.manifest('net/minecraftforge/fml/loading/', [ + 'Automatic-Module-Name': 'net.minecraftforge.fmlloader', + 'Forge-Module-Layer' : 'boot' +]) -tasks.named('jar', Jar) { - manifest { - attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.fmlloader', - 'Forge-Module-Layer' : 'boot' - ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : vendor, - 'Specification-Version' : '1', - 'Implementation-Title' : gradleutils.displayName.get(), - 'Implementation-Vendor' : vendor, - 'Implementation-Version': forgeVersion - ], 'net/minecraftforge/fml/loading/') - } -} - -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - from components.java - - pom { - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } -} - -// A simple task to write JSON to a file. Using Task#doLast to output files is no longer supported. -// This code may seem verbose, but it's better this way. If more projects need this, we can move it to buildSrc. -@CompileStatic -@PackageScope abstract class WriteForgeVersionJson extends DefaultTask { - abstract @Input Property getForgeVersion() - abstract @Input Property getMinecraftVersion() - abstract @Input Property getMcpVersion() - - abstract @OutputFile RegularFileProperty getOutputFile() - - @Inject - WriteForgeVersionJson() {} - - @TaskAction - @CompileDynamic - void exec() { - var json = new groovy.json.JsonBuilder() - json { - forge this.forgeVersion.get() - mc this.minecraftVersion.get() - mcp this.mcpVersion.get() - } - this.outputFile.asFile.get().text = json.toPrettyString() - } -} - -tasks.register('writeForgeVersionJson', WriteForgeVersionJson) { - forgeVersion = project.forgeVersion - minecraftVersion = project.minecraftVersion - mcpVersion = project.mcpVersion +convention.publish() +final forgeJson = convention.forgeVersionJson { outputFile = file('src/main/resources/forge_version.json') } -tasks.register('jarJarOptionsJson', JarJarMetadataOptions) { - metadataFile = project.file('src/main/resources/jarjar_options.json') +final jarJarJson = tasks.register('jarJarOptionsJson', JarJarMetadataOptions) { + metadataFile = file('src/main/resources/jarjar_options.json') // This is resolved too early by cpw.mods.modlauncher.TransformationServicesHandler.discoverServices(DiscoveryData) But eventually... //add(libs.mixin, 'org/spongepowered/asm/mixin/Mixin.class') add(libs.mixinextras.forge) { @@ -168,11 +74,11 @@ tasks.register('jarJarOptionsJson', JarJarMetadataOptions) { tasks.named('generateResources') { dependsOn( - tasks.named('eclipseJdt'), - tasks.named('eclipseJdtApt'), - tasks.named('eclipseFactorypath'), - tasks.named('writeForgeVersionJson', WriteForgeVersionJson), - tasks.named('jarJarOptionsJson') + tasks.named('eclipseJdt'), + tasks.named('eclipseJdtApt'), + tasks.named('eclipseFactorypath'), + forgeJson, + jarJarJson ) } diff --git a/forge-transformers/build.gradle b/forge-transformers/build.gradle index 145d9ed3e9..60ba0f8f0d 100644 --- a/forge-transformers/build.gradle +++ b/forge-transformers/build.gradle @@ -1,78 +1,21 @@ plugins { - id 'java-library' - id 'maven-publish' - alias libs.plugins.licenser - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog id 'net.minecraftforge.forge.build.convention' } gradleutils.displayName = 'Forge Transformers' -final vendor = 'Forge Development LLC' description = 'Forge-specific transformers unrelated to the FML project.' -java { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - withSourcesJar() -} - -license { - header = rootProject.file('LICENSE-header.txt') -} - -changelog { - from changelogBase -} - dependencies { - compileOnly(libs.jetbrains.annotations) - implementation(libs.bundles.asm ){ transitive = false } // Needed by all the black magic implementation(libs.log4j.api ){ transitive = false } implementation(libs.gson ){ transitive = false } implementation(libs.modlauncher ){ transitive = false } implementation(libs.coremods.api){ transitive = false } - - testCompileOnly(libs.jetbrains.annotations) } -tasks.named('jar', Jar) { - manifest { - attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.forge.transformers', - 'Forge-Module-Layer' : 'boot' - ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : vendor, - 'Specification-Version' : '1', - 'Implementation-Title' : gradleutils.displayName.get(), - 'Implementation-Vendor' : vendor, - 'Implementation-Version': forgeVersion - ], 'net/minecraftforge/forge/transformers/') - } -} +convention.manifest('net/minecraftforge/forge/transformers/', [ + 'Automatic-Module-Name': 'net.minecraftforge.forge.transformers', + 'Forge-Module-Layer' : 'boot' +]) -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - from components.java - - pom { pom -> - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } -} +convention.publish() diff --git a/gradle/buildLibs.versions.toml b/gradle/buildLibs.versions.toml new file mode 100644 index 0000000000..95b5bfaf81 --- /dev/null +++ b/gradle/buildLibs.versions.toml @@ -0,0 +1,7 @@ +# Libraries used solely during the build and publish process. + +[libraries] +binarypatcher = { module = "net.minecraftforge:binarypatcher", version = "1.3.4" } +installer = { module = "net.minecraftforge:installer", version = "2.2.+" } +installertools = { module = "net.minecraftforge:installertools", version = "1.4.6" } +srg2source = { module = "net.minecraftforge:Srg2Source", version = "8.2.0" } diff --git a/gradle/earlyDisplayLibs.versions.toml b/gradle/earlyDisplayLibs.versions.toml new file mode 100644 index 0000000000..76f99dd735 --- /dev/null +++ b/gradle/earlyDisplayLibs.versions.toml @@ -0,0 +1,6 @@ +[versions] +slf4j = "2.0.17" + +[libraries] +slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } +slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" } diff --git a/gradle/earlyDisplayTestLibs.versions.toml b/gradle/earlyDisplayTestLibs.versions.toml new file mode 100644 index 0000000000..682b386d96 --- /dev/null +++ b/gradle/earlyDisplayTestLibs.versions.toml @@ -0,0 +1,9 @@ +[libraries] +powermock-core = { module = "org.powermock:powermock-core", version = "2.0.9" } +lwjgl = { module = "org.lwjgl:lwjgl" } +lwjgl-sdl = { module = "org.lwjgl:lwjgl-sdl" } +lwjgl-opengl = { module = "org.lwjgl:lwjgl-opengl" } +lwjgl-stb = { module = "org.lwjgl:lwjgl-stb" } + +[bundles] +lwjgl = ["lwjgl", "lwjgl-sdl", "lwjgl-opengl", "lwjgl-stb"] diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..9835a69761 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,124 @@ +# Libraries used by Forge and its subprojects. +# Most of these are from Minecraft itself. We should really export those as BOM from Mavenizer + +[plugins] +forgedev = { id = "net.minecraftforge.forgedev", version = "7.0.0-beta.56" } +licenser = { id = "net.minecraftforge.licenser", version = "1.2.0" } +versions = { id = "com.github.ben-manes.versions", version = "0.54.0" } +gradleutils = { id = "net.minecraftforge.gradleutils", version = "3.4.9" } +gitversion = { id = "net.minecraftforge.gitversion", version = "4.0.0" } +changelog = { id = "net.minecraftforge.changelog", version = "3.2.2" } +download = { id = "de.undercouch.download", version = "5.6.0" } +jarsigner = { id = "net.minecraftforge.gradlejarsigner", version = "1.2.1" } +apt = { id = "com.diffplug.eclipse.apt", version = "4.4.1" } + + +[versions] +eventbus = "7.0.6" +mixinextras = "0.5.4" +bootstrap = "2.1.8" +asm = "9.10.1" +jline = "3.25.1" +night-config = "3.7.4" +jarjar = "0.4.2" +log4j = "2.26.0" +lwjgl = "3.4.3" + +[libraries] +# TODO [Forge][Buildscript We should not be needing to manually add transitive dependencies +# If we need to make strict versions for dependencies, we should do so using dependency constraints +forgespi = { module = "net.minecraftforge:forgespi", version = "8.0.0" } # Needs modlauncher +modlauncher = { module = "net.minecraftforge:modlauncher", version = "10.2.6" } # Needs securemodules +securemodules = { module = "net.minecraftforge:securemodules", version = "2.2.24" } # // Needs unsafe +unsafe = { module = "net.minecraftforge:unsafe", version = "0.9.2" } +accesstransformers = { module = "net.minecraftforge:accesstransformers", version = "8.2.17" } +coremods-api = { module = "net.minecraftforge:coremods-api", version = "5.3.1" } +mergetool-api = { module = "net.minecraftforge:mergetool-api", version = "1.0" } +maven-artifact = { module = "org.apache.maven:maven-artifact", version = "3.8.8" } # Used for version comparison + +slf4j-api = { module = "org.slf4j:slf4j-api", version = "2.0.17" } + +# Annotations +jetbrains-annotations = { module = "org.jetbrains:annotations", version = "24.0.1" } # ApiStatus annotations +jspecify = { module = "org.jspecify:jspecify", version = "1.0.1" } # Nullability annotations + +# Eventbus +eventbus = { module = "net.minecraftforge:eventbus", version.ref = "eventbus" } +eventbus-validator = { module = "net.minecraftforge:eventbus-validator", version.ref = "eventbus" } + +# Bootstrap - Converting the process from normal loader into JPMS land +bootstrap = { module = "net.minecraftforge:bootstrap", version.ref = "bootstrap" } +bootstrap-api = { module = "net.minecraftforge:bootstrap-api", version.ref = "bootstrap" } +bootstrap-dev = { module = "net.minecraftforge:bootstrap-dev", version.ref = "bootstrap" } +bootstrap-shim = { module = "net.minecraftforge:bootstrap-shim", version.ref = "bootstrap" } + +# ReadOnlyInMemoryFileSystem - Used for JarInJar extraction at runtime +roimfs = { module = "net.minecraftforge:roimfs", version = "1.0.0" } +# Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things. +# ROIMFS is faster if you need read only +jimfs = { module = "com.google.jimfs:jimfs", version = "1.3.0" } + +# Mixin +mixin = { module = "org.spongepowered:mixin", version = "0.8.7" } +mixinextras-forge = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixinextras" } +mixinextras-common = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinextras" } + +# ASM it's used for so many of our hacks +asm = { module = "org.ow2.asm:asm", version.ref = "asm" } +asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" } +asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" } +asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" } +asm-analysis = { module = "org.ow2.asm:asm-analysis", version.ref = "asm" } + +# Terminal Console Appender. essentially make pretty colors in the console, but it's been a PITA +terminalconsoleappender = { module = "net.minecrell:terminalconsoleappender", version = "1.2.0" } +jline-reader = { module = "org.jline:jline-reader", version.ref = "jline" } +jline-terminal = { module = "org.jline:jline-terminal", version.ref = "jline" } +jline-terminal-jna = { module = "org.jline:jline-terminal-jna", version.ref = "jline" } + +# The core of our configuration system, it has many flaws, but it works for the most part +night-config-toml = { module = "com.electronwill.night-config:toml", version.ref = "night-config" } +night-config-core = { module = "com.electronwill.night-config:core", version.ref = "night-config" } + +# Jar In Jar FileSystem +jarjar-fs = { module = "net.minecraftforge:JarJarFileSystems", version.ref = "jarjar" } +jarjar-meta = { module = "net.minecraftforge:JarJarMetadata", version.ref = "jarjar" } +jarjar-selector = { module = "net.minecraftforge:JarJarSelector", version.ref = "jarjar" } + +# These are libraries shipped by the MC launcher, try and keep them in sync with the manifest +# but honestly if we don't it just means we ship them as normal libraries by adding them to the installer config in the forge project +gson = { module = "com.google.code.gson:gson", version = "2.14.0" } +guava = { module = "com.google.guava:guava", version = "33.6.0-jre" } +failureaccess = { module = "com.google.guava:failureaccess", version = "1.0.3" } +apache-commons = { module = "org.apache.commons:commons-lang3", version = "3.20.0" } +mojang-logging = { module = "com.mojang:logging", version = "1.7.12" } +jopt-simple = { module = "net.sf.jopt-simple:jopt-simple", version = "5.0.4" } +commons-io = { module = "commons-io:commons-io", version = "2.20.0" } + + +log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" } +log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } + +lwjgl = { module = "org.lwjgl:lwjgl", version.ref = "lwjgl" } +lwjgl-sdl = { module = "org.lwjgl:lwjgl-sdl", version.ref = "lwjgl" } +lwjgl-opengl = { module = "org.lwjgl:lwjgl-opengl", version.ref = "lwjgl" } +lwjgl-stb = { module = "org.lwjgl:lwjgl-stb", version.ref = "lwjgl" } +lwjgl-tinyfd = { module = "org.lwjgl:lwjgl-tinyfd", version.ref = "lwjgl" } + +[bundles] +# Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things. +jimfs = ["guava", "failureaccess"] + +# ASM it's used for so many of our hacks +asm = ["asm", "asm-tree", "asm-util", "asm-commons", "asm-analysis"] + +# Pretty colors in the server console +terminalconsoleappender = ["terminalconsoleappender", "jline-reader", "jline-terminal", "jline-terminal-jna"] + +# Utility for reading and writing the TOML file format +night-config = ["night-config-toml", "night-config-core"] + +# Bundeling dependencies in a single archive +jarjar = ["jarjar-fs", "jarjar-selector", "jarjar-meta"] +log4j = ["log4j-api", "log4j-core"] +lwjgl = ["lwjgl", "lwjgl-sdl", "lwjgl-opengl", "lwjgl-stb", "lwjgl-tinyfd"] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a659d..eddabd2eef 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 1a704683a0..ad7845be30 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/javafmllanguage/build.gradle b/javafmllanguage/build.gradle index 8f0b9b76c9..086b9abdd8 100644 --- a/javafmllanguage/build.gradle +++ b/javafmllanguage/build.gradle @@ -1,79 +1,20 @@ plugins { - id 'java-library' - id 'maven-publish' - alias libs.plugins.licenser - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog id 'net.minecraftforge.forge.build.convention' } gradleutils.displayName = 'JavaFMLMod' -final vendor = 'Forge Development LLC' description = 'Language provider for Minecraft Forge that provides basic Java mod functionality.' -java { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - withSourcesJar() -} - -license { - header = rootProject.file('LICENSE-header.txt') -} - -changelog { - from changelogBase -} - dependencies { - compileOnly libs.jetbrains.annotations - implementation projects.fmlloader implementation projects.fmlcore implementation libs.unsafe implementation libs.securemodules } -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << '-Xlint:unchecked' -} +convention.manifest('net/minecraftforge/fml/javafmlmod/', [ + 'Automatic-Module-Name': 'net.minecraftforge.javafmlmod', + 'FMLModType' : 'LANGPROVIDER' +]) -tasks.named('jar', Jar) { - manifest { - attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.javafmlmod', - 'FMLModType' : 'LANGPROVIDER' - ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : vendor, - 'Specification-Version' : '1', - 'Implementation-Title' : gradleutils.displayName.get(), - 'Implementation-Vendor' : vendor, - 'Implementation-Version': forgeVersion - ], 'net/minecraftforge/fml/javafmlmod/') - } -} - -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - from components.java - - pom { - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } -} \ No newline at end of file +convention.publish() \ No newline at end of file diff --git a/lowcodelanguage/build.gradle b/lowcodelanguage/build.gradle index 5681135f79..335f4a402f 100644 --- a/lowcodelanguage/build.gradle +++ b/lowcodelanguage/build.gradle @@ -1,77 +1,18 @@ plugins { - id 'java-library' - id 'maven-publish' - alias libs.plugins.licenser - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog id 'net.minecraftforge.forge.build.convention' } gradleutils.displayName = 'LowCodeMod' -final vendor = 'Forge Development LLC' description = 'Language provider for Minecraft Forge that loads mods without a Java entrypoint.' -java { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - withSourcesJar() -} - -license { - header = rootProject.file('LICENSE-header.txt') -} - -changelog { - from changelogBase -} - dependencies { - compileOnly libs.jetbrains.annotations - implementation projects.fmlloader implementation projects.fmlcore } -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << '-Xlint:unchecked' -} +convention.manifest('net/minecraftforge/fml/lowcodemod/', [ + 'Automatic-Module-Name': 'net.minecraftforge.lowcodemod', + 'FMLModType' : 'LANGPROVIDER' +]) -tasks.named('jar', Jar) { - manifest { - attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.lowcodemod', - 'FMLModType' : 'LANGPROVIDER' - ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : vendor, - 'Specification-Version' : '1.0', - 'Implementation-Title' : project.name, - 'Implementation-Vendor' : vendor, - 'Implementation-Version': forgeVersion.split('\\.')[0] - ], 'net/minecraftforge/fml/lowcodemod/') - } -} - -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - from components.java - - pom { - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } -} +convention.publish() \ No newline at end of file diff --git a/mclanguage/build.gradle b/mclanguage/build.gradle index 7e4ed70a54..2cbaea7a8c 100644 --- a/mclanguage/build.gradle +++ b/mclanguage/build.gradle @@ -1,77 +1,18 @@ plugins { - id 'java-library' - id 'maven-publish' - alias libs.plugins.licenser - alias libs.plugins.gradleutils - alias libs.plugins.gitversion - alias libs.plugins.changelog id 'net.minecraftforge.forge.build.convention' } gradleutils.displayName = 'MCLanguage' -final vendor = 'Forge Development LLC' description = 'Language provider for Minecraft Forge that provides Minecraft Itself.' -java { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - withSourcesJar() -} - -license { - header = rootProject.file('LICENSE-header.txt') -} - -changelog { - from changelogBase -} - dependencies { - compileOnly libs.jetbrains.annotations - implementation projects.fmlloader implementation projects.fmlcore } -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << '-Xlint:unchecked' -} +convention.manifest('net/minecraftforge/fml/mclanguageprovider/', [ + 'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider', + 'FMLModType' : 'LANGPROVIDER' +]) -tasks.named('jar', Jar) { - manifest { - attributes([ - 'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider', - 'FMLModType' : 'LANGPROVIDER' - ]) - attributes([ - 'Specification-Title' : gradleutils.displayName.get(), - 'Specification-Vendor' : vendor, - 'Specification-Version' : '1', - 'Implementation-Title' : gradleutils.displayName.get(), - 'Implementation-Vendor' : vendor, - 'Implementation-Version': '1.0' - ], 'net/minecraftforge/fml/mclanguageprovider/') - } -} - -publishing { - repositories { - maven gradleutils.publishingForgeMaven - } - - publications.register('mavenJava', MavenPublication) { - changelog.publish(it) - gradleutils.promote(it) - - from components.java - - pom { - description = project.description - - gradleutils.pom.addRemoteDetails(pom) - - licenses { - license gradleutils.pom.licenses.LGPLv2_1 - } - } - } -} +convention.publish() diff --git a/settings.gradle b/settings.gradle index a5e2fc62f8..3be6de25fc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,21 +1,8 @@ -import groovy.transform.Field - pluginManagement { - private static final @Field String FORGEDEV_VERSION = '7.0.0-beta.51' - - if (new File('forgedev/settings.gradle').exists()) { + if (new File('forgedev/settings.gradle').exists()) includeBuild 'forgedev' - } else { - resolutionStrategy.eachPlugin { - // TODO [ForgeDev] Consolidate these entry-points - switch (requested.id.id) { - case 'net.minecraftforge.forgedev': - case 'net.minecraftforge.forge.build.convention': - useVersion(FORGEDEV_VERSION) - break - } - } - } + + includeBuild('build-logic') repositories { gradlePluginPortal() @@ -40,173 +27,26 @@ include 'forge-transformers' enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS' -gradle.beforeProject { Project project -> - project.pluginManager.withPlugin('net.minecraftforge.forge.build.convention') { - // NOTE: We are defining these variables in here so that the projects can stay isolated, increasing build time. - // See minecraft.versions.toml for the versions where you can change these values. - //@formatter:off - project.ext.javaVersion = project.gradleutils.unpack(project.bootLibs.versions.java) - project.ext.minecraftVersion = project.gradleutils.unpack(project.bootLibs.versions.minecraft) - project.version = project.gitversion.getMCTagOffsetBranch(project.ext.minecraftVersion) - project.ext.forgeVersion = project.version.substring(project.ext.minecraftVersion.length() + 1) - project.ext.minecraftNextVersion = project.gradleutils.unpack(project.bootLibs.versions.minecraft.next) - project.ext.mcpVersion = project.gradleutils.unpack(project.bootLibs.versions.mcp) - project.ext.changelogBase = project.gradleutils.unpack(project.bootLibs.versions.changelog.base) - //@formatter:on - } - - // NOTE: We are adding dependencies to projects instead of through settings, so we don't have to apply forgedev in settings. - // Applying forgedev in settings will break IDE linting support, which makes it very hard to work with. - // We can reconsider this if/when switching to Kotlin DSL, or if JetBrains gets their shit together. - project.repositories { - // Libraries has to be before maven central because Mojang hosts a classifer that central doesn't (org.lwjgl:lwjgl-freetype:3.3.3:natives-macos-patch) - maven { url = 'https://libraries.minecraft.net/' } - mavenCentral() - - project.pluginManager.withPlugin('net.minecraftforge.gradleutils') { - maven project.gradleutils.forgeMaven - } - - project.pluginManager.withPlugin('net.minecraftforge.forgedev') { - maven project.forgedev.mavenizer - } - - mavenLocal() - } -} - dependencyResolutionManagement.versionCatalogs { register('bootLibs') { - description = 'Important version numbers that are externally declared for easy modification.' - - // Contains Java, Minecraft, and MCP versions + description = 'Java, Minecraft, and MCP versions' from(files('minecraft.versions.toml')) } register('buildLibs') { description = 'Libraries used solely during the build and publish process.' - - library 'binarypatcher', 'net.minecraftforge', 'binarypatcher' version '1.3.4' - library 'installer', 'net.minecraftforge', 'installer' version '2.2.+' - library 'installertools', 'net.minecraftforge', 'installertools' version '1.4.6' - library 'srg2source', 'net.minecraftforge', 'Srg2Source' version '8.2.0' + from(files('gradle/buildLibs.versions.toml')) } - //@formatter:off register('libs') { description = 'Libraries used by Forge and its subprojects.' - - plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' - plugin 'versions', 'com.github.ben-manes.versions' version '0.54.0' - plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '3.4.5' - plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.7' - plugin 'changelog', 'net.minecraftforge.changelog' version '3.2.2' - plugin 'download', 'de.undercouch.download' version '5.6.0' - plugin 'jarsigner', 'net.minecraftforge.gradlejarsigner' version '1.2.1' - plugin 'apt', 'com.diffplug.eclipse.apt' version '4.4.1' - - // TODO [Forge][Buildscript We should not be needing to manually add transitive dependencies - // If we need to make strict versions for dependencies, we should do so using dependency constraints - library 'forgespi', 'net.minecraftforge', 'forgespi' version '8.0.0' // Needs modlauncher - library 'modlauncher', 'net.minecraftforge', 'modlauncher' version '10.2.6' // Needs securemodules - library 'securemodules', 'net.minecraftforge', 'securemodules' version '2.2.24' // Needs unsafe - library 'unsafe', 'net.minecraftforge', 'unsafe' version '0.9.2' - library 'accesstransformers', 'net.minecraftforge', 'accesstransformers' version '8.2.17' - library 'coremods-api', 'net.minecraftforge', 'coremods-api' version '5.3.1' - version 'eventbus', '7.0.6' - library 'eventbus', 'net.minecraftforge', 'eventbus' versionRef 'eventbus' - library 'eventbus-validator', 'net.minecraftforge', 'eventbus-validator' versionRef 'eventbus' - library 'mergetool-api', 'net.minecraftforge', 'mergetool-api' version '1.0' - - library 'roimfs', 'net.minecraftforge', 'roimfs' version '1.0.0' // ReadOnlyInMemoryFileSystem - Used for JarInJar extraction at runtime - library 'mixin', 'org.spongepowered', 'mixin' version '0.8.7' - version 'mixinextras', '0.5.4' - library 'mixinextras-forge', 'io.github.llamalad7', 'mixinextras-forge' versionRef 'mixinextras' - library 'mixinextras-common', 'io.github.llamalad7', 'mixinextras-common' versionRef 'mixinextras' - library 'jetbrains-annotations', 'org.jetbrains', 'annotations' version '24.0.1' // for ApiStatus annotations - library 'jspecify', 'org.jspecify', 'jspecify' version '1.0.1' // for nullability annotations - library 'slf4j-api', 'org.slf4j', 'slf4j-api' version '2.0.17' - library 'maven-artifact', 'org.apache.maven', 'maven-artifact' version '3.8.8' - - // Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things. - library 'jimfs', 'com.google.jimfs:jimfs:1.3.0' - bundle 'jimfs', ['guava', 'failureaccess'] - - version 'bootstrap', '2.1.8' - library 'bootstrap', 'net.minecraftforge', 'bootstrap' versionRef 'bootstrap' // Needs modlauncher - library 'bootstrap-api', 'net.minecraftforge', 'bootstrap-api' versionRef 'bootstrap' - library 'bootstrap-dev', 'net.minecraftforge', 'bootstrap-dev' versionRef 'bootstrap' - library 'bootstrap-shim', 'net.minecraftforge', 'bootstrap-shim' versionRef 'bootstrap' - - // ASM it's used for so many of our hacks - version 'asm', '9.10.1' - library 'asm', 'org.ow2.asm', 'asm' versionRef 'asm' - library 'asm-tree', 'org.ow2.asm', 'asm-tree' versionRef 'asm' - library 'asm-util', 'org.ow2.asm', 'asm-util' versionRef 'asm' - library 'asm-commons', 'org.ow2.asm', 'asm-commons' versionRef 'asm' - library 'asm-analysis', 'org.ow2.asm', 'asm-analysis' versionRef 'asm' - bundle 'asm', ['asm', 'asm-tree', 'asm-util', 'asm-commons', 'asm-analysis'] - - // Terminal Console Appender. essentially make pretty colors in the console, but it's been a PITA - library 'terminalconsoleappender', 'net.minecrell', 'terminalconsoleappender' version '1.2.0' - version 'jline', '3.25.1' - library 'jline-reader', 'org.jline', 'jline-reader' versionRef 'jline' - library 'jline-terminal', 'org.jline', 'jline-terminal' versionRef 'jline' - library 'jline-terminal-jna', 'org.jline', 'jline-terminal-jna' versionRef 'jline' // Colors and tab completeion - bundle 'terminalconsoleappender', ['terminalconsoleappender', 'jline-reader', 'jline-terminal', 'jline-terminal-jna'] - - // The core of our configuration system, it has many flaws, but it works for the most part - version 'night-config', '3.7.4' - library 'night-config-toml', 'com.electronwill.night-config', 'toml' versionRef 'night-config' - library 'night-config-core', 'com.electronwill.night-config', 'core' versionRef 'night-config' - bundle 'night-config', ['night-config-toml', 'night-config-core'] - - // Jar in Jar FileSystem - version 'jarjar', '0.4.2' - library 'jarjar-fs', 'net.minecraftforge', 'JarJarFileSystems' versionRef 'jarjar' - library 'jarjar-meta', 'net.minecraftforge', 'JarJarMetadata' versionRef 'jarjar' - library 'jarjar-selector', 'net.minecraftforge', 'JarJarSelector' versionRef 'jarjar' - bundle 'jarjar', ['jarjar-fs', 'jarjar-selector', 'jarjar-meta'] - - // These are libraries shipped by the MC launcher, try and keep them in sync with the manifest - // but honestly if we don't it just means we ship them as normal libraries by adding them to the installer config in the forge project - library 'gson', 'com.google.code.gson', 'gson' version '2.14.0' - library 'guava', 'com.google.guava', 'guava' version '33.6.0-jre' - library 'failureaccess', 'com.google.guava', 'failureaccess' version '1.0.3' - - version 'log4j', '2.26.0' - library 'log4j-api', 'org.apache.logging.log4j', 'log4j-api' versionRef 'log4j' - library 'log4j-core', 'org.apache.logging.log4j', 'log4j-core' versionRef 'log4j' - bundle 'log4j', ['log4j-api', 'log4j-core'] - - library 'apache-commons', 'org.apache.commons', 'commons-lang3' version '3.20.0' - library 'mojang-logging', 'com.mojang', 'logging' version '1.7.12' - library 'jopt-simple', 'net.sf.jopt-simple', 'jopt-simple' version '5.0.4' - library 'commons-io', 'commons-io', 'commons-io' version '2.20.0' - - version 'lwjgl', '3.4.3' - library 'lwjgl', 'org.lwjgl', 'lwjgl' versionRef 'lwjgl' - library 'lwjgl-opengl', 'org.lwjgl', 'lwjgl-opengl' versionRef 'lwjgl' - library 'lwjgl-stb', 'org.lwjgl', 'lwjgl-stb' versionRef 'lwjgl' - library 'lwjgl-sdl', 'org.lwjgl', 'lwjgl-sdl' versionRef 'lwjgl' - library 'lwjgl-tinyfd', 'org.lwjgl', 'lwjgl-tinyfd' versionRef 'lwjgl' - bundle 'lwjgl', ['lwjgl', 'lwjgl-opengl', 'lwjgl-stb', 'lwjgl-sdl', 'lwjgl-tinyfd'] } register('earlyDisplayLibs') { - version 'slf4j', '2.0.17' - library 'slf4j-api', 'org.slf4j', 'slf4j-api' versionRef 'slf4j' - library 'slf4j-jdk14', 'org.slf4j', 'slf4j-jdk14' versionRef 'slf4j' + from(files('gradle/earlyDisplayLibs.versions.toml')) } register('earlyDisplayTestLibs') { - library 'powermock-core', 'org.powermock', 'powermock-core' version '2.0.9' - - library 'lwjgl', 'org.lwjgl', 'lwjgl' withoutVersion() - library 'lwjgl-opengl', 'org.lwjgl', 'lwjgl-opengl' withoutVersion() - library 'lwjgl-stb', 'org.lwjgl', 'lwjgl-stb' withoutVersion() - library 'lwjgl-sdl', 'org.lwjgl', 'lwjgl-sdl' withoutVersion() - bundle 'lwjgl', ['lwjgl', 'lwjgl-opengl', 'lwjgl-stb', 'lwjgl-sdl'] + from(files('gradle/earlyDisplayTestLibs.versions.toml')) } - //@formatter:on }