From 050da40cacfc1bff80dfc05ab8a931f58b2ca67b Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Wed, 22 Sep 2021 17:37:58 +0200 Subject: [PATCH 1/4] fix exclusions in shadowjar task --- build.gradle.kts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4184877..7007c85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - `java` + java id("com.github.johnrengelman.shadow") version "7.0.0" } @@ -32,7 +32,10 @@ allprojects { dependencies { // Minimessage - implementation("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") + implementation("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") { + exclude("net.kyori") + exclude("net.kyori.examination") + } // Velocity compileOnly("com.velocitypowered:velocity-api:1.1.5") annotationProcessor("com.velocitypowered:velocity-api:1.1.5") @@ -52,14 +55,12 @@ tasks { shadowJar { archiveFileName.set("${project.name}-${project.version}.jar") - exclude("net.kyori.adventure") - exclude("net.kyori.examination") - minimize { - //exclude(dependency("net.kyori:.*:.*")) - } +// exclude("net.kyori") +// exclude("net.kyori.examination") listOf( // "net.kyori", - "net.dv8tion.jda" + "net.dv8tion.jda", + "net.kyori.adventure.text.minimessage" ).forEach { relocate(it, "${rootProject.group}.lib.$it") } } From 89549ef12f8bc00fe33ebecdbd08fe8aa4e92920 Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Wed, 22 Sep 2021 20:30:05 +0200 Subject: [PATCH 2/4] add publishing plugin to gradle --- build.gradle.kts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 7007c85..f7cd394 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { java + `maven-publish` id("com.github.johnrengelman.shadow") version "7.0.0" } @@ -51,6 +52,23 @@ dependencies { compileOnly("com.alttd:ShutdownInfo:1.0") } +publishing { + publications { + create("mavenJava") { + from(components["java"]) + } + } + + repositories{ + maven { + name = "maven" + url = uri("http://leo:8081/") + isAllowInsecureProtocol = true + credentials(PasswordCredentials::class) + } + } +} + tasks { shadowJar { From c44be4ebd77a1a517e9ba65bbbb4d3315e51f4fa Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Thu, 23 Sep 2021 17:22:30 +0200 Subject: [PATCH 3/4] make jda public for api usage --- src/main/java/com/alttd/proxydiscordlink/bot/Bot.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java b/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java index 29cb5e5..4c1bc0f 100644 --- a/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java +++ b/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java @@ -3,7 +3,6 @@ package com.alttd.proxydiscordlink.bot; import com.alttd.proxydiscordlink.bot.listeners.DiscordMessageListener; import com.alttd.proxydiscordlink.bot.listeners.DiscordRoleListener; import com.alttd.proxydiscordlink.config.BotConfig; -import com.alttd.proxydiscordlink.objects.DiscordLinkPlayer; import com.alttd.proxydiscordlink.util.ALogger; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.JDA; @@ -20,7 +19,7 @@ import javax.security.auth.login.LoginException; import java.util.concurrent.TimeUnit; public class Bot { - private JDA jda = null; + public JDA jda = null; public void connect() { disconnect(); From bad541cc653c059875030b7824d6f8d016f0060f Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Sun, 26 Dec 2021 14:02:47 +0100 Subject: [PATCH 4/4] update dependencies and repositories --- build.gradle.kts | 97 +++++++++---------- settings.gradle.kts | 7 +- .../com/alttd/proxydiscordlink/bot/Bot.java | 4 +- .../bot/listeners/DiscordMessageListener.java | 4 +- 4 files changed, 51 insertions(+), 61 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f7cd394..8681720 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,53 +1,66 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation + plugins { java `maven-publish` - id("com.github.johnrengelman.shadow") version "7.0.0" + id("com.github.johnrengelman.shadow") version "7.1.0" } -allprojects { - val build = System.getenv("BUILD_NUMBER") ?: "SNAPSHOT" - group = "com.alttd.proxydiscordlink" - version = "1.0.0-BETA-$build" - description = "A velocity plugin to link Discord and Minecraft accounts." +group = "com.alttd.proxydiscordlink" +version = "1.0.0-BETA-SNAPSHOT" +description = "A velocity plugin to link Discord and Minecraft accounts." - apply(plugin = "java") - apply(plugin = "maven-publish") - java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(16)) - } - } - - tasks { - withType { - options.encoding = Charsets.UTF_8.name() - options.release.set(16) - } - - withType { - options.encoding = Charsets.UTF_8.name() - } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) } } +tasks { + withType { + options.encoding = Charsets.UTF_8.name() + options.release.set(17) + } + + withType { + options.encoding = Charsets.UTF_8.name() + } + + shadowJar { + dependsOn(getByName("relocateJars") as ConfigureShadowRelocation) + archiveFileName.set("${project.name}-${project.version}.jar") + minimize() + configurations = listOf(project.configurations.shadow.get()) + } + + build { + dependsOn(shadowJar) + } + + create("relocateJars") { + target = shadowJar.get() + prefix = "${project.name}.lib" + } +} + + dependencies { - // Minimessage - implementation("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") { - exclude("net.kyori") - exclude("net.kyori.examination") + // Minimessage // TODO : update all usages to 4.2 + shadow("net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT") { + exclude("net.kyori", "adventure-api") } // Velocity - compileOnly("com.velocitypowered:velocity-api:1.1.5") - annotationProcessor("com.velocitypowered:velocity-api:1.1.5") + compileOnly("com.velocitypowered:velocity-api:3.0.1") + annotationProcessor("com.velocitypowered:velocity-api:3.0.1") // JDA - implementation("net.dv8tion:JDA:4.3.0_283") { + shadow("net.dv8tion:JDA:5.0.0-alpha.3") { exclude("opus-java") // exclude audio } // LuckPerms compileOnly("net.luckperms:api:5.3") // MySQL - runtimeOnly("mysql:mysql-connector-java:8.0.23") + shadow("mysql:mysql-connector-java:8.0.25") // ShutdownInfo compileOnly("com.alttd:ShutdownInfo:1.0") } @@ -62,28 +75,8 @@ publishing { repositories{ maven { name = "maven" - url = uri("http://leo:8081/") - isAllowInsecureProtocol = true + url = uri("https://repo.destro.xyz/snapshots") credentials(PasswordCredentials::class) } } } - -tasks { - - shadowJar { - archiveFileName.set("${project.name}-${project.version}.jar") -// exclude("net.kyori") -// exclude("net.kyori.examination") - listOf( -// "net.kyori", - "net.dv8tion.jda", - "net.kyori.adventure.text.minimessage" - ).forEach { relocate(it, "${rootProject.group}.lib.$it") } - } - - build { - dependsOn(shadowJar) - } - -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 772026e..043b8a3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,9 +6,8 @@ dependencyResolutionManagement { // Altitude maven { name = "maven" - url = uri("http://leo:8081/") - isAllowInsecureProtocol = true - //credentials(PasswordCredentials::class) + url = uri("https://repo.destro.xyz/snapshots") + credentials(PasswordCredentials::class) } // Velocity maven("https://nexus.velocitypowered.com/repository/maven-public/") @@ -16,8 +15,6 @@ dependencyResolutionManagement { maven("https://m2.dv8tion.net/releases/") // MiniMessage maven("https://oss.sonatype.org/content/repositories/snapshots/") - // Local maven repo .m2 - mavenLocal() } repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) } diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java b/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java index 4c1bc0f..ce55ff4 100644 --- a/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java +++ b/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java @@ -87,9 +87,9 @@ public class Bot { if (embedBuilder.isEmpty()) return; try { if (secondsTillDelete < 0) { - channel.sendMessage(embedBuilder.build()).queue(); + channel.sendMessageEmbeds(embedBuilder.build()).queue(); } else { - channel.sendMessage(embedBuilder.build()).queue(message -> message.delete().queueAfter(secondsTillDelete, TimeUnit.SECONDS)); + channel.sendMessageEmbeds(embedBuilder.build()).queue(message -> message.delete().queueAfter(secondsTillDelete, TimeUnit.SECONDS)); } } catch (Exception e) { ALogger.error("caught some exception, " + e); diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordMessageListener.java b/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordMessageListener.java index 4649b9e..50867df 100644 --- a/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordMessageListener.java +++ b/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordMessageListener.java @@ -4,7 +4,7 @@ import com.alttd.proxydiscordlink.DiscordLink; import com.alttd.proxydiscordlink.bot.Bot; import com.alttd.proxydiscordlink.bot.DiscordCommand; import com.alttd.proxydiscordlink.config.BotConfig; -import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import java.util.Arrays; @@ -21,7 +21,7 @@ public class DiscordMessageListener extends ListenerAdapter { } @Override - public void onGuildMessageReceived(GuildMessageReceivedEvent event) { + public void onMessageReceived(MessageReceivedEvent event) { if (event.getAuthor() == event.getJDA().getSelfUser()) { return; }