From ab791314859102bb0c7922dc0fcd9c7f2fa1a4d5 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sun, 22 Jun 2025 12:51:33 -0700
Subject: [PATCH] Updated for 1.21.6

---
 Changelog.txt                     |  5 +++++
 pom.xml                           | 33 +++++++++++++++++--------------
 src/main/resources/experience.yml |  2 ++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index e8a174645..5d2737f68 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,8 @@
+Version 2.2.040
+    (Codebase) Updated Adventure Libs
+    Added 'Happy_Ghast' to experience.yml for combat XP
+    Added 'Ghastling' to experience.yml for combat XP
+
 Version 2.2.039
     Added StackOverflow safeguards for abilities dealing damage in mcMMO
     Improved compatibility with MythicMobs/ModelEngine
diff --git a/pom.xml b/pom.xml
index 2b4596d6f..57aa17ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,10 @@
 
     <properties>
 <!--        <spigot.version>1.19-R0.1-SNAPSHOT</spigot.version>-->
-        <spigot.version>1.21.5-R0.1-SNAPSHOT</spigot.version>
-        <adventure.version>4.3.5-SNAPSHOT</adventure.version>
+        <spigot.version>1.21.6-R0.1-SNAPSHOT</spigot.version>
+        <kyori.adventure.version>4.23.0</kyori.adventure.version>
+        <kyori.adventure.platform.version>4.4.1-SNAPSHOT</kyori.adventure.platform.version>
+        <kyori.option.version>1.1.0</kyori.option.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -161,6 +163,7 @@
                             <include>net.kyori:adventure-platform-facet</include>
                             <include>net.kyori:adventure-platform-viaversion</include>
                             <include>net.kyori:adventure-text-serializer-bungeecord</include>
+                            <include>net.kyori:adventure-text-serializer-commons</include>
                             <include>net.kyori:adventure-text-serializer-gson</include>
                             <include>net.kyori:adventure-text-serializer-gson-legacy-impl</include>
                             <include>net.kyori:adventure-text-serializer-json</include>
@@ -316,67 +319,67 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-bungeecord</artifactId>
-            <version>${adventure.version}</version>
+            <version>${kyori.adventure.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-gson</artifactId>
-            <version>4.19.0</version>
+            <version>${kyori.adventure.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-gson-legacy-impl</artifactId>
-            <version>4.19.0</version>
+            <version>${kyori.adventure.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-json</artifactId>
-            <version>4.19.0</version>
+            <version>${kyori.adventure.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-json-legacy-impl</artifactId>
-            <version>4.19.0</version>
+            <version>${kyori.adventure.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.19.0</version>
+            <version>${kyori.adventure.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-nbt</artifactId>
-            <version>4.19.0</version>
+            <version>${kyori.adventure.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-key</artifactId>
-            <version>4.19.0</version>
+            <version>${kyori.adventure.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-api</artifactId>
-            <version>${adventure.version}</version>
+            <version>${kyori.adventure.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>${adventure.version}</version>
+            <version>${kyori.adventure.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-facet</artifactId>
-            <version>${adventure.version}</version>
+            <version>${kyori.adventure.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-viaversion</artifactId>
-            <version>${adventure.version}</version>
+            <version>${kyori.adventure.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>option</artifactId>
-            <version>1.0.0</version>
+            <version>${kyori.option.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.scm</groupId>
diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
index f6176ba6a..7e7c18725 100644
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -609,6 +609,8 @@ Experience_Values:
             Zombie: 2.0
             Slime: 2.0
             Ghast: 3.0
+            Happy_Ghast: 1.0
+            Ghastling: 0.5
             Pig_Zombie: 3.0
             Enderman: 1.0
             Cave_Spider: 3.0