Merge pull request #8 from SKBotNL/main

Remove Reactor from shadow exclusions and relocate and update dependencies

build.gradle.kts

@@ -4,8 +4,8 @@
 plugins {
     id("java") // Import Java plugin.
     id("java-library") // Import Java Library plugin.
-    id("com.diffplug.spotless") version "7.0.4" // Import Spotless plugin.
-    id("com.gradleup.shadow") version "8.3.6" // Import Shadow plugin.
+    id("com.diffplug.spotless") version "8.1.0" // Import Spotless plugin.
+    id("com.gradleup.shadow") version "8.3.9" // Import Shadow plugin.
     eclipse // Import Eclipse plugin.
     kotlin("jvm") version "2.1.21" // Import Kotlin JVM plugin.
 }
@@ -63,19 +63,18 @@ dependencies {
     compileOnlyApi(project(":libs:Utilities-OG")) // Import TrueOG Network Utilities-OG Java API (from source).
     compileOnly("net.luckperms:api:5.5") // Import LuckPerms API.
 
-    implementation("net.dv8tion:JDA:5.5.1")
+    implementation("net.dv8tion:JDA:6.1.2")
     implementation("club.minnced:jda-ktx:0.12.0")
     implementation("club.minnced:discord-webhooks:0.8.4")
-    implementation("com.google.code.gson:gson:2.13.1")
-    implementation("io.lettuce:lettuce-core:6.7.1.RELEASE")
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.google.code.gson:gson:2.13.2")
+    implementation("io.lettuce:lettuce-core:7.2.0.RELEASE")
+    implementation("com.squareup.okhttp3:okhttp:5.3.2")
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
 }
 
 configurations.all {
     exclude(group = "com.google.crypto.tink", module = "tink")
     exclude(group = "net.java", module = "opus-java")
-    exclude(group = "io.projectreactor")
 }
 
 /* ---------------------- Reproducible jars ---------------------------- */
@@ -87,6 +86,8 @@ tasks.withType<AbstractArchiveTask>().configureEach { // Ensure reproducible .ja
 /* ----------------------------- Shadow -------------------------------- */
 tasks.shadowJar {
     archiveClassifier.set("") // Use empty string instead of null.
+    isEnableRelocation = true
+    relocationPrefix = "${project.group}.shadow"
     exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed.
     exclude("natives/**")
     minimize()

gen.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const https = require('https')
 
-const EMOJI_VERSION = '16.0'
+const EMOJI_VERSION = '17.0.0'
 
 main()
 
@@ -40,7 +40,7 @@ async function main () {
 }
 
 async function getTestFile (ver) {
-  const url = `https://unicode.org/Public/emoji/${ver}/emoji-test.txt`
+  const url = `https://unicode.org/Public/${ver}/emoji/emoji-test.txt`
 
   process.stdout.write(`Fetch emoji-test.txt (v${EMOJI_VERSION})`)
   return new Promise((resolve, reject) => {

src/main/resources/emoji.json

@@ -359,6 +359,10 @@
     "char": "😳",
     "name": "flushed_face"
   },
+  {
+    "char": "🫪",
+    "name": "distorted_face"
+  },
   {
     "char": "🥺",
     "name": "pleading_face"
@@ -671,6 +675,10 @@
     "char": "💢",
     "name": "anger_symbol"
   },
+  {
+    "char": "🫯",
+    "name": "fight_cloud"
+  },
   {
     "char": "💥",
     "name": "collision"
@@ -1971,6 +1979,10 @@
     "char": "🧌",
     "name": "troll"
   },
+  {
+    "char": "🫈",
+    "name": "hairy_creature"
+  },
   {
     "char": "💆",
     "name": "person_getting_massage"
@@ -2319,6 +2331,10 @@
     "char": "🏃‍♂‍➡",
     "name": "man_running_facing_right"
   },
+  {
+    "char": "🧑‍🩰",
+    "name": "ballet_dancer"
+  },
   {
     "char": "💃",
     "name": "woman_dancing"
@@ -3411,6 +3427,10 @@
     "char": "🐬",
     "name": "dolphin"
   },
+  {
+    "char": "🫍",
+    "name": "orca"
+  },
   {
     "char": "🦭",
     "name": "seal"
@@ -4243,6 +4263,10 @@
     "char": "⛰",
     "name": "mountain"
   },
+  {
+    "char": "🛘",
+    "name": "landslide"
+  },
   {
     "char": "🌋",
     "name": "volcano"
@@ -5935,6 +5959,14 @@
     "char": "🎷",
     "name": "saxophone"
   },
+  {
+    "char": "🎺",
+    "name": "trumpet"
+  },
+  {
+    "char": "🪊",
+    "name": "trombone"
+  },
   {
     "char": "🪗",
     "name": "accordion"
@@ -5947,10 +5979,6 @@
     "char": "🎹",
     "name": "musical_keyboard"
   },
-  {
-    "char": "🎺",
-    "name": "trumpet"
-  },
   {
     "char": "🎻",
     "name": "violin"
@@ -6235,13 +6263,17 @@
     "char": "🏷",
     "name": "label"
   },
+  {
+    "char": "🪙",
+    "name": "coin"
+  },
   {
     "char": "💰",
     "name": "money_bag"
   },
   {
-    "char": "🪙",
-    "name": "coin"
+    "char": "🪎",
+    "name": "treasure_chest"
   },
   {
     "char": "💴",