From 7fb487a344cc0ab6c6d30887e999876af086deee Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 4 Dec 2025 14:32:32 +0100 Subject: [PATCH] Add support for 1.21.11-pre5 --- libraries/packets/implementations/1_21_11/build.gradle.kts | 2 +- .../java/de/oliver/fancysitula/api/utils/ServerVersion.java | 2 +- plugins/fancydialogs/VERSION | 2 +- plugins/fancydialogs/build.gradle.kts | 2 +- plugins/fancydialogs/snapshot_deployment_config.json | 2 +- plugins/fancyholograms-v2/VERSION | 2 +- plugins/fancyholograms-v2/build.gradle.kts | 2 +- plugins/fancyholograms-v2/snapshot_deployment_config.json | 2 +- plugins/fancyholograms/VERSION | 2 +- plugins/fancyholograms/build.gradle.kts | 2 +- plugins/fancyholograms/snapshot_deployment_config.json | 2 +- plugins/fancynpcs/VERSION | 2 +- plugins/fancynpcs/build.gradle.kts | 2 +- plugins/fancynpcs/implementation_1_21_11/build.gradle.kts | 3 +-- plugins/fancynpcs/implementation_1_21_6/build.gradle.kts | 1 - plugins/fancynpcs/implementation_1_21_9/build.gradle.kts | 1 - plugins/fancynpcs/snapshot_deployment_config.json | 2 +- .../main/java/de/oliver/fancynpcs/AttributeManagerImpl.java | 2 +- .../src/main/java/de/oliver/fancynpcs/FancyNpcs.java | 4 ++-- .../de/oliver/fancynpcs/commands/CloudCommandManager.java | 2 +- 20 files changed, 19 insertions(+), 22 deletions(-) diff --git a/libraries/packets/implementations/1_21_11/build.gradle.kts b/libraries/packets/implementations/1_21_11/build.gradle.kts index 340a8fbe..e22cd0d4 100644 --- a/libraries/packets/implementations/1_21_11/build.gradle.kts +++ b/libraries/packets/implementations/1_21_11/build.gradle.kts @@ -6,7 +6,7 @@ plugins { paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION dependencies { - paperweight.paperDevBundle("1.21.11-pre4-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21.11-pre5-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) testImplementation(project(":libraries:packets")) diff --git a/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java b/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java index 7cad3f8a..5e56f693 100644 --- a/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java +++ b/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java @@ -7,7 +7,7 @@ import java.util.List; public enum ServerVersion { - v1_21_11("1.21.11 Pre-Release 4", 774), + v1_21_11("1.21.11 Pre-Release 5", 774), v1_21_10("1.21.10", 773), v1_21_9("1.21.9", 773), v1_21_8("1.21.8", 772), diff --git a/plugins/fancydialogs/VERSION b/plugins/fancydialogs/VERSION index aed759bb..7fb101cc 100644 --- a/plugins/fancydialogs/VERSION +++ b/plugins/fancydialogs/VERSION @@ -1 +1 @@ -1.0.1.35 \ No newline at end of file +1.0.1.36 \ No newline at end of file diff --git a/plugins/fancydialogs/build.gradle.kts b/plugins/fancydialogs/build.gradle.kts index 09641dd8..d94c57e0 100644 --- a/plugins/fancydialogs/build.gradle.kts +++ b/plugins/fancydialogs/build.gradle.kts @@ -85,7 +85,7 @@ paper { tasks { runServer { - minecraftVersion("1.21.11-pre3") + minecraftVersion("1.21.11-pre5") downloadPlugins { // modrinth("fancynpcs", "2.8.0") diff --git a/plugins/fancydialogs/snapshot_deployment_config.json b/plugins/fancydialogs/snapshot_deployment_config.json index e38c68b4..c2da12c7 100644 --- a/plugins/fancydialogs/snapshot_deployment_config.json +++ b/plugins/fancydialogs/snapshot_deployment_config.json @@ -11,7 +11,7 @@ "1.21.8", "1.21.9", "1.21.10", - "1.21.11-pre4" + "1.21.11-pre5" ], "channel": "beta", "loaders": [ diff --git a/plugins/fancyholograms-v2/VERSION b/plugins/fancyholograms-v2/VERSION index 8b5790d6..e9fb8343 100644 --- a/plugins/fancyholograms-v2/VERSION +++ b/plugins/fancyholograms-v2/VERSION @@ -1 +1 @@ -2.8.0.163 \ No newline at end of file +2.8.0.164 \ No newline at end of file diff --git a/plugins/fancyholograms-v2/build.gradle.kts b/plugins/fancyholograms-v2/build.gradle.kts index 05f3fc17..f824d531 100644 --- a/plugins/fancyholograms-v2/build.gradle.kts +++ b/plugins/fancyholograms-v2/build.gradle.kts @@ -90,7 +90,7 @@ paper { tasks { runServer { - minecraftVersion("1.21.11-pre3") + minecraftVersion("1.21.11-pre5") downloadPlugins { // modrinth("fancynpcs", "2.5.2") diff --git a/plugins/fancyholograms-v2/snapshot_deployment_config.json b/plugins/fancyholograms-v2/snapshot_deployment_config.json index 6867a12c..2f6229c5 100644 --- a/plugins/fancyholograms-v2/snapshot_deployment_config.json +++ b/plugins/fancyholograms-v2/snapshot_deployment_config.json @@ -24,7 +24,7 @@ "1.21.8", "1.21.9", "1.21.10", - "1.21.11-pre4" + "1.21.11-pre5" ], "channel": "beta", "loaders": [ diff --git a/plugins/fancyholograms/VERSION b/plugins/fancyholograms/VERSION index 58f5291e..c7d33c0a 100644 --- a/plugins/fancyholograms/VERSION +++ b/plugins/fancyholograms/VERSION @@ -1 +1 @@ -3.0.0-SNAPSHOT.14 \ No newline at end of file +3.0.0-SNAPSHOT.15 \ No newline at end of file diff --git a/plugins/fancyholograms/build.gradle.kts b/plugins/fancyholograms/build.gradle.kts index b8376aad..9acb2e2b 100644 --- a/plugins/fancyholograms/build.gradle.kts +++ b/plugins/fancyholograms/build.gradle.kts @@ -96,7 +96,7 @@ paper { tasks { runServer { - minecraftVersion("1.21.11-pre3") + minecraftVersion("1.21.11-pre5") downloadPlugins { modrinth("fancynpcs", "2.7.0") diff --git a/plugins/fancyholograms/snapshot_deployment_config.json b/plugins/fancyholograms/snapshot_deployment_config.json index 36f7a0a4..fa56d455 100644 --- a/plugins/fancyholograms/snapshot_deployment_config.json +++ b/plugins/fancyholograms/snapshot_deployment_config.json @@ -19,7 +19,7 @@ "1.21.8", "1.21.9", "1.21.10", - "1.21.11-pre4" + "1.21.11-pre5" ], "channel": "alpha", "loaders": [ diff --git a/plugins/fancynpcs/VERSION b/plugins/fancynpcs/VERSION index 5e04ddfb..7676ef7c 100644 --- a/plugins/fancynpcs/VERSION +++ b/plugins/fancynpcs/VERSION @@ -1 +1 @@ -2.8.1.315 \ No newline at end of file +2.8.1.316 \ No newline at end of file diff --git a/plugins/fancynpcs/build.gradle.kts b/plugins/fancynpcs/build.gradle.kts index c1f8a4d5..12eeaf32 100644 --- a/plugins/fancynpcs/build.gradle.kts +++ b/plugins/fancynpcs/build.gradle.kts @@ -95,7 +95,7 @@ paper { tasks { runServer { - minecraftVersion("1.21.11-pre3") + minecraftVersion("1.21.11-pre5") downloadPlugins { // hangar("ViaVersion", "5.4.0") diff --git a/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts b/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts index d48b32d9..885bc9f2 100644 --- a/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts +++ b/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts @@ -6,8 +6,7 @@ plugins { paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION dependencies { - paperweight.paperDevBundle("1.21.11-pre4-R0.1-SNAPSHOT") -// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2") + paperweight.paperDevBundle("1.21.11-pre5-R0.1-SNAPSHOT") compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly(project(":libraries:common")) diff --git a/plugins/fancynpcs/implementation_1_21_6/build.gradle.kts b/plugins/fancynpcs/implementation_1_21_6/build.gradle.kts index 6d2d239a..75e6acbe 100644 --- a/plugins/fancynpcs/implementation_1_21_6/build.gradle.kts +++ b/plugins/fancynpcs/implementation_1_21_6/build.gradle.kts @@ -7,7 +7,6 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt dependencies { paperweight.paperDevBundle("1.21.7-R0.1-SNAPSHOT") -// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2") compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly(project(":libraries:common")) diff --git a/plugins/fancynpcs/implementation_1_21_9/build.gradle.kts b/plugins/fancynpcs/implementation_1_21_9/build.gradle.kts index fb69865b..a0af5ce4 100644 --- a/plugins/fancynpcs/implementation_1_21_9/build.gradle.kts +++ b/plugins/fancynpcs/implementation_1_21_9/build.gradle.kts @@ -7,7 +7,6 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt dependencies { paperweight.paperDevBundle("1.21.9-R0.1-SNAPSHOT") -// compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2") compileOnly(project(":plugins:fancynpcs:fn-api")) compileOnly(project(":libraries:common")) diff --git a/plugins/fancynpcs/snapshot_deployment_config.json b/plugins/fancynpcs/snapshot_deployment_config.json index f183eba8..7387e9be 100644 --- a/plugins/fancynpcs/snapshot_deployment_config.json +++ b/plugins/fancynpcs/snapshot_deployment_config.json @@ -24,7 +24,7 @@ "1.21.8", "1.21.9", "1.21.10", - "1.21.11-pre4" + "1.21.11-pre5" ], "channel": "beta", "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 3c665b3c..c20bf134 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java @@ -31,7 +31,7 @@ public class AttributeManagerImpl implements AttributeManager { private void init() { String mcVersion = Bukkit.getMinecraftVersion(); switch (mcVersion) { - case "1.21.11 Pre-Release 4" -> attributes = Attributes_1_21_11.getAllAttributes(); + case "1.21.11 Pre-Release 5" -> attributes = Attributes_1_21_11.getAllAttributes(); case "1.21.9", "1.21.10" -> attributes = Attributes_1_21_9.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(); 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 58ea3a92..91a77108 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java @@ -164,7 +164,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin { String mcVersion = Bukkit.getMinecraftVersion(); switch (mcVersion) { - case "1.21.11 Pre-Release 4" -> npcAdapter = Npc_1_21_11::new; + case "1.21.11 Pre-Release 5" -> npcAdapter = Npc_1_21_11::new; case "1.21.9", "1.21.10" -> npcAdapter = Npc_1_21_9::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; @@ -277,7 +277,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin { pluginManager.registerEvents(new PlayerTeleportListener(), instance); pluginManager.registerEvents(new PlayerChangedWorldListener(), instance); pluginManager.registerEvents(skinManager, instance); - if (Set.of("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 4").contains(Bukkit.getMinecraftVersion())) { + if (Set.of("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 5").contains(Bukkit.getMinecraftVersion())) { 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 832ce512..01042585 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 @@ -199,7 +199,7 @@ public final class CloudCommandManager { annotationParser.parse(FancyNpcsDebugCMD.INSTANCE); } - if (Set.of("1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 4").contains(Bukkit.getMinecraftVersion())) { + if (Set.of("1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 5").contains(Bukkit.getMinecraftVersion())) { annotationParser.parse(ScaleCMD.INSTANCE); }