From e759dc2269099d0d8d0006e5d858cd23bda3c065 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sat, 15 Jun 2024 13:41:34 -0500
Subject: [PATCH] Update to 1.20.6

---
 build.gradle.kts                              |  2 +-
 server/build.gradle.kts                       |  5 ++--
 .../dev/plex/listener/impl/MobListener.java   | 29 +++++++++++--------
 .../plex/listener/impl/ServerListener.java    |  3 +-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 398e8da..317cc00 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,7 +42,7 @@ subprojects {
     }
 
     java {
-        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
     }
 
     tasks {
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index b19abba..17d4202 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -22,8 +22,7 @@ dependencies {
     library("com.zaxxer:HikariCP:5.1.0")
     library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.20")
     library("org.jetbrains:annotations:24.1.0")
-
-    compileOnly("dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("dev.folia:folia-api:1.20.6-R0.1-SNAPSHOT")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") {
         exclude("org.bukkit", "bukkit")
     }
@@ -50,7 +49,7 @@ paper {
     loader = "dev.plex.PlexLibraryManager"
     website = "https://plex.us.org"
     authors = listOf("Telesphoreo", "taahanis", "supernt")
-    apiVersion = "1.19"
+    apiVersion = "1.20.5"
     foliaSupported = true
     generateLibrariesJson = true
     // Load BukkitTelnet and LibsDisguises before Plex so the modules register properly
diff --git a/server/src/main/java/dev/plex/listener/impl/MobListener.java b/server/src/main/java/dev/plex/listener/impl/MobListener.java
index ec88c2d..9a2367f 100644
--- a/server/src/main/java/dev/plex/listener/impl/MobListener.java
+++ b/server/src/main/java/dev/plex/listener/impl/MobListener.java
@@ -37,14 +37,7 @@ public class MobListener extends PlexListener
         EntityType eggType;
         try
         {
-            if (mat == Material.MOOSHROOM_SPAWN_EGG)
-            {
-                eggType = EntityType.MUSHROOM_COW;
-            }
-            else
-            {
-                eggType = EntityType.valueOf(mat.name().substring(0, mat.name().length() - 10));
-            }
+            eggType = EntityType.valueOf(mat.name().substring(0, mat.name().length() - 10));
         }
         catch (IllegalArgumentException ignored)
         {
@@ -56,7 +49,10 @@ public class MobListener extends PlexListener
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent event)
     {
-        if (event.isCancelled()) return;
+        if (event.isCancelled())
+        {
+            return;
+        }
         if (event.getEntity().getEntitySpawnReason() == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG)
         {
             // for the future, we can instead filter and restrict nbt tags right here.
@@ -106,7 +102,10 @@ public class MobListener extends PlexListener
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityClick(PlayerInteractEntityEvent event)
     {
-        if (event.isCancelled()) return;
+        if (event.isCancelled())
+        {
+            return;
+        }
         Material handItem = event.getPlayer().getEquipment().getItem(event.getHand()).getType();
         if (event.getRightClicked() instanceof Ageable entity)
         {
@@ -128,8 +127,14 @@ public class MobListener extends PlexListener
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerInteract(PlayerInteractEvent event)
     {
-        if (event.useItemInHand() == Event.Result.DENY) return;
-        if (event.useInteractedBlock() == Event.Result.DENY) return;
+        if (event.useItemInHand() == Event.Result.DENY)
+        {
+            return;
+        }
+        if (event.useInteractedBlock() == Event.Result.DENY)
+        {
+            return;
+        }
         if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)
         {
             if (SPAWN_EGGS.contains(event.getMaterial()))
diff --git a/server/src/main/java/dev/plex/listener/impl/ServerListener.java b/server/src/main/java/dev/plex/listener/impl/ServerListener.java
index 78d6049..3e48276 100644
--- a/server/src/main/java/dev/plex/listener/impl/ServerListener.java
+++ b/server/src/main/java/dev/plex/listener/impl/ServerListener.java
@@ -34,6 +34,7 @@ public class ServerListener extends PlexListener
         {
             event.motd(PlexUtils.mmDeserialize(baseMotd.trim()));
         }
+        /* - Broken on 1.20.6
         if (plugin.config.contains("server.sample"))
         {
             List<String> samples = plugin.config.getStringList("server.sample");
@@ -42,6 +43,6 @@ public class ServerListener extends PlexListener
                 event.getPlayerSample().clear();
                 event.getPlayerSample().addAll(samples.stream().map(string -> string.replace("&", "§")).map(Bukkit::createProfile).toList());
             }
-        }
+        }*/
     }
 }