diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle index 58332698..fb518095 100644 --- a/forge-1.12.2/build.gradle +++ b/forge-1.12.2/build.gradle @@ -13,11 +13,10 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle.forge' -apply plugin: 'com.github.johnrengelman.shadow' dependencies { - compile project(path: ":DynmapCoreAPI", configuration: "shadow") - compile project(path: ":DynmapCore", configuration: "shadow") + compile project(":DynmapCore") + compile project(":DynmapCoreAPI") } sourceCompatibility = 1.8 @@ -62,16 +61,31 @@ processResources rename '(.+_at.cfg)', 'META-INF/$1' } -shadowJar { - dependencies { - include(dependency(':DynmapCore')) - } - archiveName = "Dynmap-${parent.version}-forge-1.12.2.jar" - destinationDir = file '../target' +jar { manifest { attributes 'FMLAT': 'dynmap_at.cfg' - } + } } + +shadowJar { + dependencies { + include(dependency('com.googlecode.json-simple:json-simple:')) + include(dependency('org.yaml:snakeyaml:')) + include(dependency('com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:')) + include(dependency('org.eclipse.jetty::')) + include(dependency('org.eclipse.jetty.orbit:javax.servlet:')) + include(dependency(':DynmapCore')) + include(dependency(':DynmapCoreAPI')) + } + relocate('org.json.simple', 'org.dynmap.json.simple') + relocate('org.yaml.snakeyaml', 'org.dynmap.snakeyaml') + relocate('org.eclipse.jetty', 'org.dynmap.jetty') + relocate('org.owasp.html', 'org.dynmap.org.owasp.html') + relocate('javax.servlet', 'org.dynmap.javax.servlet' ) + archiveName = "Dynmap-${parent.version}-forge-1.12.2.jar" + destinationDir = file '../target' +} + shadowJar.doLast { task -> ant.checksum file: task.archivePath