keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Bump binpatcher and jarsplitter versions to address Java differences on older JDKs.

Browse source
This commit is contained in:
LexManos 2019-09-22 17:30:29 -07:00
parent 0492b25335
commit 48cf910626
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
build.gradle
View file

@ -187,6 +187,7 @@ project(':forge') {
MCP_ARTIFACT = project(':mcp').mcp.config MCP_ARTIFACT = project(':mcp').mcp.config
SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.8.5' SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.8.5'
VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json') VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json')
BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.6:fatjar'
} }
def getVersion = { def getVersion = {
@ -487,17 +488,23 @@ project(':forge') {
} }
// We apply the bin patches we just created to make a jar that is JUST our changes // We apply the bin patches we just created to make a jar that is JUST our changes
genClientBinPatches.tool = BINPATCH_TOOL
task applyClientBinPatches(type: ApplyBinPatches, dependsOn: genClientBinPatches) { task applyClientBinPatches(type: ApplyBinPatches, dependsOn: genClientBinPatches) {
clean = { genClientBinPatches.cleanJar } clean = { genClientBinPatches.cleanJar }
input = genClientBinPatches.output input = genClientBinPatches.output
tool = BINPATCH_TOOL
} }
genServerBinPatches.tool = BINPATCH_TOOL
task applyServerBinPatches(type: ApplyBinPatches, dependsOn: genServerBinPatches) { task applyServerBinPatches(type: ApplyBinPatches, dependsOn: genServerBinPatches) {
clean = { genServerBinPatches.cleanJar } clean = { genServerBinPatches.cleanJar }
input = genServerBinPatches.output input = genServerBinPatches.output
tool = BINPATCH_TOOL
} }
genJoinedBinPatches.tool = BINPATCH_TOOL
task applyJoinedBinPatches(type: ApplyBinPatches, dependsOn: genJoinedBinPatches) { task applyJoinedBinPatches(type: ApplyBinPatches, dependsOn: genJoinedBinPatches) {
clean = { genJoinedBinPatches.cleanJar } clean = { genJoinedBinPatches.cleanJar }
input = genJoinedBinPatches.output input = genJoinedBinPatches.output
tool = BINPATCH_TOOL
} }
// Create SRG named Vanilla jars, using the SpecialSource we have in the installer // Create SRG named Vanilla jars, using the SpecialSource we have in the installer
task createClientSRG(type: RenameJar, dependsOn: genClientBinPatches) { task createClientSRG(type: RenameJar, dependsOn: genClientBinPatches) {
@ -736,10 +743,10 @@ project(':forge') {
ext { ext {
output = file('build/install_profile.json') output = file('build/install_profile.json')
INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.1.4' INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.1.4'
JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.0' JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.1'
} }
doFirst { doFirst {
ext.BIN_PATCHER = 'net.minecraftforge:binarypatcher:' + genClientBinPatches.resolvedVersion ext.BIN_PATCHER = BINPATCH_TOOL.substring(0, BINPATCH_TOOL.length() - 1 - BINPATCH_TOOL.split(':')[3].length())
} }
inputs.file applyClientBinPatches.output inputs.file applyClientBinPatches.output
inputs.file applyServerBinPatches.output inputs.file applyServerBinPatches.output
@ -784,16 +791,16 @@ project(':forge') {
server: '/data/server.lzma' server: '/data/server.lzma'
], ],
MC_SLIM: [ MC_SLIM: [
client: "[net.minecraft:client:${MC_VERSION}:slim]", client: "[net.minecraft:client:${MC_VERSION}:slim-stable]",
server: "[net.minecraft:server:${MC_VERSION}:slim]" server: "[net.minecraft:server:${MC_VERSION}:slim-stable]"
], ],
MC_SLIM_SHA: [ MC_SLIM_SHA: [
client: "'${sha1(tasks.getByName('downloadClientSlim').output)}'", client: "'${sha1(tasks.getByName('downloadClientSlim').output)}'",
server: "'${sha1(tasks.getByName('downloadServerSlim').output)}'" server: "'${sha1(tasks.getByName('downloadServerSlim').output)}'"
], ],
MC_EXTRA: [ MC_EXTRA: [
client: "[net.minecraft:client:${MC_VERSION}:extra]", client: "[net.minecraft:client:${MC_VERSION}:extra-stable]",
server: "[net.minecraft:server:${MC_VERSION}:extra]" server: "[net.minecraft:server:${MC_VERSION}:extra-stable]"
], ],
MC_EXTRA_SHA: [ MC_EXTRA_SHA: [
client: "'${sha1(tasks.getByName('downloadClientExtra').output)}'", client: "'${sha1(tasks.getByName('downloadClientExtra').output)}'",
@ -881,7 +888,7 @@ project(':forge') {
['slim', 'extra'].each { type -> ['slim', 'extra'].each { type ->
def name = "download${side.capitalize()}${type.capitalize()}" def name = "download${side.capitalize()}${type.capitalize()}"
task "${name}"(type: DownloadMavenArtifact) { task "${name}"(type: DownloadMavenArtifact) {
artifact = "net.minecraft:${side}:${MC_VERSION}:${type}" artifact = "net.minecraft:${side}:${MC_VERSION}-stable:${type}"
} }
installerJson.dependsOn(name) installerJson.dependsOn(name)
installerJson.inputs.file(tasks.getByName(name).output) installerJson.inputs.file(tasks.getByName(name).output)

2
src/fmllauncher/java/net/minecraftforge/fml/loading/LibraryFinder.java
View file

@ -79,7 +79,7 @@ public class LibraryFinder {
static Path[] getMCPaths(final String mcVersion, final String mcpVersion, final String forgeVersion, final String forgeGroup, final String type) { static Path[] getMCPaths(final String mcVersion, final String mcpVersion, final String forgeVersion, final String forgeGroup, final String type) {
Path srgMcPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "srg", mcVersion+"-"+mcpVersion)); Path srgMcPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "srg", mcVersion+"-"+mcpVersion));
Path mcExtrasPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "extra", mcVersion)); Path mcExtrasPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "1.14.4".equals(mcVersion) ? "extra-stable" : "extra", mcVersion));
Path patchedBinariesPath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", type, mcVersion+"-"+forgeVersion)); Path patchedBinariesPath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", type, mcVersion+"-"+forgeVersion));
LOGGER.debug(CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath)); LOGGER.debug(CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath));
LOGGER.debug(CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath)); LOGGER.debug(CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath));