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

Fix server jar manifest path.

Browse source
This commit is contained in:
LexManos 2019-09-23 18:42:54 -07:00
parent 01a862db30
commit 583ff81dba
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -791,16 +791,16 @@ project(':forge') {
server: '/data/server.lzma' server: '/data/server.lzma'
], ],
MC_SLIM: [ MC_SLIM: [
client: "[net.minecraft:client:${MC_VERSION}:slim-stable]", client: "[net.minecraft:client:${MC_VERSION}:slim${MC_VERSION == '1.14.4' ? '-stable' : ''}]",
server: "[net.minecraft:server:${MC_VERSION}:slim-stable]" server: "[net.minecraft:server:${MC_VERSION}:slim${MC_VERSION == '1.14.4' ? '-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-stable]", client: "[net.minecraft:client:${MC_VERSION}:extra${MC_VERSION == '1.14.4' ? '-stable' : ''}]",
server: "[net.minecraft:server:${MC_VERSION}:extra-stable]" server: "[net.minecraft:server:${MC_VERSION}:extra${MC_VERSION == '1.14.4' ? '-stable' : ''}]"
], ],
MC_EXTRA_SHA: [ MC_EXTRA_SHA: [
client: "'${sha1(tasks.getByName('downloadClientExtra').output)}'", client: "'${sha1(tasks.getByName('downloadClientExtra').output)}'",
@ -888,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}-stable:${type}" artifact = "net.minecraft:${side}:${MC_VERSION}${MC_VERSION == '1.14.4' ? '-stable' : ''}:${type}"
} }
installerJson.dependsOn(name) installerJson.dependsOn(name)
installerJson.inputs.file(tasks.getByName(name).output) installerJson.inputs.file(tasks.getByName(name).output)
@ -941,7 +941,7 @@ project(':forge') {
artifacts.each { key, lib -> artifacts.each { key, lib ->
classpath += "libraries/${lib.downloads.artifact.path} " classpath += "libraries/${lib.downloads.artifact.path} "
} }
classpath += "libraries/net/minecraft/server/${MC_VERSION}/server-${MC_VERSION}-extra.jar" classpath += "libraries/net/minecraft/server/${MC_VERSION}/server-${MC_VERSION}-extra${MC_VERSION == '1.14.4' ? '-stable' : ''}.jar"
MANIFESTS.each{ pkg, values -> MANIFESTS.each{ pkg, values ->
if (pkg == '/') { if (pkg == '/') {