From 93f0c1efbff025b531d09b16f78a1834d95a5984 Mon Sep 17 00:00:00 2001
From: Erdragh <mail@erdragh.dev>
Date: Fri, 31 May 2024 22:43:59 +0200
Subject: [PATCH] Hotfix missing classes

---
 CHANGELOG.md      |  3 +++
 build.gradle.kts  | 11 ++++++++++-
 gradle.properties |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f964d3..ef86e10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.5.1
+Hotfix for Versions 1.18.2 - 1.20.1 fixing missing classes
+
 # 1.5.0
 - Introduce webhook chat sync, allowing for user imitation
   
diff --git a/build.gradle.kts b/build.gradle.kts
index cf2d328..204799f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 import dev.architectury.plugin.ArchitectPluginExtension
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
+import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
     // This is an Architectury repository, as such the relevant plugins are needed
@@ -240,7 +241,7 @@ subprojects {
         tasks.named<ShadowJar>("shadowJar") {
             // The shadowBotDep configuration was explicitly made to be shaded in, this is where that happens
             configurations.clear()
-            configurations = listOf(shadowBotDep)
+            configurations = listOf(shadowBotDep, shadowCommon)
 
             // This transforms the service files to make relocated Exposed work (see: https://github.com/JetBrains/Exposed/issues/1353)
             mergeServiceFiles()
@@ -273,6 +274,14 @@ subprojects {
             exclude("**/org/jetbrains/annotations/*")
             exclude("**/org/intellij/**")
         }
+
+        tasks.named<RemapJarTask>("remapJar") {
+            inputFile.set(tasks.named<ShadowJar>("shadowJar").get().archiveFile)
+            dependsOn("shadowJar")
+            // Results in the remapped jar not having any extra bit in
+            // its file name, identifying it as the main distribution
+            archiveClassifier.set(null as String?)
+        }
     }
 
     // Disables Gradle's custom module metadata from being published to maven. The
diff --git a/gradle.properties b/gradle.properties
index 39ecaab..4aaa1b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ license=MIT
 title=AstralBot
 description=Discord Bot and Minecraft Mod in one bundle.
 credits=Erdragh
-version=1.5.0
+version=1.5.1
 group=dev.erdragh.astralbot
 modId=astralbot
 modAuthor=Erdragh