From 23717f4a9b3f0295b69073bf77ba929b42294957 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 15 Dec 2020 09:31:01 -0600 Subject: [PATCH] bruh --- Essentials/build.gradle | 4 ++++ build.gradle | 13 ++++++------- settings.gradle | 5 ----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Essentials/build.gradle b/Essentials/build.gradle index 7fe365bb5..d38ae4e9b 100644 --- a/Essentials/build.gradle +++ b/Essentials/build.gradle @@ -3,6 +3,10 @@ dependencies { exclude group: "org.bukkit", module: "bukkit" } compileOnly 'net.luckperms:api:5.0' + compileOnly('me.totalfreedom:TotalFreedomMod:6.0') { + exclude group: "org.bstats", module: "bstats-bukkit" + exclude group: "me.rayzr522", module: "jsonmessage" + } api 'io.papermc:paperlib:1.0.6' diff --git a/build.gradle b/build.gradle index 2ced1ac05..2fed6240f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { plugins { id 'org.ajoberstar.grgit' version '4.1.0' id 'net.kyori.indra' version "$indraVersion" apply false - id 'net.kyori.indra.checkstyle' version "$indraVersion" apply false + //id 'net.kyori.indra.checkstyle' version "$indraVersion" apply false id 'net.kyori.indra.publishing' version "$indraVersion" apply false id 'com.github.johnrengelman.shadow' version '6.1.0' apply false } @@ -40,7 +40,7 @@ ext { fullVersion = "${version}-${GIT_COMMIT}".replace("-SNAPSHOT", "-dev+${GIT_DEPTH}") - checkstyleVersion = '8.36.2' + //checkstyleVersion = '8.36.2' spigotVersion = '1.16.4-R0.1-SNAPSHOT' junit5Version = '5.7.0' mockitoVersion = '3.2.0' @@ -49,7 +49,7 @@ ext { subprojects { apply plugin: 'java' apply plugin: 'net.kyori.indra' - apply plugin: 'net.kyori.indra.checkstyle' + //apply plugin: 'net.kyori.indra.checkstyle' apply plugin: 'net.kyori.indra.publishing' apply plugin: 'com.github.johnrengelman.shadow' @@ -62,6 +62,7 @@ subprojects { includeGroup "com.github.milkbowl" } } + maven { url = 'https://telesphoreo.me/repo/maven/'} } dependencies { @@ -87,7 +88,7 @@ subprojects { } indra { - checkstyle = "$checkstyleVersion" + //checkstyle = "$checkstyleVersion" github('EssentialsX', 'Essentials') gpl3OnlyLicense() @@ -142,9 +143,7 @@ subprojects { } def outputTasks() { - [":EssentialsX:shadowJar", ":EssentialsXAntiBuild:jar", ":EssentialsXChat:jar", - ":EssentialsXGeoIP:shadowJar", ":EssentialsXProtect:jar", ":EssentialsXSpawn:jar", - ":EssentialsXXMPP:shadowJar"].stream().map({ tasks.findByPath(it) }) + [":EssentialsX:shadowJar", ":EssentialsXSpawn:jar"].stream().map({ tasks.findByPath(it) }) } task copyToJars(type: Copy) { diff --git a/settings.gradle b/settings.gradle index 36b6b34ad..34709be92 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,12 +3,7 @@ rootProject.name = 'EssentialsXParent' // Modules [ "", - "AntiBuild", - "Chat", - "GeoIP", - "Protect", "Spawn", - "XMPP", ].each { include(":EssentialsX$it") project(":EssentialsX$it").projectDir = file("Essentials$it")