Fix Forge 1.12.2 build

gbl · Apr 25, 2020 · d6aa2f9 · d6aa2f9
1 parent 79c8add
commit d6aa2f9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
diff --git a/bukkit-helper-114-1/.gitignore b/bukkit-helper-114-1/.gitignore
@@ -1 +1,4 @@
+/target/
 /build/
+/bin/
+/.classpath
diff --git a/bukkit-helper-114/.gitignore b/bukkit-helper-114/.gitignore
@@ -1 +1,4 @@
+/target/
 /build/
+/bin/
+/.classpath
diff --git a/bukkit-helper-115/.gitignore b/bukkit-helper-115/.gitignore
@@ -1 +1,4 @@
+/target/
 /build/
+/bin/
+/.classpath
diff --git a/forge-1.11.2/build.gradle b/forge-1.11.2/build.gradle
@@ -71,6 +71,7 @@ shadowJar {
         attributes 'FMLAT': 'dynmap_at.cfg'
     }
 }
+
 shadowJar.doLast {
     task ->
         ant.checksum file: task.archivePath

diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle
@@ -13,10 +13,10 @@ buildscript {
 }
 
 apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(":DynmapCore")
-    compile project(":DynmapCoreAPI")
+    compile project(path: ":DynmapCore", configuration: "shadow")
 }
 
 sourceCompatibility = 1.8
@@ -61,29 +61,15 @@ processResources
     rename '(.+_at.cfg)', 'META-INF/$1'
 }
 
-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'
+    manifest {
+        attributes 'FMLAT': 'dynmap_at.cfg'
+    }
 }
 
 shadowJar.doLast {
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,7 @@ shadowJar { @@
             attributes 'FMLAT': 'dynmap_at.cfg'
         }
     }
     shadowJar.doLast {
         task ->
             ant.checksum file: task.archivePath
@@ Expand Down @@