neoforged/NeoForge
1
0
Fork 0
mirror of https://github.com/neoforged/NeoForge.git synced 2026-10-11 22:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Gradle and other dependencies (#3334)

Browse Source 
Co-authored-by: Luke Bemish <[email protected]>
This commit is contained in:
sciwhiz12
2026-08-08 04:10:07 +08:00
committed by GitHub
co-authored by Luke Bemish
parent a780858b7f
commit 0b43c802ab
19 changed files with 96 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+2 -2
View File
@@ -3,8 +3,8 @@ import java.util.regex.Pattern
import net.neoforged.neodev.CheckSplitSources
plugins {
id 'net.neoforged.gradleutils' version '5.1.1'
id 'dev.lukebemish.immaculate' version '0.1.16' apply false
id 'net.neoforged.gradleutils' version '6.0.0'
id 'dev.lukebemish.immaculate' version '0.2.5' apply false
id 'net.neoforged.licenser' version '0.7.5'
id 'neoforge.formatting-conventions'
id 'neoforge.versioning'
buildSrc/build.gradle
+1 -1
View File
@@ -37,5 +37,5 @@ dependencies {
implementation "org.ow2.asm:asm:${gradle.parent.ext.asm_version}"
implementation "org.apache.maven:maven-artifact:3.8.5"
implementation "org.apache.maven:maven-artifact:3.9.16"
}
buildSrc/src/main/groovy/neoforge.formatting-conventions.gradle
+6 -3
View File
@@ -28,6 +28,7 @@ abstract class GeneratePackageInfos extends DefaultTask {
}
}
}
final generatePackageInfos = tasks.register('generatePackageInfos', GeneratePackageInfos) {
it.files.from fileTree("src/main/java")
if (file("src/client/java").exists()) {
@@ -43,11 +44,13 @@ immaculate {
java()
trailingNewline()
noTabs()
googleFixImports()
google {
fixImports()
}
toggleOff = 'spotless:off'
toggleOn = 'spotless:on'
eclipse {
version project.jdt_core_version
version = project.jdt_core_version
config = rootProject.file('codeformat/formatter-config.xml')
}
@@ -68,7 +71,7 @@ immaculate {
custom 'jspecifyNullable', { String fileContents ->
fileContents.replace('javax.annotation.Nullable', 'org.jspecify.annotations.Nullable')
fileContents.replace('org.jetbrains.annotations.Nullable', 'org.jspecify.annotations.Nullable')
.replace('org.jetbrains.annotations.Nullable', 'org.jspecify.annotations.Nullable')
}
}
}
buildSrc/src/main/java/net/neoforged/neodev/GenerateAccessTransformers.java
+1
View File
@@ -40,6 +40,7 @@ public abstract class GenerateAccessTransformers extends DefaultTask {
@Input
public abstract ListProperty<AtGroup> getGroups();
@SuppressWarnings("unchecked")
@TaskAction
public void exec() throws IOException {
// First we collect all classes
buildSrc/src/main/java/net/neoforged/neodev/NeoDevExtension.java
+2 -2
View File
@@ -13,8 +13,8 @@ public class NeoDevExtension {
private final NamedDomainObjectContainer<RunModel> runs;
public NeoDevExtension(Project project) {
mods = project.container(ModModel.class);
runs = project.container(RunModel.class, name -> project.getObjects().newInstance(RunModel.class, name, project, mods));
mods = project.getObjects().domainObjectContainer(ModModel.class);
runs = project.getObjects().domainObjectContainer(RunModel.class, name -> project.getObjects().newInstance(RunModel.class, name, project, mods));
}
public NamedDomainObjectContainer<ModModel> getMods() {
buildSrc/src/main/java/net/neoforged/neodev/NeoDevExtraPlugin.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class NeoDevExtraPlugin implements Plugin<Project> {
}
private static ProjectDependency projectDep(DependencyFactory dependencyFactory, Project project, String capabilityNotation) {
var dep = dependencyFactory.create(project);
var dep = dependencyFactory.createProjectDependency(project.getPath());
dep.capabilities(caps -> {
caps.requireCapability(capabilityNotation);
});
buildSrc/src/main/java/net/neoforged/neodev/NeoDevPlugin.java
+1 -1
View File
@@ -423,7 +423,7 @@ public class NeoDevPlugin implements Plugin<Project> {
// This is true by default (see gradle.properties), and needs to be disabled explicitly when building (see release.yml).
String installerDebugProperty = "include_artifacts_in_installer";
if (project.getProperties().containsKey(installerDebugProperty) && Boolean.parseBoolean(project.getProperties().get(installerDebugProperty).toString())) {
if (project.getProviders().gradleProperty(installerDebugProperty).map(Boolean::parseBoolean).getOrElse(false)) {
task.from(universalJar.flatMap(AbstractArchiveTask::getArchiveFile), spec -> {
spec.into(String.format("/maven/net/neoforged/neoforge/%s/", neoForgeVersion.get()));
spec.rename(name -> String.format("neoforge-%s-universal.jar", neoForgeVersion.get()));
buildSrc/src/main/java/net/neoforged/neodev/utils/FileUtils.java
+1 -1
View File
@@ -30,7 +30,7 @@ public final class FileUtils {
}
public static OutputStream newSafeFileOutputStream(Path destination) throws IOException {
var uniqueId = ProcessHandle.current().pid() + "." + Thread.currentThread().getId();
var uniqueId = ProcessHandle.current().pid() + "." + Thread.currentThread().threadId();
var tempFile = destination.resolveSibling(destination.getFileName().toString() + "." + uniqueId + ".tmp");
var closed = new boolean[1];
codeformat/formatter-config.xml
+5
View File
@@ -200,6 +200,7 @@
<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
@@ -226,6 +227,7 @@
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="-1"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_markdown_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
@@ -276,10 +278,12 @@
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
@@ -310,6 +314,7 @@
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
gradle.properties
+14 -14
View File
@@ -10,7 +10,7 @@ org.gradle.debug=false
#org.gradle.warning.mode=fail
# renovate: net.neoforged:moddev-gradle
moddevgradle_plugin_version=2.0.140
moddevgradle_plugin_version=2.0.142
# renovate: io.codechicken:DiffPatch
diffpatch_version=2.1.0.43
@@ -23,33 +23,33 @@ neoform_version=2
neoforge_snapshot_next_stable=26.2
# renovate: net.neoforged.jst:jst-cli-bundle
jst_version=2.0.8
jst_version=2.0.10
legacyinstaller_version=3.0.+
# renovate: net.neoforged.installertools:installertools
installertools_version=4.0.12
installertools_version=4.0.17
# renovate: org.ow2.asm:asm
asm_version=9.9.1
asm_version=9.10.1
mergetool_version=2.0.0
accesstransformers_version=11.0.1
mergetool_version=2.0.7
accesstransformers_version=11.0.2
eventbus_version=8.0.5
mixin_version=0.17.3+mixin.0.8.7
terminalconsoleappender_version=1.3.0
nightconfig_version=3.8.3
jetbrains_annotations_version=24.0.1
apache_maven_artifact_version=3.9.9
jarjar_version=0.4.1
fancy_mod_loader_version=11.0.13
nightconfig_version=3.9.0
jetbrains_annotations_version=24.1.0
apache_maven_artifact_version=3.9.16
jarjar_version=0.5.1
fancy_mod_loader_version=11.0.16
typetools_version=0.6.3
mixin_extras_version=0.5.4
jupiter_api_version=5.13.4
jupiter_api_version=5.14.4
vintage_engine_version=5.+
assertj_core=3.25.1
assertj_core=3.27.7
# renovate: org.eclipse.jdt:org.eclipse.jdt.core
jdt_core_version=3.42.0
jdt_core_version=3.46.0
# Whether the NeoForge artifacts should be included in the installer (in the maven directory).
# This is true by default, for development purposes, but should be turned off when building installers meant for production use.
gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
gradle/wrapper/gradle-wrapper.properties
Vendored
+4 -1
View File
@@ -1,7 +1,10 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
gradlew
Vendored
+3 -3
View File
@@ -20,7 +20,7 @@
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
# gradlew start up script for POSIX generated by Gradle.
#
# Important for running:
#
@@ -29,7 +29,7 @@
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
# ksh gradlew
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
# 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
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/.
gradlew.bat
Vendored
+12 -23
View File
@@ -19,12 +19,12 @@
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem gradlew startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Set local scope for the variables, and ensure extensions are enabled
setlocal EnableExtensions
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ 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
"%COMSPEC%" /c exit 1
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ 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
"%COMSPEC%" /c exit 1
:execute
@rem Setup the command line
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
@rem Execute gradlew
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
@rem which allows us to clear the local environment before executing the java command
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
: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
:exitWithErrorLevel
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
"%COMSPEC%" /c exit %ERRORLEVEL%
projects/neoforge/build.gradle
+2 -2
View File
@@ -8,7 +8,7 @@ import net.neoforged.neodev.DownloadFile
plugins {
id 'java-library'
id 'maven-publish'
id 'net.neoforged.jarcompatibilitychecker' version '0.1.12'
id 'net.neoforged.jarcompatibilitychecker' version '0.1.15'
id 'net.neoforged.gradleutils'
id 'neoforge.versioning'
}
@@ -577,4 +577,4 @@ publishing {
tasks.withType(JavaCompile.class).configureEach(task -> {
Collections.addAll(task.getOptions().getCompilerArgs(), "-Xmaxerrs", "9999");
});
});
settings.gradle
+1 -1
View File
@@ -48,5 +48,5 @@ project(":coremods").name = "neoforge-coremods"
// See this Gradle issue for tracking a more permanent solution:
// https://github.com/gradle/gradle/issues/27260
gradle.settingsEvaluated {
gradle.extensions.add("repositoryBaseUrls", dependencyResolutionManagement.repositories.findAll { it instanceof MavenArtifactRepository }.collect { it.url }.toArray(URI[]::new))
gradle.extensions.add("repositoryBaseUrls", dependencyResolutionManagement.repositories.withType(MavenArtifactRepository).collect { it.url }.toArray(URI[]::new))
}
src/main/java/net/neoforged/neoforge/common/crafting/SizedIngredient.java
+10 -12
View File
@@ -24,18 +24,16 @@ import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs;
* and provide a standard serialization format.
*/
public final class SizedIngredient {
/**
* The "nested" codec for {@link SizedIngredient}.
*
* <p>The count is serialized separately from the rest of the ingredient, for example:
*
* <pre>{@code
* {
* "ingredient": "minecraft:apple",
* "count": 3
* }
* }</pre>
*/
/// The "nested" codec for [SizedIngredient]. The count is serialized separately from the rest of the ingredient.
///
/// For example:
///
/// ```json
/// {
/// "ingredient": "minecraft:apple",
/// "count": 3
/// }
/// ```
public static final Codec<SizedIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
Ingredient.CODEC.fieldOf("ingredient").forGetter(SizedIngredient::ingredient),
NeoForgeExtraCodecs.optionalFieldAlwaysWrite(ExtraCodecs.POSITIVE_INT, "count", 1).forGetter(SizedIngredient::count))
src/main/java/net/neoforged/neoforge/fluids/crafting/SizedFluidIngredient.java
+25 -28
View File
@@ -27,34 +27,31 @@ import net.neoforged.neoforge.fluids.FluidType;
* @see net.neoforged.neoforge.common.crafting.SizedIngredient
*/
public final class SizedFluidIngredient {
/**
* The codec for {@link SizedFluidIngredient}.
*
* <p>With this codec, the amount is serialized separately from the ingredient itself, for example:
*
* <pre>{@code
* {
* "ingredient": "minecraft:lava",
* "amount": 1000
* }
* }</pre>
*
* <p>
* or for custom ingredients:
*
* <pre>{@code
* {
* "ingredient": {
* "neoforge:type": "neoforge:intersection",
* "children": [
* "#example:tag1",
* "#example:tag2"
* ],
* },
* "amount": 4711
* }
* }</pre>
*/
/// The codec for [SizedFluidIngredient]. The amount is serialized separately from the ingredient itself.
///
/// For example:
///
/// ```json
/// {
/// "ingredient": "minecraft:lava",
/// "amount": 1000
/// }
/// ```
///
/// For example, with custom ingredients:
///
/// ```json
/// {
/// "ingredient": {
/// "neoforge:type": "neoforge:intersection",
/// "children": [
/// "#example:tag1",
/// "#example:tag2"
/// ],
/// },
/// "amount": 4711
/// }
/// ```
public static final Codec<SizedFluidIngredient> CODEC = RecordCodecBuilder.create(instance -> instance.group(
FluidIngredient.CODEC.fieldOf("ingredient").forGetter(SizedFluidIngredient::ingredient),
NeoForgeExtraCodecs.optionalFieldAlwaysWrite(ExtraCodecs.POSITIVE_INT, "amount", FluidType.BUCKET_VOLUME).forGetter(SizedFluidIngredient::amount))
tests/build.gradle
+5 -7
View File
@@ -9,8 +9,6 @@ apply plugin : net.neoforged.neodev.NeoDevExtraPlugin
evaluationDependsOn(":neoforge")
def neoforgeProject = project(':neoforge')
def testframeworkProject = project(':testframework')
def coremodsProject = project(':neoforge-coremods')
sourceSets {
main {
@@ -22,12 +20,12 @@ sourceSets {
}
dependencies {
implementation(neoforgeProject) {
implementation(project(':neoforge')) {
capabilities {
requireFeature('client')
}
}
implementation(testframeworkProject)
implementation(project(':testframework'))
junitImplementation(platform("org.junit:junit-bom:${project.jupiter_api_version}"))
junitImplementation "org.junit.jupiter:junit-jupiter"
@@ -36,12 +34,12 @@ dependencies {
junitImplementation("org.assertj:assertj-core:${project.assertj_core}")
junitImplementation "net.neoforged.fancymodloader:junit-fml:${project.fancy_mod_loader_version}"
junitImplementation(neoforgeProject) {
junitImplementation(project(':neoforge')) {
capabilities {
requireFeature('client')
}
}
junitImplementation(testframeworkProject)
junitImplementation(project(':testframework'))
compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
}
@@ -76,7 +74,7 @@ neoDev {
sourceSet sourceSets.junit
}
coremods {
sourceSet coremodsProject.sourceSets.main
sourceSet project(':neoforge-coremods').sourceSets.main
}
}