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

More installer related tweaks.

Browse source
This commit is contained in:
LexManos 2018-10-01 20:27:05 -07:00
parent 2b4f7b1a86
commit 39307856b5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.gradle
View file

@ -340,7 +340,7 @@ project(':forge') {
inheritsFrom: MC_VERSION, inheritsFrom: MC_VERSION,
logging: [:], logging: [:],
arguments: [ arguments: [
game: json_vanilla.arguments.game + ['--launchTarget', 'fmlclient'] game: ['--launchTarget', 'fmlclient']
], ],
libraries: [ libraries: [
[ [
@ -348,7 +348,7 @@ project(':forge') {
downloads: [ downloads: [
artifact: [ artifact: [
path: "${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar", path: "${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar",
url: null, //Do not include the URL so that the installer/launcher won't grab it. This is also why we don't have the universal classifier url: "", //Do not include the URL so that the installer/launcher won't grab it. This is also why we don't have the universal classifier
sha1: sha1(universalJar.archivePath), sha1: sha1(universalJar.archivePath),
size: universalJar.archivePath.length() size: universalJar.archivePath.length()
] ]
@ -506,10 +506,10 @@ project(':forge') {
manifest.attributes([ manifest.attributes([
'Main-Class': 'net.minecraftforge.server.ServerMain', 'Main-Class': 'net.minecraftforge.server.ServerMain',
'Class-Path': classpath.toString(),
'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), 'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
'GitCommit': grgit.head().getAbbreviatedId(8), 'GitCommit': grgit.head().getAbbreviatedId(8),
'Git-Branch': grgit.branch.current().getName() 'Git-Branch': grgit.branch.current().getName(),
'Class-Path': classpath.toString()
] as LinkedHashMap) ] as LinkedHashMap)
manifest.attributes([ manifest.attributes([
'Specification-Title': 'Forge', 'Specification-Title': 'Forge',
@ -571,6 +571,7 @@ project(':forge') {
} }
from(universalJar) { from(universalJar) {
into "/maven/${project.group.replace('.', '/')}/${project.name}/${project.version}/" into "/maven/${project.group.replace('.', '/')}/${project.name}/${project.version}/"
rename { "${project.name}-${project.version}.jar" }
} }
from(installerJson.output) from(installerJson.output)
from(launcherJson.output) from(launcherJson.output)