CEuの更新分を同期

Author: tier940

.github/workflows/build-packages.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set release version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

.github/workflows/buildscript-maintenance.yml

@@ -24,7 +24,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Ensure build script version is up to date
         id: update-buildscript

.github/workflows/validate_gradle_wrapper.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v3

build.gradle

@@ -1,8 +1,8 @@
-//version: 1753288091
+//version: 1762213476
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
- * Please check https://github.com/GTModpackTeam/Buildscripts/blob/master/build.gradle for updates.
+ * Please check https://github.com/GregTechCEu/Buildscripts/blob/master/build.gradle for updates.
  * You can also run ./gradlew updateBuildScript to update your buildscript.
  */
 
@@ -318,14 +318,6 @@ tasks.withType(ScalaCompile).configureEach {
 }
 
 
-// Allow others using this buildscript to have custom gradle code run
-if (getFile('addon.gradle').exists()) {
-    apply from: 'addon.gradle'
-} else if (getFile('addon.gradle.kts').exists()) {
-    apply from: 'addon.gradle.kts'
-}
-
-
 // Configure Minecraft
 
 // Try to gather mod version from git tags if version is not manually specified
@@ -372,6 +364,9 @@ minecraft {
 
     // JVM arguments
     extraRunJvmArguments.add("-ea:${modGroup}")
+
+    // enable JLine Terminal since idea_rt.jar is no longer added to the classpath
+    extraRunJvmArguments.add('-Dterminal.jline=true')
     if (usesMixins.toBoolean()) {
         extraRunJvmArguments.addAll([
                 '-Dmixin.hotSwap=true',
@@ -1425,11 +1420,11 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
 }
 
 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/build.gradle")
+    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/build.gradle")
 }
 
 static URL availableSettingsGradleUrl() {
-    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/settings.gradle")
+    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/settings.gradle")
 }
 
 boolean performBuildScriptUpdate() {
@@ -1478,8 +1473,8 @@ tasks.register('faq') {
                 "To add new repositories to your project, place them in 'repositories.gradle'.\n" +
                 "If you need additional gradle code to run, you can place it in a file named 'addon.gradle' (or either of the above, up to you for organization).\n\n" +
                 "If your build fails to recognize the syntax of newer Java versions, enable Jabel in your 'buildscript.properties' under the option name 'enableModernJavaSyntax'.\n" +
-                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/jabel.md\n\n" +
-                "Report any issues or feature requests you have for this build script to https://github.com/GTModpackTeam/Buildscripts/issues\n")
+                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/jabel.md\n\n" +
+                "Report any issues or feature requests you have for this build script to https://github.com/GregTechCEu/Buildscripts/issues\n")
     }
 }
 
@@ -1511,7 +1506,7 @@ def getFile(String relativePath) {
 
 def checkPropertyExists(String propertyName) {
     if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"buildscript.properties\" or \"gradle.properties\". You can find all properties and their description here: https://github.com/GTModpackTeam/Buildscripts/blob/main/buildscript.properties and https://github.com/GTModpackTeam/Buildscripts/blob/main/gradle.properties")
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"buildscript.properties\" or \"gradle.properties\". You can find all properties and their description here: https://github.com/GregTechCEu/Buildscripts/blob/main/buildscript.properties and https://github.com/GregTechCEu/Buildscripts/blob/main/gradle.properties")
     }
 }
 
@@ -1549,3 +1544,11 @@ def getLastTag() {
     return runShell('git describe --abbrev=0 --tags ' +
             (githubTag.isPresent() ? runShell('git rev-list --tags --skip=1 --max-count=1') : ''))
 }
+
+
+// Allow others using this buildscript to have custom gradle code run
+if (getFile('addon.gradle').exists()) {
+    apply from: 'addon.gradle'
+} else if (getFile('addon.gradle.kts').exists()) {
+    apply from: 'addon.gradle.kts'
+}

buildscript.properties

@@ -1,8 +1,17 @@
+#
+# The "buildscript.properties" file contains settings loaded and used by the "build.gradle" file.
+# For settings loaded in all gradle files or custom settings, use "gradle.properties" instead.
+# New properties should not be created in this file, use "gradle.properties" instead.
+#
+
+# The name of your mod. Can be any sequence of characters.
 modName = TestMod
 
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+# This is a case-sensitive string to identify your mod.
+# Must be less than 64 characters and all lowercase. Convention is to only contain alphabetic characters.
 modId = testmod
 
+# Project package location.
 modGroup = com.github.gtexpert.testmod
 
 # Version of your mod.
@@ -64,10 +73,8 @@ accessTransformersFile =
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
-
 # Mixin Provider to use. Primarily changed when needing to use a different version.
-mixinProviderSpec = zone.rong:mixinbooter:9.4
-
+mixinProviderSpec = zone.rong:mixinbooter:10.6
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage =
 # Location of the mixin config refmap. If left, blank, defaults to "mixins.${modId}.refmap.json". Target file must have the "json" extension.
@@ -179,7 +186,7 @@ mavenArtifactGroup =
 
 # Enable spotless checks
 # Enforces code formatting on your source code
-# By default this will use the files found here: https://github.com/GTModpackTeam/Buildscripts/tree/master/spotless
+# By default this will use the files found here: https://github.com/GregTechCEu/Buildscripts/tree/master/spotless
 # to format your code. However, you can create your own version of these files and place them in your project's
 # root directory to apply your own formatting options instead.
 enableSpotless = true
@@ -192,11 +199,3 @@ enableJUnit = true
 # Uncomment this to test deployments to CurseForge and Modrinth
 # Alternatively, you can set the 'DEPLOYMENT_DEBUG' environment variable.
 deploymentDebug = false
-
-
-# Gradle Settings
-# Effectively applies the '--stacktrace' flag by default
-org.gradle.logging.stacktrace = all
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs = -Xmx3G