From bf4aa365261f2b44df1bc10c438baf1b09bf5cd6 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 17 Jul 2025 15:31:48 +0200 Subject: [PATCH] fancynpcs: Add support for 1.21.8 --- plugins/fancynpcs/README.md | 2 +- plugins/fancynpcs/VERSION | 2 +- plugins/fancynpcs/release_deployment_config.json | 3 ++- plugins/fancynpcs/snapshot_deployment_config.json | 3 ++- .../main/java/de/oliver/fancynpcs/AttributeManagerImpl.java | 2 +- .../src/main/java/de/oliver/fancynpcs/FancyNpcs.java | 6 +++--- .../de/oliver/fancynpcs/commands/CloudCommandManager.java | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/fancynpcs/README.md b/plugins/fancynpcs/README.md index d45deb73..7e933f53 100644 --- a/plugins/fancynpcs/README.md +++ b/plugins/fancynpcs/README.md @@ -35,7 +35,7 @@ Check out **[images section](#images)** down below. ## Installation -Paper **1.19.4** - **1.21.6** with **Java 21** (or higher) is required. Plugin should also work on **Paper** forks. +Paper **1.19.4** - **1.21.8** with **Java 21** (or higher) is required. Plugin should also work on **Paper** forks. **Spigot** is **not** supported. diff --git a/plugins/fancynpcs/VERSION b/plugins/fancynpcs/VERSION index 97034785..df87611b 100644 --- a/plugins/fancynpcs/VERSION +++ b/plugins/fancynpcs/VERSION @@ -1 +1 @@ -2.6.0.282 \ No newline at end of file +2.6.0.283 \ No newline at end of file diff --git a/plugins/fancynpcs/release_deployment_config.json b/plugins/fancynpcs/release_deployment_config.json index cec910cf..6bf5f4a7 100644 --- a/plugins/fancynpcs/release_deployment_config.json +++ b/plugins/fancynpcs/release_deployment_config.json @@ -20,7 +20,8 @@ "1.21.4", "1.21.5", "1.21.6", - "1.21.7" + "1.21.7", + "1.21.8" ], "channel": "RELEASE", "loaders": [ diff --git a/plugins/fancynpcs/snapshot_deployment_config.json b/plugins/fancynpcs/snapshot_deployment_config.json index 8dbddd5f..593be6bc 100644 --- a/plugins/fancynpcs/snapshot_deployment_config.json +++ b/plugins/fancynpcs/snapshot_deployment_config.json @@ -20,7 +20,8 @@ "1.21.4", "1.21.5", "1.21.6", - "1.21.7" + "1.21.7", + "1.21.8" ], "channel": "ALPHA", "loaders": [ diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java index d3bb355e..056e9e54 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java @@ -30,7 +30,7 @@ public class AttributeManagerImpl implements AttributeManager { private void init() { String mcVersion = Bukkit.getMinecraftVersion(); switch (mcVersion) { - case "1.21.6", "1.21.7" -> attributes = Attributes_1_21_6.getAllAttributes(); + case "1.21.6", "1.21.7", "1.21.8" -> attributes = Attributes_1_21_6.getAllAttributes(); case "1.21.5" -> attributes = Attributes_1_21_5.getAllAttributes(); case "1.21.4" -> attributes = Attributes_1_21_4.getAllAttributes(); case "1.21.2", "1.21.3" -> attributes = Attributes_1_21_3.getAllAttributes(); diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java index ec55dbb6..6a6c109f 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java @@ -153,7 +153,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin { String mcVersion = Bukkit.getMinecraftVersion(); switch (mcVersion) { - case "1.21.6", "1.21.7" -> npcAdapter = Npc_1_21_6::new; + case "1.21.6", "1.21.7", "1.21.8" -> npcAdapter = Npc_1_21_6::new; case "1.21.5" -> npcAdapter = Npc_1_21_5::new; case "1.21.4" -> npcAdapter = Npc_1_21_4::new; case "1.21.2", "1.21.3" -> npcAdapter = Npc_1_21_3::new; @@ -179,7 +179,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin { fancyLogger.error("Unsupported minecraft server version."); getLogger().warning("--------------------------------------------------"); getLogger().warning("Unsupported minecraft server version."); - getLogger().warning("This plugin only supports 1.19.4 - 1.21.7"); + getLogger().warning("This plugin only supports 1.19.4 - 1.21.8"); getLogger().warning("Disabling the FancyNpcs plugin."); getLogger().warning("--------------------------------------------------"); pluginManager.disablePlugin(this); @@ -265,7 +265,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin { pluginManager.registerEvents(new PlayerTeleportListener(), instance); pluginManager.registerEvents(new PlayerChangedWorldListener(), instance); pluginManager.registerEvents(skinManager, instance); - if (Bukkit.getMinecraftVersion().equals("1.21.4") || Bukkit.getMinecraftVersion().equals("1.21.5") || Bukkit.getMinecraftVersion().equals("1.21.6") || Bukkit.getMinecraftVersion().equals("1.21.7")) { + if (Bukkit.getMinecraftVersion().equals("1.21.4") || Bukkit.getMinecraftVersion().equals("1.21.5") || Bukkit.getMinecraftVersion().equals("1.21.6") || Bukkit.getMinecraftVersion().equals("1.21.7") || Bukkit.getMinecraftVersion().equals("1.21.8")) { getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this); } diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java index d1bc7280..aa47126c 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java @@ -198,7 +198,7 @@ public final class CloudCommandManager { } String mcVersion = Bukkit.getMinecraftVersion(); - if (mcVersion.equals("1.20.5") || mcVersion.equals("1.20.6") || mcVersion.equals("1.21") || mcVersion.equals("1.21.1") || mcVersion.equals("1.21.2") || mcVersion.equals("1.21.3") || mcVersion.equals("1.21.4") || mcVersion.equals("1.21.5") || mcVersion.equals("1.21.6") || mcVersion.equals("1.21.7")) { + if (mcVersion.equals("1.20.5") || mcVersion.equals("1.20.6") || mcVersion.equals("1.21") || mcVersion.equals("1.21.1") || mcVersion.equals("1.21.2") || mcVersion.equals("1.21.3") || mcVersion.equals("1.21.4") || mcVersion.equals("1.21.5") || mcVersion.equals("1.21.6") || mcVersion.equals("1.21.7") || Bukkit.getMinecraftVersion().equals("1.21.8")) { annotationParser.parse(ScaleCMD.INSTANCE); }