Merge pull request #276 from Thorfusion/fg-migration-1.7.10

Move to RetroFuturaGradle

.github/workflows/gradle.yml

@@ -56,17 +56,32 @@ jobs:
             ${{ github.event_name == 'pull_request_target' &&
             github.event.pull_request.head.sha || '' }}
 
-      - name: Set up JDK 8
+      - name: Set up JDK 25
         uses: actions/setup-java@v6
         with:
           distribution: temurin
-          java-version: '8'
+          java-version: '25'
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v6
         with:
           validate-wrappers: true
 
+      - name: Remove incompatible legacy ForgeGradle mappings cache
+        shell: bash
+        run: |
+          minecraft_version="$(sed -n 's/^minecraft_version=//p' gradle.properties | tr -d '\r' | tail -n 1)"
+          mappings="$(sed -n 's/^mappings_version=//p' gradle.properties | tr -d '\r' | tail -n 1)"
+          if [[ "$minecraft_version" == '1.12.2' && "$mappings" =~ ^(stable|snapshot)_([0-9]+)$ ]]; then
+            channel="${BASH_REMATCH[1]}"
+            mapping_version="${BASH_REMATCH[2]}"
+            cache_dir="${GRADLE_USER_HOME:-$HOME/.gradle}/caches/minecraft/de/oceanlabs/mcp/mcp_${channel}/${mapping_version}"
+            if [[ -d "$cache_dir" && ! -f "$cache_dir/joined.srg" ]]; then
+              echo "Removing incompatible legacy mappings cache: $cache_dir"
+              rm -rf -- "$cache_dir"
+            fi
+          fi
+
       - name: Grant execute permission for Gradle
         run: chmod +x gradlew
 

.github/workflows/maven.yml

@@ -34,17 +34,32 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.release.tag_name }}
 
-      - name: Set up JDK 8
+      - name: Set up JDK 25
         uses: actions/setup-java@v6
         with:
           distribution: temurin
-          java-version: '8'
+          java-version: '25'
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v6
         with:
           validate-wrappers: true
 
+      - name: Remove incompatible legacy ForgeGradle mappings cache
+        shell: bash
+        run: |
+          minecraft_version="$(sed -n 's/^minecraft_version=//p' gradle.properties | tr -d '\r' | tail -n 1)"
+          mappings="$(sed -n 's/^mappings_version=//p' gradle.properties | tr -d '\r' | tail -n 1)"
+          if [[ "$minecraft_version" == '1.12.2' && "$mappings" =~ ^(stable|snapshot)_([0-9]+)$ ]]; then
+            channel="${BASH_REMATCH[1]}"
+            mapping_version="${BASH_REMATCH[2]}"
+            cache_dir="${GRADLE_USER_HOME:-$HOME/.gradle}/caches/minecraft/de/oceanlabs/mcp/mcp_${channel}/${mapping_version}"
+            if [[ -d "$cache_dir" && ! -f "$cache_dir/joined.srg" ]]; then
+              echo "Removing incompatible legacy mappings cache: $cache_dir"
+              rm -rf -- "$cache_dir"
+            fi
+          fi
+
       - name: Grant execute permission for Gradle
         run: chmod +x gradlew
 

.gitignore

@@ -14,6 +14,7 @@
 !Mekanism.txt
 !README.md
 !build.gradle
+!settings.gradle
 !gradle.properties
 !gradlew
 !gradlew.bat

README.md

@@ -13,9 +13,11 @@ Originally made for Terralization Modpack with fixes from several different fork
 
 #### Contact Thorfusion team on our [discord](https://discord.gg/ykaB7EnYQj) server
 
-### Building Mekanism 1.7.10 Community Edition
-
-```bash
+### Building Mekanism 1.7.10 Community Edition
+
+Use JDK 25 to run Gradle. RetroFuturaGradle automatically provisions a Java 8 toolchain for Minecraft-compatible bytecode.
+
+```bash
 ./gradlew fullBuild
 ```
 You will find the files inside ./output/

build.gradle

@@ -1,45 +1,88 @@
-buildscript {
-    repositories {
-        maven {
-            name = "central"
-            url = "https://maven.thorfusion.com/artifactory/central/"
-        }
-    }
-    dependencies {
-        classpath('com.anatawa12.forge:ForgeGradle:1.2-1.1.+') {
-            changing = true
-        }
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.33.1"
-    }
-}
+import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
 
 plugins {
     id 'java-library'
+    id 'idea'
+    id 'maven-publish'
+    id 'com.gtnewhorizons.retrofuturagradle' version '2.0.4'
 }
 
-apply plugin: 'forge'
-apply plugin: 'idea'
-apply plugin: 'java'
-apply plugin: "com.jfrog.artifactory"
-apply plugin: "maven-publish"
-
 defaultTasks 'fullBuild'
 
-repositories {
-    maven {
-        name 'central'
-        url 'https://maven.thorfusion.com/artifactory/central/'
-    }
+def baseModVersion = mod_version
+def buildVersion = System.getenv('BUILD_VER')
+if (buildVersion) {
+    mod_version = "${baseModVersion}-${buildVersion}"
+}
 
+group = 'mekanism'
+version = "${minecraft_version}-${mod_version}"
+
+base {
+    archivesName = 'Mekanism-Community-Edition'
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
 }
 
 idea {
     module {
-        // For some reason this is necessary for IDEA 2014 workspaces to recognize assets
+        // Required for IDEA to make resources available to Minecraft run tasks.
         inheritOutputDirs = true
     }
 }
 
+repositories {
+    mavenCentral()
+
+    maven {
+        name = 'GTNH Maven'
+        url = uri('https://nexus.gtnewhorizons.com/repository/public/')
+        content {
+            includeGroup 'com.gtnewhorizons'
+            includeGroupByRegex 'com\\.gtnewhorizons\\..+'
+        }
+    }
+
+    maven {
+        name = 'CodeChicken Maven'
+        url = uri('https://maven.covers1624.net/')
+        content { includeGroup 'codechicken' }
+    }
+    maven {
+        name = 'CIL Maven'
+        url = uri('https://maven.cil.li/')
+        content { includeGroup 'mcp.mobius.waila' }
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        name = 'IC2 Maven'
+        url = uri('https://maven.ic2.player.to/')
+        content { includeGroup 'net.industrial-craft' }
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    // These repositories replace the old Thorfusion proxy named "central".
+    // Keep them last so normal dependencies are resolved from their upstream homes.
+    maven {
+        name = 'Thorfusion Releases'
+        url = uri('https://maven.thorfusion.com/artifactory/thorfusion/')
+        content { includeGroup 'inventorytweaks' }
+    }
+    maven {
+        name = 'Thorfusion Development'
+        url = uri('https://maven.thorfusion.com/artifactory/dev/')
+        content { includeGroup 'inventorytweaks' }
+    }
+}
 
 dependencies {
     implementation "codechicken:CodeChickenLib:${minecraft_version}-${CCLIB_version}:dev"
@@ -49,114 +92,125 @@ dependencies {
     implementation "inventorytweaks:inventory-tweaks:1.7.10-1.60.0:api"
     implementation "net.industrial-craft:industrialcraft-2:2.2.828-experimental:api"
     implementation "mcp.mobius.waila:Waila:1.5.10_1.7.10:dev"
-}
 
-if (System.getenv("BUILD_VER") == null) {
-    mod_version = mod_version
-} else {
-    mod_version = mod_version + "-" + System.getenv("BUILD_VER")
+    // Optional integrations that are intentionally checked into libs/.
+    compileOnly fileTree(dir: 'libs', include: ['*.jar'])
 }
-version = minecraft_version + "-" + mod_version
-group = "mekanism"
-archivesBaseName = "Mekanism-Community-Edition"
-libsDirName = "../output"
-distsDirName = "../output"
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
 
 minecraft {
-    version = minecraft_version + "-" + forge_version
-    replaceIn "mekanism/common/Mekanism.java"
-    replaceIn "mekanism/generators/common/MekanismGenerators.java"
-    replaceIn "mekanism/tools/common/MekanismTools.java"
-    replaceIn "mekanism/defense/common/DefenseTech.java"
-    replaceIn "mekanism/ultimate/common/MekanismUltimate.java"
-    replace "GRADLE_MODVERSION", mod_version
-    replace "GRADLE_VERSIONMOD", alt_version
+    mcVersion.set(minecraft_version)
+    mcpMappingChannel.set('stable')
+    mcpMappingVersion.set('12')
+
+    injectedTags.put('GRADLE_MODVERSION', mod_version)
+    injectedTags.put('GRADLE_VERSIONMOD', alt_version)
+    // RFG 2.0.4 serializes only one replacement-file pattern, so use one
+    // brace glob for every module entry point.
+    tagReplacementFiles.add('{Mekanism.java,MekanismGenerators.java,MekanismTools.java,DefenseTech.java,MekanismUltimate.java}')
 }
 
-processResources {
-    duplicatesStrategy = 'include'
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-        exclude '**/*.blend*'
-    }
+tasks.named('processResources') {
+    exclude 'mcmod.info'
+    exclude '**/*.blend*'
 }
 
-task coreJar(type: Jar) {
-    classifier = 'Core'
+tasks.named('jar') {
     manifest {
-        attributes 'FMLCorePlugin': 'mekanism.common.asm.LoadingHook'
-        attributes 'FMLCorePluginContainsFMLMod': 'true'
+        attributes(
+                'FMLCorePlugin': 'mekanism.common.asm.LoadingHook',
+                'FMLCorePluginContainsFMLMod': 'true')
     }
+}
 
+def artifactOutputDir = layout.projectDirectory.dir('output')
+def reobfuscatedJar = tasks.named('reobfJar', ReobfuscatedJar)
+def reobfuscatedContents = {
+    zipTree(reobfuscatedJar.get().archiveFile.get().asFile)
+}
+
+tasks.register('coreJar', Jar) {
+    dependsOn reobfuscatedJar
+    archiveClassifier.set('Core')
+    destinationDirectory.set(artifactOutputDir)
+    manifest {
+        attributes(
+                'FMLCorePlugin': 'mekanism.common.asm.LoadingHook',
+                'FMLCorePluginContainsFMLMod': 'true')
+    }
     from('etc/core') {
         include '*.info'
         expand 'version': mod_version, 'mc_version': minecraft_version, 'fmp_version': FMP_version
     }
-
-    from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
-        exclude 'mekanism/tools/**', 'mekanism/generators/**', 'mekanism/defense/**', 'defense/**', 'assets/defense/**', 'mcmod.info', 'mekanism/ultimate/**'
+    from(reobfuscatedContents) {
+        exclude 'mekanism/tools/**', 'mekanism/generators/**', 'mekanism/defense/**',
+                'defense/**', 'assets/defense/**', 'mcmod.info', 'mekanism/ultimate/**'
     }
 }
 
-task alltJar(type: Jar) {
-    classifier = 'ALL'
+tasks.register('alltJar', Jar) {
+    dependsOn reobfuscatedJar
+    archiveClassifier.set('ALL')
+    destinationDirectory.set(artifactOutputDir)
     manifest {
-        attributes 'FMLCorePlugin': 'mekanism.common.asm.LoadingHook'
-        attributes 'FMLCorePluginContainsFMLMod': 'true'
+        attributes(
+                'FMLCorePlugin': 'mekanism.common.asm.LoadingHook',
+                'FMLCorePluginContainsFMLMod': 'true')
     }
     from('etc/all') {
         include '*.info'
         expand 'version': mod_version, 'mc_version': minecraft_version, 'fmp_version': FMP_version
     }
-    from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
+    from(reobfuscatedContents) {
         exclude 'mcmod.info'
     }
 }
 
-task toolsJar(type: Jar) {
-    classifier = 'Tools'
+tasks.register('toolsJar', Jar) {
+    dependsOn reobfuscatedJar
+    archiveClassifier.set('Tools')
+    destinationDirectory.set(artifactOutputDir)
     from('etc/tools') {
         include '*.info'
         expand 'version': mod_version, 'mc_version': minecraft_version, 'fmp_version': FMP_version
     }
-
-    from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
+    from(reobfuscatedContents) {
         include 'mekanism/tools/**'
         exclude 'mcmod.info'
     }
 }
 
-task generatorsJar(type: Jar) {
-    classifier = 'Generators'
+tasks.register('generatorsJar', Jar) {
+    dependsOn reobfuscatedJar
+    archiveClassifier.set('Generators')
+    destinationDirectory.set(artifactOutputDir)
     from('etc/generators') {
         include '*.info'
         expand 'version': mod_version, 'mc_version': minecraft_version, 'fmp_version': FMP_version
     }
-
-    from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
+    from(reobfuscatedContents) {
         include 'mekanism/generators/**'
         exclude 'mcmod.info'
     }
 }
 
-task defensetechJar(type: Jar) {
-    classifier = 'DefenseTech'
+tasks.register('defensetechJar', Jar) {
+    dependsOn reobfuscatedJar
+    archiveClassifier.set('DefenseTech')
+    destinationDirectory.set(artifactOutputDir)
     from('etc/defense') {
         include '*.info'
         expand 'version': mod_version, 'mc_version': minecraft_version, 'fmp_version': FMP_version
     }
-
-    from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
+    from(reobfuscatedContents) {
         include 'mekanism/defense/**', 'defense/**', 'assets/defense/**'
         exclude 'mcmod.info'
     }
 }
 
-task ultimateJar(type: Jar) {
-    classifier = 'Ultimate'
+tasks.register('ultimateJar', Jar) {
+    dependsOn reobfuscatedJar
+    archiveClassifier.set('Ultimate')
+    destinationDirectory.set(artifactOutputDir)
     from('etc/ultimate') {
         include '*.info'
         expand 'version': mod_version, 'mc_version': minecraft_version, 'fmp_version': FMP_version
@@ -164,97 +218,78 @@ task ultimateJar(type: Jar) {
     from('etc/ultimate') {
         include 'logo.png'
     }
-
-    from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
+    from(reobfuscatedContents) {
         include 'mekanism/ultimate/**'
         exclude 'mcmod.info'
     }
 }
 
-coreJar.dependsOn('reobf')
-toolsJar.dependsOn('reobf')
-generatorsJar.dependsOn('reobf')
-alltJar.dependsOn('reobf')
-defensetechJar.dependsOn('reobf')
-ultimateJar.dependsOn('reobf')
-
-
-task MDKZip(type: Zip) {
-    classifier = 'MDK'
+tasks.register('MDKZip', Zip) {
+    archiveClassifier.set('MDK')
+    destinationDirectory.set(artifactOutputDir)
     from sourceSets.main.java.srcDirs
     include 'mekanism/api/**'
 }
 
-task devJar(type: Jar) {
-    classifier = 'DEV'
-    dependsOn processResources
+tasks.register('devJar', Jar) {
+    dependsOn reobfuscatedJar
+    archiveClassifier.set('DEV')
+    destinationDirectory.set(artifactOutputDir)
     from sourceSets.main.java.srcDirs
     manifest {
-        attributes 'FMLCorePlugin': 'mekanism.common.asm.LoadingHook'
-        attributes 'FMLCorePluginContainsFMLMod': 'true'
+        attributes(
+                'FMLCorePlugin': 'mekanism.common.asm.LoadingHook',
+                'FMLCorePluginContainsFMLMod': 'true')
     }
     from('etc/all') {
         include '*.info'
         expand 'version': mod_version, 'mc_version': minecraft_version, 'fmp_version': FMP_version
     }
-    from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
+    from(reobfuscatedContents) {
         exclude 'mcmod.info'
     }
 }
 
-task apiJar(type: Jar) {
-    classifier = 'API'
-    dependsOn processResources
+tasks.register('apiJar', Jar) {
+    dependsOn tasks.named('classes')
+    archiveClassifier.set('API')
+    destinationDirectory.set(artifactOutputDir)
     from sourceSets.main.java.srcDirs
     from sourceSets.main.output
     include 'mekanism/api/**', 'defense/api/**'
 }
 
-task fullBuild(type: Delete) {
-    delete jar
+def distributionArtifacts = [
+        tasks.named('toolsJar'),
+        tasks.named('coreJar'),
+        tasks.named('generatorsJar'),
+        tasks.named('MDKZip'),
+        tasks.named('alltJar'),
+        tasks.named('apiJar'),
+        tasks.named('devJar'),
+        tasks.named('defensetechJar'),
+        tasks.named('ultimateJar')
+]
+
+tasks.register('fullBuild') {
+    group = 'build'
+    description = 'Builds every distribution artifact.'
+    dependsOn distributionArtifacts
 }
 
-fullBuild.dependsOn('toolsJar', 'coreJar', 'generatorsJar', 'MDKZip', 'alltJar', 'apiJar', 'devJar','defensetechJar', 'ultimateJar')
-
-artifactory {
-    contextUrl = System.getenv("MAVEN_URL")
-    publish {
-        repository {
-            repoKey = System.getenv("MAVEN_REPO")
-            username = System.getenv("MAVEN_USERNAME")
-            password = System.getenv("MAVEN_PASSWORD")
-            maven = true
-        }
-        defaults {
-            publications('mavenJava')
-        }
-        publishBuildInfo = false
-        publishArtifacts = true
-        publishPom = true
-    }
-    resolve {
-        repository {
-            repoKey = System.getenv("MAVEN_REPO")
-            username = System.getenv("MAVEN_USERNAME")
-            password = System.getenv("MAVEN_PASSWORD")
-            maven = true
-
-        }
-    }
-}
+def publishBaseUrl = providers.environmentVariable('MAVEN_URL')
+        .orElse('https://maven.thorfusion.com/artifactory')
+def publishRepository = providers.environmentVariable('MAVEN_REPO').orElse('dev')
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifactId = project.archivesBaseName
+            artifactId = 'Mekanism-Community-Edition'
             groupId = project.group
             version = project.version
-            artifacts = [toolsJar, coreJar, generatorsJar, MDKZip, alltJar, apiJar, devJar, defensetechJar, ultimateJar]
-            components.java.withVariantsFromConfiguration(configurations.runtimeElements) {
-                skip()
-            }
+            distributionArtifacts.each { artifact it }
             pom {
-                name.set("Mekanism Community Edition")
+                name.set('Mekanism Community Edition')
                 description.set('Mekanism is a Minecraft add-on featuring high-tech machinery that can be used to create powerful tools, armor, and weapons.')
                 url.set('https://github.com/Thorfusion/Mekanism-Community-Edition')
                 issueManagement {
@@ -270,4 +305,21 @@ publishing {
             }
         }
     }
+    repositories {
+        maven {
+            name = 'thorfusion'
+            url = uri("${publishBaseUrl.get().replaceAll('/+$', '')}/${publishRepository.get()}")
+            credentials {
+                username = providers.environmentVariable('MAVEN_USERNAME').orElse('').get()
+                password = providers.environmentVariable('MAVEN_PASSWORD').orElse('').get()
+            }
+        }
+    }
+}
+
+// Keep the workflow-facing task name while publishing through Gradle's maintained Maven Publish plugin.
+tasks.register('artifactoryPublish') {
+    group = 'publishing'
+    description = 'Publishes the complete artifact set to the configured Maven repository.'
+    dependsOn tasks.named('publishMavenJavaPublicationToThorfusionRepository')
 }

gradle.properties

@@ -1,6 +1,6 @@
 minecraft_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
-FMP_version=1.2.0.345
+FMP_version=1.2.0.347
 CCLIB_version=1.1.3.141
 NEI_version=1.0.5.120
 CCC_version=1.0.7.48

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# 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.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,10 +132,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +146,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +154,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -169,7 +171,6 @@ fi
 # 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" )
 
@@ -197,16 +198,19 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, 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" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,6 +13,8 @@
 @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 ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -0,0 +1,20 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = 'GTNH Maven'
+            url = uri('https://nexus.gtnewhorizons.com/repository/public/')
+            mavenContent {
+                includeGroup 'com.gtnewhorizons'
+                includeGroupByRegex 'com\\.gtnewhorizons\\..+'
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
+
+rootProject.name = 'Mekanism-Community-Edition-1.7.10'