From 1b43740cbba3c8bcda7aaef05d7bf17167de1269 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 13:28:51 +0200 Subject: [PATCH 01/14] Gradle: update to 7.1 (Java 16 support) --- gradle/wrapper/gradle-wrapper.jar | Bin 56172 -> 56177 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 28861d273a5d270fd8f65dd74570c17c9c507736..29953ea141f55e3b8fc691d31b5ca8816d89fa87 100644 GIT binary patch delta 692 zcmYk4T}V@59LD$ljeUgX0c~w(3!|<&)^Y_cbGDU=kufKRN}=s4!gix{6~!d1*u`S; zP!wZj7m=3GuyE+pJ_U37doEnhgizvuUybKuYWZpEAG@uslD zkT{SUyr9u&#-F&a7{r>nK3ktQljx^G zReGGx7!h0(sbXrVRdSNFZ&LE&PgrPSn`|UnilabC((1i5_=UCFqRkDHO%CvSRL8? z7>(RUE^kGxVui0D((5}IDIdYBf}MqsE8HYUfQzXOCmp-bF|jc~p@$rg7Kf=X$T1MK z;&Dkpswh%C%$2@0KrwLK#!f3y;+Yz?_)$7b#TSiuakGaCkw$DSYZ2S*qQc8v%FUAS zmaj7_-j)4y^{rAJhP%?m`Y=-&rTG;^S8VVW1njAbw3x(l(#ePRS4DOgkE%D=Fn(1} WT6W(r)4!wO`vQ8tbZY;kcEVq&z$0q_ delta 717 zcmYk4Ur19?9LMkZS?G# zyeoQy%FYN}jB3ywJwTeXYg)_NVUD?31}(7~mW!vcCc4**XE7rp%_VTfRXWvzWv>Z{ zAEc#Lfi>}+*p^VJ{)*6}i7GaLn~4VMYU6~V735g433OwW4+ZcRC97#vG+J>{U6_XU1QRa4x{u^LSuRf;|o zsi7|q Date: Sun, 27 Jun 2021 13:49:21 +0200 Subject: [PATCH 02/14] build.gradle: remove maven plugin (replaced by maven-publish) --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index f286b5da..ac691e37 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id "com.github.johnrengelman.shadow" version "2.0.4" id 'java' - id 'maven' id 'maven-publish' } @@ -32,7 +31,6 @@ ext { subprojects { apply plugin: "com.github.johnrengelman.shadow" apply plugin: 'java' - apply plugin: 'maven' apply plugin: 'maven-publish' sourceCompatibility = 1.8 From cf121956c38cded95c040456c666c059cd1eb337 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 13:51:12 +0200 Subject: [PATCH 03/14] build.gradle: rename compile -> implementation --- DynmapCore/build.gradle | 16 ++++++++-------- bukkit-helper-113-2/build.gradle | 10 +++++----- bukkit-helper-114-1/build.gradle | 10 +++++----- bukkit-helper-115/build.gradle | 10 +++++----- bukkit-helper-116-2/build.gradle | 10 +++++----- bukkit-helper-116-3/build.gradle | 10 +++++----- bukkit-helper-116-4/build.gradle | 10 +++++----- bukkit-helper-116/build.gradle | 10 +++++----- bukkit-helper-117/build.gradle | 10 +++++----- bukkit-helper/build.gradle | 8 ++++---- dynmap-api/build.gradle | 4 ++-- forge-1.11.2/build.gradle | 8 ++++---- forge-1.12.2/build.gradle | 8 ++++---- forge-1.13.2/build.gradle | 2 +- forge-1.14.4/build.gradle | 2 +- forge-1.15.2/build.gradle | 2 +- forge-1.16.1/build.gradle | 2 +- forge-1.16.2/build.gradle | 2 +- forge-1.16.3/build.gradle | 2 +- forge-1.16.4/build.gradle | 2 +- forge-1.16.5/build.gradle | 2 +- spigot/build.gradle | 28 ++++++++++++++-------------- 22 files changed, 84 insertions(+), 84 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index e422ef89..6ae2406f 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -1,14 +1,14 @@ description = "DynmapCore" dependencies { - compile project(path: ':DynmapCoreAPI', configuration: 'shadow') - compile 'javax.servlet:javax.servlet-api:3.1' - compile 'org.eclipse.jetty:jetty-server:9.4.26.v20200117' - compile 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' - compile 'com.googlecode.json-simple:json-simple:1.1.1' - compile 'org.yaml:snakeyaml:1.23' - compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1' - compile 'org.postgresql:postgresql:42.2.18' + implementation project(path: ':DynmapCoreAPI', configuration: 'shadow') + implementation 'javax.servlet:javax.servlet-api:3.1' + implementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117' + implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' + implementation 'com.googlecode.json-simple:json-simple:1.1.1' + implementation 'org.yaml:snakeyaml:1.23' + implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1' + implementation 'org.postgresql:postgresql:42.2.18' } processResources { diff --git a/bukkit-helper-113-2/build.gradle b/bukkit-helper-113-2/build.gradle index 823fe09d..f9046235 100644 --- a/bukkit-helper-113-2/build.gradle +++ b/bukkit-helper-113-2/build.gradle @@ -2,9 +2,9 @@ description = 'bukkit-helper-1.13.2' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.bukkit', name: 'bukkit', version:'1.13.2-R0.1-SNAPSHOT' - compile group: 'org.bukkit', name: 'craftbukkit', version:'1.13.2-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.bukkit', name: 'bukkit', version:'1.13.2-R0.1-SNAPSHOT' + implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.13.2-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-114-1/build.gradle b/bukkit-helper-114-1/build.gradle index 4e2e14e8..272050d6 100644 --- a/bukkit-helper-114-1/build.gradle +++ b/bukkit-helper-114-1/build.gradle @@ -2,9 +2,9 @@ description = 'bukkit-helper-1.14.1' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.bukkit', name: 'bukkit', version:'1.14.1-R0.1-SNAPSHOT' - compile group: 'org.bukkit', name: 'craftbukkit', version:'1.14.1-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.bukkit', name: 'bukkit', version:'1.14.1-R0.1-SNAPSHOT' + implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.14.1-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-115/build.gradle b/bukkit-helper-115/build.gradle index 598021f9..ab17c528 100644 --- a/bukkit-helper-115/build.gradle +++ b/bukkit-helper-115/build.gradle @@ -2,9 +2,9 @@ description = 'bukkit-helper-1.15' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.bukkit', name: 'bukkit', version:'1.15-R0.1-SNAPSHOT' - compile group: 'org.bukkit', name: 'craftbukkit', version:'1.15-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.bukkit', name: 'bukkit', version:'1.15-R0.1-SNAPSHOT' + implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.15-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-116-2/build.gradle b/bukkit-helper-116-2/build.gradle index cf47cc64..0c43eaed 100644 --- a/bukkit-helper-116-2/build.gradle +++ b/bukkit-helper-116-2/build.gradle @@ -2,9 +2,9 @@ description = 'bukkit-helper-1.16' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.2-R0.1-SNAPSHOT' - compile group: 'org.spigotmc', name: 'spigot', version:'1.16.2-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.2-R0.1-SNAPSHOT' + implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.2-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-116-3/build.gradle b/bukkit-helper-116-3/build.gradle index 37f82243..4bd69ecb 100644 --- a/bukkit-helper-116-3/build.gradle +++ b/bukkit-helper-116-3/build.gradle @@ -2,10 +2,10 @@ description = 'bukkit-helper-1.16.3' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.3-R0.1-SNAPSHOT' - compile group: 'org.spigotmc', name: 'spigot', version:'1.16.3-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.3-R0.1-SNAPSHOT' + implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.3-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-116-4/build.gradle b/bukkit-helper-116-4/build.gradle index feb308df..3a8e0785 100644 --- a/bukkit-helper-116-4/build.gradle +++ b/bukkit-helper-116-4/build.gradle @@ -2,9 +2,9 @@ description = 'bukkit-helper-1.16.4' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.4-R0.1-SNAPSHOT' - compile group: 'org.spigotmc', name: 'spigot', version:'1.16.4-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.4-R0.1-SNAPSHOT' + implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.4-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-116/build.gradle b/bukkit-helper-116/build.gradle index 933e5453..09bcd248 100644 --- a/bukkit-helper-116/build.gradle +++ b/bukkit-helper-116/build.gradle @@ -2,9 +2,9 @@ description = 'bukkit-helper-1.16' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.1-R0.1-SNAPSHOT' - compile group: 'org.spigotmc', name: 'spigot', version:'1.16.1-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.1-R0.1-SNAPSHOT' + implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.1-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-117/build.gradle b/bukkit-helper-117/build.gradle index e4bb7ec3..c6b94998 100644 --- a/bukkit-helper-117/build.gradle +++ b/bukkit-helper-117/build.gradle @@ -2,9 +2,9 @@ description = 'bukkit-helper-1.17' dependencies { - compile project(':bukkit-helper') - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.spigotmc', name: 'spigot-api', version:'1.17-R0.1-SNAPSHOT' - compile group: 'org.spigotmc', name: 'spigot', version:'1.17-R0.1-SNAPSHOT' + implementation project(':bukkit-helper') + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.17-R0.1-SNAPSHOT' + implementation group: 'org.spigotmc', name: 'spigot', version:'1.17-R0.1-SNAPSHOT' } diff --git a/bukkit-helper/build.gradle b/bukkit-helper/build.gradle index 2e870323..4b8aaf98 100644 --- a/bukkit-helper/build.gradle +++ b/bukkit-helper/build.gradle @@ -2,8 +2,8 @@ description = 'bukkit-helper' dependencies { - compile project(':dynmap-api') - compile project(path: ':DynmapCore', configuration: 'shadow') - compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT' - compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2' + implementation project(':dynmap-api') + implementation project(path: ':DynmapCore', configuration: 'shadow') + implementation group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT' + implementation group: 'com.google.code.gson', name: 'gson', version:'2.8.2' } diff --git a/dynmap-api/build.gradle b/dynmap-api/build.gradle index 176f41ab..b6da9f47 100644 --- a/dynmap-api/build.gradle +++ b/dynmap-api/build.gradle @@ -2,8 +2,8 @@ description = "dynmap-api" dependencies { - compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT' - compile project(":DynmapCoreAPI") + implementation group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT' + implementation project(":DynmapCoreAPI") } jar { diff --git a/forge-1.11.2/build.gradle b/forge-1.11.2/build.gradle index 7e4e4547..89505d91 100644 --- a/forge-1.11.2/build.gradle +++ b/forge-1.11.2/build.gradle @@ -16,10 +16,10 @@ apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'com.github.johnrengelman.shadow' dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") - compile 'com.googlecode.json-simple:json-simple:1.1.1' - compile 'org.yaml:snakeyaml:1.23' - compile 'org.spongepowered:spongeapi:7.0.0' + implementation project(path: ":DynmapCore", configuration: "shadow") + implementation 'com.googlecode.json-simple:json-simple:1.1.1' + implementation 'org.yaml:snakeyaml:1.23' + implementation 'org.spongepowered:spongeapi:7.0.0' } sourceCompatibility = 1.8 diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle index ee6a0352..fd5c1f2d 100644 --- a/forge-1.12.2/build.gradle +++ b/forge-1.12.2/build.gradle @@ -14,10 +14,10 @@ apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'com.github.johnrengelman.shadow' dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") - compile 'com.googlecode.json-simple:json-simple:1.1.1' - compile 'org.yaml:snakeyaml:1.23' - compile 'org.spongepowered:spongeapi:7.0.0' + implementation project(path: ":DynmapCore", configuration: "shadow") + implementation 'com.googlecode.json-simple:json-simple:1.1.1' + implementation 'org.yaml:snakeyaml:1.23' + implementation 'org.spongepowered:spongeapi:7.0.0' } sourceCompatibility = 1.8 diff --git a/forge-1.13.2/build.gradle b/forge-1.13.2/build.gradle index 2b6ca886..ded22576 100644 --- a/forge-1.13.2/build.gradle +++ b/forge-1.13.2/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'eclipse' apply plugin: 'com.github.johnrengelman.shadow' dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.13.2-25.0.219' } diff --git a/forge-1.14.4/build.gradle b/forge-1.14.4/build.gradle index e6aa6f75..dfd65dd9 100644 --- a/forge-1.14.4/build.gradle +++ b/forge-1.14.4/build.gradle @@ -29,7 +29,7 @@ minecraft { project.archivesBaseName = "${project.archivesBaseName}-forge-1.14.4" dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.14.4-28.2.10' } diff --git a/forge-1.15.2/build.gradle b/forge-1.15.2/build.gradle index 77ac57c2..bc65a9c1 100644 --- a/forge-1.15.2/build.gradle +++ b/forge-1.15.2/build.gradle @@ -29,7 +29,7 @@ minecraft { project.archivesBaseName = "${project.archivesBaseName}-forge-1.15.2" dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.15.2-31.2.3' } diff --git a/forge-1.16.1/build.gradle b/forge-1.16.1/build.gradle index 1c86b34c..803841ea 100644 --- a/forge-1.16.1/build.gradle +++ b/forge-1.16.1/build.gradle @@ -29,7 +29,7 @@ minecraft { project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.1" dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.16.1-32.0.106' } diff --git a/forge-1.16.2/build.gradle b/forge-1.16.2/build.gradle index f0a01700..194e883e 100644 --- a/forge-1.16.2/build.gradle +++ b/forge-1.16.2/build.gradle @@ -29,7 +29,7 @@ minecraft { project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.2" dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.16.2-33.0.5' } diff --git a/forge-1.16.3/build.gradle b/forge-1.16.3/build.gradle index 1047dcf5..52274e05 100644 --- a/forge-1.16.3/build.gradle +++ b/forge-1.16.3/build.gradle @@ -29,7 +29,7 @@ minecraft { project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.3" dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.16.3-34.1.19' } diff --git a/forge-1.16.4/build.gradle b/forge-1.16.4/build.gradle index ca0dde8f..bd7379e0 100644 --- a/forge-1.16.4/build.gradle +++ b/forge-1.16.4/build.gradle @@ -29,7 +29,7 @@ minecraft { project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.4" dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.16.4-35.1.36' } diff --git a/forge-1.16.5/build.gradle b/forge-1.16.5/build.gradle index 9ae8dc88..38311a65 100644 --- a/forge-1.16.5/build.gradle +++ b/forge-1.16.5/build.gradle @@ -29,7 +29,7 @@ minecraft { project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.5" dependencies { - compile project(path: ":DynmapCore", configuration: "shadow") + implementation project(path: ":DynmapCore", configuration: "shadow") minecraft 'net.minecraftforge:forge:1.16.5-36.0.15' } diff --git a/spigot/build.gradle b/spigot/build.gradle index 18b2e554..f4b4adc7 100644 --- a/spigot/build.gradle +++ b/spigot/build.gradle @@ -10,22 +10,22 @@ repositories { } dependencies { - compile group: 'org.bukkit', name: 'bukkit', version: '1.7.10-R0.1-SNAPSHOT' - compile 'com.nijikokun.bukkit:Permissions:3.1.6' - compile 'me.lucko.luckperms:luckperms-api:4.3' - compile 'net.luckperms:api:5.0' + implementation group: 'org.bukkit', name: 'bukkit', version: '1.7.10-R0.1-SNAPSHOT' + implementation 'com.nijikokun.bukkit:Permissions:3.1.6' + implementation 'me.lucko.luckperms:luckperms-api:4.3' + implementation 'net.luckperms:api:5.0' compile('com.github.MilkBowl:VaultAPI:1.7') { transitive = false } compileOnly 'net.skinsrestorer:skinsrestorer:14.1.0-SNAPSHOT@jar' - compile project(":dynmap-api") - compile project(path: ":DynmapCore", configuration: "shadow") - compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1' - compile group: 'de.bananaco', name: 'bPermissions', version: '2.9.1' - compile group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6' - compile group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1' - compile group: 'org.bstats', name: 'bstats-bukkit', version: '1.5' - compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2' - compile project(':bukkit-helper') + implementation project(":dynmap-api") + implementation project(path: ":DynmapCore", configuration: "shadow") + implementation group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1' + implementation group: 'de.bananaco', name: 'bPermissions', version: '2.9.1' + implementation group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6' + implementation group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1' + implementation group: 'org.bstats', name: 'bstats-bukkit', version: '1.5' + implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2' + implementation project(':bukkit-helper') implementation(project(':bukkit-helper-113-2')) { transitive = false } From 5290cdf9f1d9895ac3cc7fae4a500d0a82864dff Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 14:18:53 +0200 Subject: [PATCH 04/14] DynmapCore: update processResources to Gradle 7 format --- DynmapCore/build.gradle | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 6ae2406f..66ece81f 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -13,14 +13,15 @@ dependencies { processResources { // replace stuff in mcmod.info, nothing else - from('src/main/resources') { - include 'core.yml' - include 'lightings.txt' - include 'perspectives.txt' - include 'shaders.txt' - include 'extracted/web/version.js' - include 'extracted/web/index.html' - include 'extracted/web/login.html' + filesMatching([ + 'core.yml', + 'lightings.txt', + 'perspectives.txt', + 'shaders.txt', + 'version.js', + 'index.html', + 'login.html', + ]) { // replace version and mcversion expand( buildnumber: project.parent.ext.globals.buildNumber, From 01a549af72acfb0ccac5c629488813c2c6c4a812 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 14:34:29 +0200 Subject: [PATCH 05/14] forge-1.13.2..1.16.5: update ForgeGradle to version 5 --- forge-1.13.2/build.gradle | 2 +- forge-1.14.4/build.gradle | 2 +- forge-1.15.2/build.gradle | 2 +- forge-1.16.1/build.gradle | 2 +- forge-1.16.2/build.gradle | 2 +- forge-1.16.3/build.gradle | 2 +- forge-1.16.4/build.gradle | 2 +- forge-1.16.5/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forge-1.13.2/build.gradle b/forge-1.13.2/build.gradle index ded22576..01b4dcba 100644 --- a/forge-1.13.2/build.gradle +++ b/forge-1.13.2/build.gradle @@ -7,7 +7,7 @@ buildscript { maven {url = "https://oss.sonatype.org/content/repositories/snapshots/"} } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } diff --git a/forge-1.14.4/build.gradle b/forge-1.14.4/build.gradle index dfd65dd9..9647b9e4 100644 --- a/forge-1.14.4/build.gradle +++ b/forge-1.14.4/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' diff --git a/forge-1.15.2/build.gradle b/forge-1.15.2/build.gradle index bc65a9c1..63abdc62 100644 --- a/forge-1.15.2/build.gradle +++ b/forge-1.15.2/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' diff --git a/forge-1.16.1/build.gradle b/forge-1.16.1/build.gradle index 803841ea..5a3a2a56 100644 --- a/forge-1.16.1/build.gradle +++ b/forge-1.16.1/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' diff --git a/forge-1.16.2/build.gradle b/forge-1.16.2/build.gradle index 194e883e..35a24d9f 100644 --- a/forge-1.16.2/build.gradle +++ b/forge-1.16.2/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' diff --git a/forge-1.16.3/build.gradle b/forge-1.16.3/build.gradle index 52274e05..b5997d3a 100644 --- a/forge-1.16.3/build.gradle +++ b/forge-1.16.3/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' diff --git a/forge-1.16.4/build.gradle b/forge-1.16.4/build.gradle index bd7379e0..d19b2273 100644 --- a/forge-1.16.4/build.gradle +++ b/forge-1.16.4/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' diff --git a/forge-1.16.5/build.gradle b/forge-1.16.5/build.gradle index 38311a65..b58c906d 100644 --- a/forge-1.16.5/build.gradle +++ b/forge-1.16.5/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' From 70825f3a18cf8b556a8077586e6436b5afec7c74 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 15:07:10 +0200 Subject: [PATCH 06/14] settings.gradle: reenable most Forge builds --- settings.gradle | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/settings.gradle b/settings.gradle index f4c7724b..a94d91c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,14 +17,14 @@ include ':fabric-1.16.2' include ':fabric-1.16.1' include ':fabric-1.15.2' include ':fabric-1.14.4' -//include ':forge-1.16.5' -//include ':forge-1.16.4' -//include ':forge-1.16.3' -//include ':forge-1.16.2' -//include ':forge-1.16.1' -//include ':forge-1.15.2' -//include ':forge-1.14.4' -//include ':forge-1.13.2' +include ':forge-1.16.5' +include ':forge-1.16.4' +include ':forge-1.16.3' +include ':forge-1.16.2' +include ':forge-1.16.1' +include ':forge-1.15.2' +include ':forge-1.14.4' +include ':forge-1.13.2' //include ':forge-1.12.2' //include ':forge-1.11.2' @@ -46,14 +46,14 @@ project(':fabric-1.16.2').projectDir = "$rootDir/fabric-1.16.2" as File project(':fabric-1.16.1').projectDir = "$rootDir/fabric-1.16.1" as File project(':fabric-1.15.2').projectDir = "$rootDir/fabric-1.15.2" as File project(':fabric-1.14.4').projectDir = "$rootDir/fabric-1.14.4" as File -//project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File -//project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File -//project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File -//project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File -//project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File -//project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File -//project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File -//project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File +project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File +project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File +project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File +project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File +project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File +project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File +project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File +project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File //project(':forge-1.12.2').projectDir = "$rootDir/forge-1.12.2" as File //project(':forge-1.11.2').projectDir = "$rootDir/forge-1.11.2" as File From 3d1e3053e18333b61c6044450e3b8351ed72eaeb Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 15:07:33 +0200 Subject: [PATCH 07/14] forge-*: fix resource handling on Gradle 7 --- forge-1.13.2/build.gradle | 12 +----------- forge-1.14.4/build.gradle | 12 +----------- forge-1.15.2/build.gradle | 12 +----------- forge-1.16.1/build.gradle | 12 +----------- forge-1.16.2/build.gradle | 12 +----------- forge-1.16.3/build.gradle | 12 +----------- forge-1.16.4/build.gradle | 12 +----------- forge-1.16.5/build.gradle | 12 +----------- 8 files changed, 8 insertions(+), 88 deletions(-) diff --git a/forge-1.13.2/build.gradle b/forge-1.13.2/build.gradle index 01b4dcba..a7ce08ba 100644 --- a/forge-1.13.2/build.gradle +++ b/forge-1.13.2/build.gradle @@ -37,23 +37,13 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.13.2" processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.13.2" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { diff --git a/forge-1.14.4/build.gradle b/forge-1.14.4/build.gradle index 9647b9e4..2242c17b 100644 --- a/forge-1.14.4/build.gradle +++ b/forge-1.14.4/build.gradle @@ -35,23 +35,13 @@ dependencies { processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.14.4" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { diff --git a/forge-1.15.2/build.gradle b/forge-1.15.2/build.gradle index 63abdc62..72b51449 100644 --- a/forge-1.15.2/build.gradle +++ b/forge-1.15.2/build.gradle @@ -35,23 +35,13 @@ dependencies { processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.15.2" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { diff --git a/forge-1.16.1/build.gradle b/forge-1.16.1/build.gradle index 5a3a2a56..f94245de 100644 --- a/forge-1.16.1/build.gradle +++ b/forge-1.16.1/build.gradle @@ -35,23 +35,13 @@ dependencies { processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.16.1" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { diff --git a/forge-1.16.2/build.gradle b/forge-1.16.2/build.gradle index 35a24d9f..847e1502 100644 --- a/forge-1.16.2/build.gradle +++ b/forge-1.16.2/build.gradle @@ -35,23 +35,13 @@ dependencies { processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.16.2" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { diff --git a/forge-1.16.3/build.gradle b/forge-1.16.3/build.gradle index b5997d3a..f05998dd 100644 --- a/forge-1.16.3/build.gradle +++ b/forge-1.16.3/build.gradle @@ -35,23 +35,13 @@ dependencies { processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.16.3" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { diff --git a/forge-1.16.4/build.gradle b/forge-1.16.4/build.gradle index d19b2273..82e5041b 100644 --- a/forge-1.16.4/build.gradle +++ b/forge-1.16.4/build.gradle @@ -35,23 +35,13 @@ dependencies { processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.16.4" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { diff --git a/forge-1.16.5/build.gradle b/forge-1.16.5/build.gradle index b58c906d..9ca23271 100644 --- a/forge-1.16.5/build.gradle +++ b/forge-1.16.5/build.gradle @@ -35,23 +35,13 @@ dependencies { processResources { - inputs.property "version", project.version + '-' + project.ext.buildNumber - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, mcversion: "1.16.5" ) } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } shadowJar { From 310a635b87d6143ae7b60bbd9f1684ed09b8820e Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 15:28:05 +0200 Subject: [PATCH 08/14] spigot: fix resource handling on Gradle 7 --- spigot/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spigot/build.gradle b/spigot/build.gradle index f4b4adc7..c7620282 100644 --- a/spigot/build.gradle +++ b/spigot/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation 'com.nijikokun.bukkit:Permissions:3.1.6' implementation 'me.lucko.luckperms:luckperms-api:4.3' implementation 'net.luckperms:api:5.0' - compile('com.github.MilkBowl:VaultAPI:1.7') { transitive = false } + implementation('com.github.MilkBowl:VaultAPI:1.7') { transitive = false } compileOnly 'net.skinsrestorer:skinsrestorer:14.1.0-SNAPSHOT@jar' implementation project(":dynmap-api") implementation project(path: ":DynmapCore", configuration: "shadow") @@ -54,8 +54,7 @@ dependencies { processResources { // replace stuff in mcmod.info, nothing else - from('src/main/resources') { - include "plugin.yml" + filesMatching('plugin.yml') { // replace version and mcversion expand( buildnumber: project.parent.ext.globals.buildNumber, From b64e73ef92047ba2ae2aa61c72595823e1b6dcaf Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 15:57:55 +0200 Subject: [PATCH 09/14] fabric-*: update Loom to 0.6-SNAPSHOT --- fabric-1.14.4/build.gradle | 2 +- fabric-1.15.2/build.gradle | 2 +- fabric-1.16.1/build.gradle | 2 +- fabric-1.16.2/build.gradle | 2 +- fabric-1.16.4/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle index 82a5959e..d14a8a05 100644 --- a/fabric-1.14.4/build.gradle +++ b/fabric-1.14.4/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9' + classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT' } } apply plugin: 'fabric-loom' diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle index 82a5959e..d14a8a05 100644 --- a/fabric-1.15.2/build.gradle +++ b/fabric-1.15.2/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9' + classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT' } } apply plugin: 'fabric-loom' diff --git a/fabric-1.16.1/build.gradle b/fabric-1.16.1/build.gradle index 82a5959e..d14a8a05 100644 --- a/fabric-1.16.1/build.gradle +++ b/fabric-1.16.1/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9' + classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT' } } apply plugin: 'fabric-loom' diff --git a/fabric-1.16.2/build.gradle b/fabric-1.16.2/build.gradle index 82a5959e..d14a8a05 100644 --- a/fabric-1.16.2/build.gradle +++ b/fabric-1.16.2/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9' + classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT' } } apply plugin: 'fabric-loom' diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle index 5f08125b..d14a8a05 100644 --- a/fabric-1.16.4/build.gradle +++ b/fabric-1.16.4/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.35' + classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT' } } apply plugin: 'fabric-loom' From 02ec59b72d837704a424fd851b1926618802c1fb Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 15:58:26 +0200 Subject: [PATCH 10/14] fabric-*: update processResources to Gradle 7 --- fabric-1.14.4/build.gradle | 9 +-------- fabric-1.15.2/build.gradle | 9 +-------- fabric-1.16.1/build.gradle | 9 +-------- fabric-1.16.2/build.gradle | 9 +-------- fabric-1.16.4/build.gradle | 9 +-------- 5 files changed, 5 insertions(+), 40 deletions(-) diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.14.4/build.gradle +++ b/fabric-1.14.4/build.gradle @@ -41,16 +41,9 @@ dependencies { } processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching('fabric.mod.json') { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.15.2/build.gradle +++ b/fabric-1.15.2/build.gradle @@ -41,16 +41,9 @@ dependencies { } processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching('fabric.mod.json') { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/fabric-1.16.1/build.gradle b/fabric-1.16.1/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.16.1/build.gradle +++ b/fabric-1.16.1/build.gradle @@ -41,16 +41,9 @@ dependencies { } processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching('fabric.mod.json') { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/fabric-1.16.2/build.gradle b/fabric-1.16.2/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.16.2/build.gradle +++ b/fabric-1.16.2/build.gradle @@ -41,16 +41,9 @@ dependencies { } processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching('fabric.mod.json') { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.16.4/build.gradle +++ b/fabric-1.16.4/build.gradle @@ -41,16 +41,9 @@ dependencies { } processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching('fabric.mod.json') { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is From 48f4ccaf82ac549ef1706e1ff8c6a974c149fc8b Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 16:14:43 +0200 Subject: [PATCH 11/14] fabric-*: remove dependency on DynmapCoreAPI (duplicate classes error) --- fabric-1.14.4/build.gradle | 1 - fabric-1.15.2/build.gradle | 1 - fabric-1.16.1/build.gradle | 1 - fabric-1.16.2/build.gradle | 1 - fabric-1.16.4/build.gradle | 1 - 5 files changed, 5 deletions(-) diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle index f5733ef5..f0352ecf 100644 --- a/fabric-1.14.4/build.gradle +++ b/fabric-1.14.4/build.gradle @@ -33,7 +33,6 @@ dependencies { compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - shadow project(path: ':DynmapCoreAPI', configuration: 'shadow') shadow project(path: ':DynmapCore', configuration: 'shadow') // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle index f5733ef5..f0352ecf 100644 --- a/fabric-1.15.2/build.gradle +++ b/fabric-1.15.2/build.gradle @@ -33,7 +33,6 @@ dependencies { compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - shadow project(path: ':DynmapCoreAPI', configuration: 'shadow') shadow project(path: ':DynmapCore', configuration: 'shadow') // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. diff --git a/fabric-1.16.1/build.gradle b/fabric-1.16.1/build.gradle index f5733ef5..f0352ecf 100644 --- a/fabric-1.16.1/build.gradle +++ b/fabric-1.16.1/build.gradle @@ -33,7 +33,6 @@ dependencies { compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - shadow project(path: ':DynmapCoreAPI', configuration: 'shadow') shadow project(path: ':DynmapCore', configuration: 'shadow') // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. diff --git a/fabric-1.16.2/build.gradle b/fabric-1.16.2/build.gradle index f5733ef5..f0352ecf 100644 --- a/fabric-1.16.2/build.gradle +++ b/fabric-1.16.2/build.gradle @@ -33,7 +33,6 @@ dependencies { compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - shadow project(path: ':DynmapCoreAPI', configuration: 'shadow') shadow project(path: ':DynmapCore', configuration: 'shadow') // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle index f5733ef5..f0352ecf 100644 --- a/fabric-1.16.4/build.gradle +++ b/fabric-1.16.4/build.gradle @@ -33,7 +33,6 @@ dependencies { compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - shadow project(path: ':DynmapCoreAPI', configuration: 'shadow') shadow project(path: ':DynmapCore', configuration: 'shadow') // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. From 1fb4d6c244ac5a6330bed8d59dc73d66a0f865e9 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 19:37:03 +0200 Subject: [PATCH 12/14] DynmapCore: fix resource patching --- DynmapCore/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 66ece81f..1e6dec92 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -18,9 +18,9 @@ processResources { 'lightings.txt', 'perspectives.txt', 'shaders.txt', - 'version.js', - 'index.html', - 'login.html', + 'extracted/web/version.js', + 'extracted/web/index.html', + 'extracted/web/login.html', ]) { // replace version and mcversion expand( From d0926b0ec79994433f03de6a11b4e775ef0e68b0 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 19:38:45 +0200 Subject: [PATCH 13/14] DynmapCore: fix indentation --- DynmapCore/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 1e6dec92..fabfd87d 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -15,12 +15,12 @@ processResources { // replace stuff in mcmod.info, nothing else filesMatching([ 'core.yml', - 'lightings.txt', - 'perspectives.txt', - 'shaders.txt', - 'extracted/web/version.js', - 'extracted/web/index.html', - 'extracted/web/login.html', + 'lightings.txt', + 'perspectives.txt', + 'shaders.txt', + 'extracted/web/version.js', + 'extracted/web/index.html', + 'extracted/web/login.html', ]) { // replace version and mcversion expand( From 0d15a292d134e08b091a0b7816d1ea64fe10c8e3 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 19:41:51 +0200 Subject: [PATCH 14/14] forge-*: fix resource patching --- forge-1.13.2/build.gradle | 2 +- forge-1.14.4/build.gradle | 2 +- forge-1.15.2/build.gradle | 2 +- forge-1.16.1/build.gradle | 2 +- forge-1.16.2/build.gradle | 2 +- forge-1.16.3/build.gradle | 2 +- forge-1.16.4/build.gradle | 2 +- forge-1.16.5/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forge-1.13.2/build.gradle b/forge-1.13.2/build.gradle index a7ce08ba..b25440c5 100644 --- a/forge-1.13.2/build.gradle +++ b/forge-1.13.2/build.gradle @@ -37,7 +37,7 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.13.2" processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, diff --git a/forge-1.14.4/build.gradle b/forge-1.14.4/build.gradle index 2242c17b..872b0684 100644 --- a/forge-1.14.4/build.gradle +++ b/forge-1.14.4/build.gradle @@ -35,7 +35,7 @@ dependencies { processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, diff --git a/forge-1.15.2/build.gradle b/forge-1.15.2/build.gradle index 72b51449..9892576f 100644 --- a/forge-1.15.2/build.gradle +++ b/forge-1.15.2/build.gradle @@ -35,7 +35,7 @@ dependencies { processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, diff --git a/forge-1.16.1/build.gradle b/forge-1.16.1/build.gradle index f94245de..acbcc970 100644 --- a/forge-1.16.1/build.gradle +++ b/forge-1.16.1/build.gradle @@ -35,7 +35,7 @@ dependencies { processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, diff --git a/forge-1.16.2/build.gradle b/forge-1.16.2/build.gradle index 847e1502..5fe6e9bf 100644 --- a/forge-1.16.2/build.gradle +++ b/forge-1.16.2/build.gradle @@ -35,7 +35,7 @@ dependencies { processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, diff --git a/forge-1.16.3/build.gradle b/forge-1.16.3/build.gradle index f05998dd..af5d1378 100644 --- a/forge-1.16.3/build.gradle +++ b/forge-1.16.3/build.gradle @@ -35,7 +35,7 @@ dependencies { processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, diff --git a/forge-1.16.4/build.gradle b/forge-1.16.4/build.gradle index 82e5041b..e38b1b3a 100644 --- a/forge-1.16.4/build.gradle +++ b/forge-1.16.4/build.gradle @@ -35,7 +35,7 @@ dependencies { processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber, diff --git a/forge-1.16.5/build.gradle b/forge-1.16.5/build.gradle index 9ca23271..8576ff29 100644 --- a/forge-1.16.5/build.gradle +++ b/forge-1.16.5/build.gradle @@ -35,7 +35,7 @@ dependencies { processResources { - filesMatching('mods.toml') { + filesMatching('META-INF/mods.toml') { // replace version and mcversion expand( version: project.version + '-' + project.ext.buildNumber,