diff --git a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java index 0a78079..40e8988 100755 --- a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java +++ b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java @@ -59,11 +59,7 @@ public class DatabaseConnection { public static Connection getConnection() { try { instance.openConnection(); - } - catch (SQLException e) { - e.printStackTrace(); - } - catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } diff --git a/build.gradle.kts b/build.gradle.kts index d06f472..51efbe8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,14 +33,22 @@ dependencies { // implementation(project(":api")) implementation(project(":galaxy")) implementation(project(":velocity")) - implementation("net.kyori", "adventure-text-minimessage", "4.1.0-SNAPSHOT") - implementation("org.spongepowered", "configurate-yaml", "4.1.2") +// implementation("net.kyori", "adventure-text-minimessage", "4.1.0-SNAPSHOT") { +// exclude("net.kyori") +// exclude("net.kyori.examination") +// } +// implementation("org.spongepowered", "configurate-yaml", "4.1.2") +// implementation("mysql:mysql-connector-java:8.0.27") // mysql } tasks { shadowJar { archiveFileName.set("${project.name}-${project.version}.jar") + minimize() { + exclude { it.moduleName == "galaxy" } + exclude { it.moduleName == "velocity" } + } listOf( "net.kyori.adventure.text.minimessage", "org.spongepowered.configurate" diff --git a/galaxy/build.gradle.kts b/galaxy/build.gradle.kts index cd86574..2dbbb06 100644 --- a/galaxy/build.gradle.kts +++ b/galaxy/build.gradle.kts @@ -1,9 +1,23 @@ plugins { `maven-publish` + id("com.github.johnrengelman.shadow") } dependencies { implementation(project(":api")) // API compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") // Galaxy compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") +} + +tasks { + + shadowJar { + archiveFileName.set("${project.name}-${project.version}.jar") +// minimize() + } + + build { + dependsOn(shadowJar) + } + } \ No newline at end of file diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 5e02352..1978bef 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -1,11 +1,33 @@ plugins { `maven-publish` + id("com.github.johnrengelman.shadow") } dependencies { implementation(project(":api")) // API compileOnly("com.velocitypowered:velocity-api:3.0.0") // Velocity annotationProcessor("com.velocitypowered:velocity-api:3.0.0") - implementation("mysql:mysql-connector-java:8.0.23") // mysql - compileOnly("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Minimessage + implementation("mysql:mysql-connector-java:8.0.27") // mysql + implementation("org.spongepowered", "configurate-yaml", "4.1.2") + implementation("net.kyori", "adventure-text-minimessage", "4.1.0-SNAPSHOT") { + exclude("net.kyori") + exclude("net.kyori.examination") + } +} + +tasks { + + shadowJar { + archiveFileName.set("${project.name}-${project.version}.jar") +// minimize() + listOf( + "net.kyori.adventure.text.minimessage", + "org.spongepowered.configurate" + ).forEach { relocate(it, "${rootProject.group}.lib.$it") } + } + + build { + dependsOn(shadowJar) + } + } \ No newline at end of file