diff --git a/build.gradle b/build.gradle index 0e01fae44f..11cc8fa939 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+' + classpath 'net.minecraftforge.gradle:ForgeGradle:[5.1.26,)' } } @@ -29,6 +29,7 @@ plugins { id 'com.github.ben-manes.versions' version '0.36.0' id 'net.minecraftforge.gradleutils' version '1.+' id 'eclipse' + id 'de.undercouch.download' version '4.1.2' } Util.init() //Init all our extension methods! @@ -64,7 +65,7 @@ ext { SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.10.0' BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar' - INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.2.7' + INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.2.10' JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4' FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.17:all' } @@ -83,6 +84,32 @@ def changelog = rootProject.file('build/changelog.txt') if (changelog.exists()) extraTxts += changelog +task downloadVersionManifest(type: Download) { + src 'https://launchermeta.mojang.com/mc/game/version_manifest_v2.json' + dest file('build/versions/version_manifest.json') + useETag 'all' + onlyIfModified true + quiet true +} +task downloadJson(type: Download, dependsOn: downloadVersionManifest) { + inputs.file downloadVersionManifest.dest + src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url } + dest file("build/versions/${MC_VERSION}/version.json") + useETag 'all' + onlyIfModified true + quiet true +} +['client', 'server'].each { id -> + task "download${id.capitalize()}Raw"(type: Download, dependsOn: downloadJson) { + inputs.file downloadJson.dest + src { downloadJson.dest.json.downloads.get(id).url } + dest file("build/versions/${MC_VERSION}/${id}.jar") + useETag 'all' + onlyIfModified true + quiet true + } +} + subprojects { apply plugin: 'maven-publish' apply plugin: 'eclipse' @@ -247,10 +274,10 @@ def sharedDeps = { installer "net.minecraftforge:coremods:${COREMODS_VERSION}" installer "cpw.mods:modlauncher:${MODLAUNCHER_VERSION}" installer 'net.minecraftforge:unsafe:0.2.+' - installer 'com.electronwill.night-config:core:3.6.3' - installer 'com.electronwill.night-config:toml:3.6.3' + installer 'com.electronwill.night-config:core:3.6.4' + installer 'com.electronwill.night-config:toml:3.6.4' installer 'org.apache.maven:maven-artifact:3.6.3' - installer 'org.apache.commons:commons-lang3:3.8.1' + installer 'org.apache.commons:commons-lang3:3.12.0' installer 'net.jodah:typetools:0.8.3' installer 'org.apache.logging.log4j:log4j-api:2.14.1' installer 'org.apache.logging.log4j:log4j-core:2.14.1' @@ -258,10 +285,10 @@ def sharedDeps = { installer 'org.jline:jline-reader:3.12.+' //Dep of TerminaalConsoleeAppender installer 'org.jline:jline-terminal:3.12.+' //Dep of TerminaalConsoleeAppender installer 'net.sf.jopt-simple:jopt-simple:5.0.4' - installer "org.spongepowered:mixin:${MIXIN_VERSION}" + //installer "org.spongepowered:mixin:${MIXIN_VERSION}" installer 'org.openjdk.nashorn:nashorn-core:15.3' - installer 'com.google.guava:guava:21.0' - installer 'com.google.code.gson:gson:2.8.0' + installer 'com.google.guava:guava:31.0.1-jre' + installer 'com.google.code.gson:gson:2.8.8' /* installer 'org.lwjgl:lwjgl:3.2.2' @@ -448,11 +475,6 @@ def sharedFmlonlyForge = { Project prj -> } def MODULE_PATH = Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{"libraries/${it.downloads.artifact.path}"} - def CLASS_PATH = Util.getArtifacts(prj, prj.configurations.installer, false).values().collect{"libraries/${it.downloads.artifact.path}"} + - [ - 'libraries/' + Util.getMavenPath(rootProject.tasks.findByPath(':fmlloader:jar')), - "libraries/net/minecraft/server/${MC_VERSION}-${MCP_VERSION}/server-${MC_VERSION}-${MCP_VERSION}-extra.jar" - ] def tokens = [ TASK: prj.name.equals('forge') ? 'forgeserver' : 'fmlserver', MAVEN_PATH: prj.ext.MAVEN_PATH.toString(), @@ -463,9 +485,37 @@ def sharedFmlonlyForge = { Project prj -> IGNORE_LIST: Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{it.downloads.artifact.path.rsplit('/', 1)[1]}.join(','), MODULES: 'ALL-MODULE-PATH' ] + + prj.task([dependsOn: rootProject.downloadServerRaw], 'makeClasspathFiles') { + doLast { + def CLASS_PATH = Util.getArtifacts(prj, prj.configurations.installer, false).values().collect{"libraries/${it.downloads.artifact.path}"} + + [ + 'libraries/' + Util.getMavenPath(rootProject.tasks.findByPath(':fmlloader:jar')), + "libraries/net/minecraft/server/${MC_VERSION}-${MCP_VERSION}/server-${MC_VERSION}-${MCP_VERSION}-extra.jar" + ] + def claimed = CLASS_PATH.collect{ it.rsplit('/', 2)[0] }.toSet() // Allow us to override versions + try (def zip = new java.util.zip.ZipFile(rootProject.downloadServerRaw.dest)) { + CLASS_PATH += zip.getInputStream(zip.getEntry('META-INF/classpath-joined')).text.split(';') + .findAll{ it.startsWith('libraries/') && !claimed.contains(it.rsplit('/', 2)[0]) } + } + + configure(prj.installerJar) { + from(rootProject.file('server_files/args.txt')) { + filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(';'), CLASS_PATH: CLASS_PATH.join(';')]) + rename { 'data/win_args.txt' } + } + + from(rootProject.file('server_files/args.txt')) { + filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(':'), CLASS_PATH: CLASS_PATH.join(':')]) + rename { 'data/unix_args.txt' } + } + } + } + } prj.afterEvaluate { prj.installerJar { + dependsOn('makeClasspathFiles') from(rootProject.file('server_files/')) { exclude 'args.txt' filter(ReplaceTokens, tokens: tokens) @@ -473,16 +523,6 @@ def sharedFmlonlyForge = { Project prj -> //rename 'run.sh', "run_forge_${VERSION.replace('-', '_').sh" //rename 'run.bat', "run_forge_${VERSION.replace('-', '_').bat" } - - from(rootProject.file('server_files/args.txt')) { - filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(';'), CLASS_PATH: CLASS_PATH.join(';')]) - rename { 'data/win_args.txt' } - } - - from(rootProject.file('server_files/args.txt')) { - filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(':'), CLASS_PATH: CLASS_PATH.join(':')]) - rename { 'data/unix_args.txt' } - } } } } @@ -622,6 +662,10 @@ project(':fmlonly') { client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@txt]", server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@txt]" ], + MC_UNPACKED: [ + client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:unpacked]", + server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:unpacked]" + ], MC_SLIM: [ client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:slim]", server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:slim]" @@ -682,6 +726,26 @@ project(':fmlonly') { '--from', 'data/unix_args.txt', '--to', "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt" ] + ], [ + sides: ['server'], + jar: INSTALLER_TOOLS, + classpath: getClasspath(project, libs, INSTALLER_TOOLS), + args: [ + '--task', 'BUNDLER_EXTRACT', + '--input', '{MINECRAFT_JAR}', + '--output', '{ROOT}/libraries/', + '--libraries' + ] + ], [ + sides: ['server'], + jar: INSTALLER_TOOLS, + classpath: getClasspath(project, libs, INSTALLER_TOOLS), + args: [ + '--task', 'BUNDLER_EXTRACT', + '--input', '{MINECRAFT_JAR}', + '--output', '{MC_UNPACKED}', + '--jar-only' + ] ], [ jar: INSTALLER_TOOLS, classpath: getClasspath(project, libs, INSTALLER_TOOLS), @@ -711,11 +775,26 @@ project(':fmlonly') { '--classes', '--reverse-right' ] ], [ + sides: ['client'], jar: JAR_SPLITTER, classpath: getClasspath(project, libs, JAR_SPLITTER), args: [ '--input', '{MINECRAFT_JAR}', - '--slim', '{MC_SLIM}', + '--slim', '{MC_SLIM}', + '--extra', '{MC_EXTRA}', + '--srg', '{MERGED_MAPPINGS}' + ], + outputs: [ + '{MC_SLIM}': '{MC_SLIM_SHA}', + '{MC_EXTRA}': '{MC_EXTRA_SHA}' + ] + ], [ + sides: ['server'], + jar: JAR_SPLITTER, + classpath: getClasspath(project, libs, JAR_SPLITTER), + args: [ + '--input', '{MC_UNPACKED}', + '--slim', '{MC_SLIM}', '--extra', '{MC_EXTRA}', '--srg', '{MERGED_MAPPINGS}' ], @@ -1136,6 +1215,10 @@ project(':forge') { client: '/data/client.lzma', server: '/data/server.lzma' ], + MC_UNPACKED: [ + client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:unpacked]", + server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:unpacked]" + ], MC_SLIM: [ client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:slim]", server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:slim]" @@ -1204,6 +1287,26 @@ project(':forge') { '--from', 'data/unix_args.txt', '--to', "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt" ] + ], [ + sides: ['server'], + jar: INSTALLER_TOOLS, + classpath: getClasspath(project, libs, INSTALLER_TOOLS), + args: [ + '--task', 'BUNDLER_EXTRACT', + '--input', '{MINECRAFT_JAR}', + '--output', '{ROOT}/libraries/', + '--libraries' + ] + ], [ + sides: ['server'], + jar: INSTALLER_TOOLS, + classpath: getClasspath(project, libs, INSTALLER_TOOLS), + args: [ + '--task', 'BUNDLER_EXTRACT', + '--input', '{MINECRAFT_JAR}', + '--output', '{MC_UNPACKED}', + '--jar-only' + ] ], [ jar: INSTALLER_TOOLS, classpath: getClasspath(project, libs, INSTALLER_TOOLS), @@ -1233,6 +1336,7 @@ project(':forge') { '--classes', '--reverse-right' ] ], [ + sides: ['client'], jar: JAR_SPLITTER, classpath: getClasspath(project, libs, JAR_SPLITTER), args: [ @@ -1245,6 +1349,20 @@ project(':forge') { '{MC_SLIM}': '{MC_SLIM_SHA}', '{MC_EXTRA}': '{MC_EXTRA_SHA}' ] + ], [ + sides: ['server'], + jar: JAR_SPLITTER, + classpath: getClasspath(project, libs, JAR_SPLITTER), + args: [ + '--input', '{MC_UNPACKED}', + '--slim', '{MC_SLIM}', + '--extra', '{MC_EXTRA}', + '--srg', '{MERGED_MAPPINGS}' + ], + outputs: [ + '{MC_SLIM}': '{MC_SLIM_SHA}', + '{MC_EXTRA}': '{MC_EXTRA_SHA}' + ] ], [ jar: FART, classpath: getClasspath(project, libs, FART), @@ -1369,7 +1487,8 @@ project(':forge') { } reobfJar { - tool = SPECIAL_SOURCE + ':shaded' + tool = FART + args = ['--input', '{input}', '--output', '{output}', '--map', '{srg}'] } tasks.eclipse.dependsOn('genEclipseRuns') diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy index 2a785fb2bc..5b6903e09f 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy @@ -1,5 +1,6 @@ package net.minecraftforge.forge.tasks +import groovy.json.JsonBuilder import groovy.json.JsonSlurper import java.io.File @@ -16,8 +17,11 @@ public class Util { } return md.digest().collect {String.format "%02x", it}.join() } + File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() } File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) } + File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] } + File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() } Date.metaClass.iso8601 = { -> def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ") diff --git a/mdk/src/main/java/com/example/examplemod/ExampleMod.java b/mdk/src/main/java/com/example/examplemod/ExampleMod.java index 4def3a4389..27476beb1f 100644 --- a/mdk/src/main/java/com/example/examplemod/ExampleMod.java +++ b/mdk/src/main/java/com/example/examplemod/ExampleMod.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.event.server.FMLServerStartingEvent; +import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -58,7 +58,7 @@ public class ExampleMod } // You can use SubscribeEvent and let the Event Bus discover methods to call @SubscribeEvent - public void onServerStarting(FMLServerStartingEvent event) { + public void onServerStarting(ServerStartingEvent event) { // do something when the server starts LOGGER.info("HELLO from server starting"); }