diff --git a/build.gradle b/build.gradle deleted file mode 100644 index b641348b4..000000000 --- a/build.gradle +++ /dev/null @@ -1,202 +0,0 @@ -import java.nio.file.Files - -buildscript { - repositories { - jcenter() - maven { url = "https://files.minecraftforge.net/maven" } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - } -} -apply plugin: 'net.minecraftforge.gradle.forge' - -apply plugin: 'maven-publish' - -version = "${mod_version}" -group = "it.hurts.metallurgy_reforged" -archivesBaseName = "Metallurgy-4-Reforged" - -sourceCompatibility = targetCompatibility = '1.8' -compileJava { - sourceCompatibility = targetCompatibility = '1.8' -} - -minecraft { - version = "${minecraft_version}-${forge_version}" - runDir = "run" - mappings = "stable_39" - - //replace "@VERSION@", project.version - //replaceIn "Metallurgy.java" -} - -repositories { - - //Maven central repository (Groovy) - maven { - url 'https://repo.maven.apache.org/maven2' - name 'Maven Central' - } - - //location of the maven that hosts JEI & TCon - maven { - name = "Progwml6 maven" - url = "https://dvs1.progwml6.com/files/maven" - } - - //JEI maven fallback - maven { - name = "ModMaven" - url = "modmaven.k-4u.nl" - } - - //Jared's Maven Repository (CraftTweaker) - maven { - name = 'jared maven' - url "https://maven.blamejared.com/" - } - - maven { - name = 'curse maven' - url = "https://www.cursemaven.com" - } - - //CurseForge maven as a final fallback (shouldn't be used at all as of this commit) - maven { - name = "CurseForge" - url = "https://minecraft.curseforge.com/api/maven/" - } -} - -dependencies { - - //api = this is a dependency required both at runtime and at compile time. Moreover it is transitive (i.e. if A depends on B and B depends on C via api, then A can access C) - //implementation = this is a dependency required both at runtime and at compile time. It is not transitive (i.e. if A depends on B and B depends on C via implementation, then A cannot access C) - //runtimeOnly = this is a dependency only required at runtime. It won't be present at compile time - //compileOnly = this is a dependency only required at compile time. It won't be present at runtime - - //compileOnly doesn't always stop things from loading at runtime - - //provided = same as compileOnly, don't use - //compile = same as api, don't use - //runtime = same as runtimeOnly, don't use - - implementation('org.codehaus.groovy:groovy-all:3.0.8') - - //Compile against the JEI API but do not include it at runtime - compileOnly 'mezz.jei:jei_1.12.2:4.15.+:api' - - //At runtime, use the full JEI jar - runtimeOnly 'mezz.jei:jei_1.12.2:4.15.+' - - //Tinker Construct & Mantle - implementation 'slimeknights.mantle:Mantle:1.12-1.3.3.56' - implementation 'slimeknights:TConstruct:1.12.2-2.13.0.184' - - compileOnly 'curse.maven:constructs_armory_1.2.5.10-287683:3174535' - - //Industrial Foregoing - compileOnly 'curse.maven:industrialforegoing_api-266515:2745323' - - //CraftTweaker - compileOnly 'CraftTweaker2:CraftTweaker2-API:4.1.20.631' - //compileOnly 'CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.586' - - //ProjectE - compileOnly 'curse.maven:projecte_1.4.1-226410:2702991' - - //Silent's Gems - compileOnly 'curse.maven:silent_lib_3.0.14+168-242998:2851111' - compileOnly 'curse.maven:silents_gems_2.8.22+237-220311:2804966' - - //Immersive Engineering - compileOnly 'curse.maven:immersive_engineering_0.12_98-231951:2974106' - - //Spartan Weaponry - compileOnly 'curse.maven:spartanweaponry_1.5.3-278141:4467344' -} - -processResources { - - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} - -jar { - manifest { - attributes 'FMLAT': 'metallurgy_at.cfg' - } - destinationDir = file 'output' -} - -sourceJar { - destinationDir = file 'output' -} - -clean { - delete 'output' - delete 'mcmodsrepo' -} - -//Used to stop the server just after it's started correctly if we're in a CI Environment -tasks.register('setupCiEnv', { task -> - task.group = 'build setup' - task.description = 'setups files to run CI Tests' - - doFirst { - File ciEnvFile = new File(projectDir.getPath() + File.separatorChar + "ci_env") - if (!ciEnvFile.exists()) - Files.createFile(ciEnvFile.toPath()) - - File eula = new File("${projectDir.getPath()}/run") - eula.mkdir() - FileWriter writer = new FileWriter("${eula.getPath()}/eula.txt") - writer.write("eula=true") - writer.close() - } -}) - -/*============================================================================== - = Class: build - = This class is part of Metallurgy 4: Reforged - = Complete source code is available at https://github.com/Davoleo/Metallurgy-4-Reforged - = This code is licensed under GNU GPLv3 - = Authors: Davoleo, ItHurtsLikeHell, PierKnight100 - = Copyright (c) 2018-2021. - =============================================================================*/ - -//Maven Repository -publishing { - publications { - metallurgy(MavenPublication) { - groupId = 'io.github.davoleo' - artifactId = 'metallurgy-4-reforged' - from components.java - } - } - repositories { - maven { - name "local" - url "file:///${project.projectDir}/mcmodsrepo" - } - - maven { - name "github" - url "https://maven.pkg.github.com/Davoleo/Metallurgy-4-Reforged" - credentials { - username = "" - password = "" - } - } - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..ca7602225 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,321 @@ +import org.jetbrains.gradle.ext.Application +import org.jetbrains.gradle.ext.Gradle +import org.jetbrains.gradle.ext.RunConfigurationContainer +import java.io.FileWriter +import java.nio.file.Files + +plugins { + id("java-library") + id("maven-publish") + id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.8" + id("eclipse") + id("com.gtnewhorizons.retrofuturagradle") version "1.4.0" +} + +//Project Properties +version = "${project.version}" +group = "it.hurts.metallurgy_reforged" + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + //Azul covers most of the platforms for Java 8 toolchains + vendor.set(JvmVendorSpec.AZUL) + } + //Generate sources and javadocs jars when building and publishing + withSourcesJar() + withJavadocJar() +} + +/** + * Most TFG configuration lives here [JavaDoc: com.gtnewhorizons.retrofuturagradle.MinecraftExtension ] + */ +minecraft { + mcVersion.set("1.12.2") + + //Username for client run configurations + //username.set("Developer") + + // Generate a field named VERSION with the mod version in the injected Tags class + injectedTags.put("VERSION", project.version) + + // If you need the old replaceIn mechanism, prefer the injectTags task because it doesn't inject a javac plugin. + // tagReplacementFiles.add("RfgExampleMod.java") + +// tagReplacementFiles.add("Metallurgy.java") +// replace(Regex("@VERSION@"), project.version) + + + // Enable assertions in the mod's package when running the client or server + extraRunJvmArguments.add("-ea:${project.group}") + + // If needed, add extra tweaker classes like for mixins. + // extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") + + // Exclude some Maven dependency groups from being automatically included in the reobfuscated runs + groupsToExcludeFromAutoReobfMapping.addAll("com.diffplug", "com.diffplug.durian", "net.industrial-craft") + + useForgeEmbeddedMappings.set(false) + +} + +// Generates a class named rfg.examplemod.Tags with the mod version in it, you can find it at +tasks.injectTags.configure { + outputClassName.set("${project.group}.Tags") +} + +// Put the version from gradle into mcmod.info +tasks.processResources.configure { + val projVersion = project.version.toString() // Needed for configuration cache to work + inputs.property("version", projVersion) + + filesMatching("mcmod.info") { + expand(mapOf("modVersion" to projVersion)) + } +} + +// Create a new dependency type for runtime-only dependencies that don't get included in the maven publication +val runtimeOnlyNonPublishable: Configuration by configurations.creating { + description = "Runtime only dependencies that are not published alongside the jar" + isCanBeConsumed = false + isCanBeResolved = false +} +listOf(configurations.runtimeClasspath, configurations.testRuntimeClasspath).forEach { + it.configure { + extendsFrom( + runtimeOnlyNonPublishable + ) + } +} + +// Add an access tranformer +tasks.deobfuscateMergedJarToSrg.configure { accessTransformerFiles.from("src/main/resources/META-INF/metallurgy_at.cfg") } + +repositories { + + //Maven central repository (Groovy) + maven { + name = "Maven Central" + url = uri("https://repo.maven.apache.org/maven2") + } + + //location of the maven that hosts JEI & TCon + maven { + name = "Progwml6 maven" + url = uri("https://dvs1.progwml6.com/files/maven") + } + + //JEI maven fallback + maven { + name = "ModMaven" + url = uri("modmaven.k-4u.nl") + } + + //Jared's Maven Repository (CraftTweaker) + maven { + name = "jared maven" + url = uri("https://maven.blamejared.com/") + } + + maven { + name = "curse maven" + url = uri("https://www.cursemaven.com") + } + + //CurseForge maven as a final fallback (shouldn't be used at all as of this commit) + maven { + name = "CurseForge" + url = uri("https://minecraft.curseforge.com/api/maven/") + } +} + +dependencies { + + //api = this is a dependency required both at runtime and at compile time. Moreover it is transitive (i.e. if A depends on B and B depends on C via api, then A can access C) + //implementation = this is a dependency required both at runtime and at compile time. It is not transitive (i.e. if A depends on B and B depends on C via implementation, then A cannot access C) + //runtimeOnly = this is a dependency only required at runtime. It won't be present at compile time + //compileOnly = this is a dependency only required at compile time. It won't be present at runtime + + //compileOnly doesn't always stop things from loading at runtime + + //provided = same as compileOnly, don't use + //compile = same as api, don't use + //runtime = same as runtimeOnly, don't use + + implementation("org.codehaus.groovy:groovy-all:3.0.8") + + //Compile against the JEI API but do not include it at runtime + compileOnly(rfg.deobf("mezz.jei:jei_1.12.2:4.15.+:api")) + + //At runtime, use the full JEI jar + runtimeOnly(rfg.deobf("mezz.jei:jei_1.12.2:4.15.+")) + + //Tinker Construct & Mantle + implementation(rfg.deobf("slimeknights.mantle:Mantle:1.12-1.3.3.56")) + implementation(rfg.deobf("slimeknights:TConstruct:1.12.2-2.13.0.184")) + + compileOnly(rfg.deobf("curse.maven:constructs_armory_1.2.5.10-287683:3174535")) + + //Industrial Foregoing + compileOnly(rfg.deobf("curse.maven:industrialforegoing_api-266515:2745323")) + + //CraftTweaker + compileOnly(rfg.deobf("CraftTweaker2:CraftTweaker2-API:4.1.20.631")) + //compileOnly 'CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.586' + + //ProjectE + compileOnly(rfg.deobf("curse.maven:projecte_1.4.1-226410:2702991")) + + //Silent's Gems + compileOnly(rfg.deobf("curse.maven:silent_lib_3.0.14+168-242998:2851111")) + compileOnly(rfg.deobf("curse.maven:silents_gems_2.8.22+237-220311:2804966")) + + //Immersive Engineering + compileOnly(rfg.deobf("curse.maven:immersive_engineering_0.12_98-231951:2974106")) + + //Spartan Weaponry + compileOnly(rfg.deobf("curse.maven:spartanweaponry_1.5.3-278141:4467344")) +} + + +//jar { +// destinationDir = file("output") +//} +// +//sourceJar { +// destinationDir = file("output") +//} + +//clean { +// delete("output") +// delete("mcmodsrepo") +//} + +//Used to stop the server just after it's started correctly if we're in a CI Environment +tasks.register("setupCiEnv") { //task -> + //task.group = "build setup" + //task.description = "setups files to run CI Tests" + + doFirst { + val ciEnvFile = File(projectDir.getPath() + File.separatorChar + "ci_env") + if (!ciEnvFile.exists()) + Files.createFile(ciEnvFile.toPath()) + + val eula = File("${projectDir.getPath()}/run") + eula.mkdir() + val writer = FileWriter("${eula.getPath()}/eula.txt") + writer.write("eula=true") + writer.close() + } +} + +// IDE Settings +eclipse { + classpath { + isDownloadSources = true + isDownloadJavadoc = true + } +} + +idea { + module { + isDownloadJavadoc = true + isDownloadSources = true + inheritOutputDirs = true // Fix resources in IJ-Native runs + } + project { + this.withGroovyBuilder { + "settings" { + "runConfigurations" { + val self = this.delegate as RunConfigurationContainer + self.add(Gradle("1. Run Client").apply { + setProperty("taskNames", listOf("runClient")) + }) + self.add(Gradle("2. Run Server").apply { + setProperty("taskNames", listOf("runServer")) + }) + self.add(Gradle("3. Run Obfuscated Client").apply { + setProperty("taskNames", listOf("runObfClient")) + }) + self.add(Gradle("4. Run Obfuscated Server").apply { + setProperty("taskNames", listOf("runObfServer")) + }) + + //These require extra configuration in IntelliJ, so are not enabled by default + self.add(Application("Run Client (IJ Native, Deprecated)", project).apply { + mainClass = "GradleStart" + moduleName = project.name + ".ideVirtualMain" + afterEvaluate { + val runClient = tasks.runClient.get() + workingDirectory = runClient.workingDir.absolutePath + programParameters = runClient.calculateArgs().map { '"' + it + '"' }.joinToString(" ") + jvmArgs = runClient.calculateJvmArgs().map { '"' + it + '"' }.joinToString(" ") + + ' ' + runClient.systemProperties.map { "\"-D" + it.key + '=' + it.value.toString() + '"' } + .joinToString(" ") + } + }) + self.add(Application("Run Server (IJ Native, Deprecated)", project).apply { + mainClass = "GradleStartServer" + moduleName = project.name + ".ideVirtualMain" + afterEvaluate { + val runServer = tasks.runServer.get() + workingDirectory = runServer.workingDir.absolutePath + programParameters = runServer.calculateArgs().map { '"' + it + '"' }.joinToString(" ") + jvmArgs = runServer.calculateJvmArgs().map { '"' + it + '"' }.joinToString(" ") + + ' ' + runServer.systemProperties.map { "\"-D" + it.key + '=' + it.value.toString() + '"' } + .joinToString(" ") + } + }) + } + "compiler" { + val self = this.delegate as org.jetbrains.gradle.ext.IdeaCompilerConfiguration + afterEvaluate { + self.javac.moduleJavacAdditionalOptions = mapOf( + (project.name + ".main") to + tasks.compileJava.get().options.compilerArgs.map { '"' + it + '"' } + .joinToString(" ") + ) + } + } + } + } + } +} + +tasks.processIdeaSettings.configure { + dependsOn(tasks.injectTags) +} + +/*============================================================================== + = Class: build + = This class is part of Metallurgy 4: Reforged + = Complete source code is available at https://github.com/Davoleo/Metallurgy-4-Reforged + = This code is licensed under GNU GPLv3 + = Authors: Davoleo, ItHurtsLikeHell, PierKnight100 + = Copyright (c) 2018-2021. + =============================================================================*/ + + +//Maven Repository +publishing { + publications { + create("maven") { + from(components["java"]) + } + } + repositories { + maven { + name = "local" + url = uri("file:///${project.projectDir.toString().replace('\\', '/')}/mcmodsrepo") + } + + maven { + name = "github" + url = uri("https://maven.pkg.github.com/Davoleo/Metallurgy-4-Reforged") + credentials { + username = "" + password = "" + } + } + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a95168..e6441136f 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 6cae82c15..a4413138c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,14 +1,7 @@ -#=============================================================================== -# Class: gradle-wrapper.properties -# This class is part of Metallurgy 4: Reforged -# Complete source code is available at https://github.com/Davoleo/Metallurgy-4-Reforged -# This code is licensed under GNU GPLv3 -# Authors: Davoleo, ItHurtsLikeHell, PierKnight100 -# Copyright (c) 2018-2021. -#=============================================================================== - distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 08b3ad8a5..b740cf133 100644 --- a/gradlew +++ b/gradlew @@ -1,87 +1,127 @@ -#!/usr/bin/env sh - -#=============================================================================== -# Class: gradlew -# This class is part of Metallurgy 4: Reforged -# Complete source code is available at https://github.com/Davoleo/Metallurgy-4-Reforged -# This code is licensed under GNU GPLv3 -# Authors: Davoleo, ItHurtsLikeHell, PierKnight100 -# Copyright (c) 2018-2021. -#=============================================================================== +#!/bin/sh + +# +# Copyright © 2015-2021 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. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -90,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the 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. + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=$((i+1)) + # 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 - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/gradlew.bat b/gradlew.bat index e95643d6a..7101f8e46 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +25,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +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= +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%" == "0" goto init +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 @@ -35,48 +55,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +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 -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :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 %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..87a5f3332 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,32 @@ +/*============================================================================== + = Class: settings.gradle + = This class is part of Metallurgy 4: Reforged + = Complete source code is available at https://github.com/Davoleo/Metallurgy-4-Reforged + = This code is licensed under GNU GPLv3 + = Authors: Davoleo, ItHurtsLikeHell, PierKnight100 + = Copyright (c) 2018-2024. + =============================================================================*/ + +rootProject.name = "Metallurgy-4-Reforged" + +pluginManagement { + repositories { + maven { + // RetroFuturaGradle + name = "GTNH Maven" + url = uri("https://nexus.gtnewhorizons.com/repository/public/") + mavenContent { + includeGroupByRegex("com\\.gtnewhorizons\\..+") + includeGroup("com.gtnewhorizons") + } + } + gradlePluginPortal() + mavenCentral() + mavenLocal() + } +} + +plugins { + //Automatic toolchain provisioning + id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" +} \ No newline at end of file diff --git a/src/main/java/it/hurts/metallurgy_reforged/Metallurgy.java b/src/main/java/it/hurts/metallurgy_reforged/Metallurgy.java index bc629411f..0ef7999ee 100644 --- a/src/main/java/it/hurts/metallurgy_reforged/Metallurgy.java +++ b/src/main/java/it/hurts/metallurgy_reforged/Metallurgy.java @@ -61,7 +61,7 @@ public class Metallurgy { public static final String MODID = "metallurgy"; public static final String NAME = "Metallurgy 4: Reforged"; - public static final String VERSION = "1.4.1"; + public static final String VERSION = "@VERSION@"; public static Logger logger; diff --git a/src/main/java/it/hurts/metallurgy_reforged/capabilities/effect/BlockInfoDataBundle.java b/src/main/java/it/hurts/metallurgy_reforged/capabilities/effect/BlockInfoDataBundle.java index 16c6d1664..eeb19f657 100644 --- a/src/main/java/it/hurts/metallurgy_reforged/capabilities/effect/BlockInfoDataBundle.java +++ b/src/main/java/it/hurts/metallurgy_reforged/capabilities/effect/BlockInfoDataBundle.java @@ -9,13 +9,14 @@ package it.hurts.metallurgy_reforged.capabilities.effect; -import jline.internal.Nullable; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.FMLCommonHandler; +import javax.annotation.Nullable; + public class BlockInfoDataBundle extends ExtraFilledDataBundle { private BlockPos pos; diff --git a/src/main/java/it/hurts/metallurgy_reforged/material/MetalStats.java b/src/main/java/it/hurts/metallurgy_reforged/material/MetalStats.java index 0bef6b0f4..076beb003 100644 --- a/src/main/java/it/hurts/metallurgy_reforged/material/MetalStats.java +++ b/src/main/java/it/hurts/metallurgy_reforged/material/MetalStats.java @@ -19,7 +19,6 @@ import it.hurts.metallurgy_reforged.item.armor.ItemArmorBase; import it.hurts.metallurgy_reforged.item.tool.*; import it.hurts.metallurgy_reforged.util.Constants; -import jline.internal.Nullable; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; @@ -27,6 +26,8 @@ import net.minecraft.item.ItemTool; import net.minecraftforge.common.util.EnumHelper; +import javax.annotation.Nullable; + public class MetalStats { //Name of the material in snake_case diff --git a/src/main/java/it/hurts/metallurgy_reforged/util/EventUtils.java b/src/main/java/it/hurts/metallurgy_reforged/util/EventUtils.java index a85a80dc0..40a72050f 100644 --- a/src/main/java/it/hurts/metallurgy_reforged/util/EventUtils.java +++ b/src/main/java/it/hurts/metallurgy_reforged/util/EventUtils.java @@ -14,7 +14,6 @@ import it.hurts.metallurgy_reforged.item.tool.EnumTools; import it.hurts.metallurgy_reforged.material.Metal; import it.hurts.metallurgy_reforged.material.ModMetals; -import jline.internal.Nullable; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -29,6 +28,7 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index d19bce298..1154cf59e 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "metallurgy", "name": "Metallurgy 4: Reforged", "description": "The Unofficial Port of Metallurgy 4", - "version": "1.4.1", + "version": "modVersion", "mcversion": "1.12.2", "url": "https://github.com/Davoleo/Metallurgy-4-Reforged", "updateUrl": "",