From 24c1907eec96ff2be4ebe10034463b0172aaa482 Mon Sep 17 00:00:00 2001 From: TheosRee <103457311+TheosRee@users.noreply.github.com> Date: Sat, 8 Nov 2025 13:20:25 +0100 Subject: [PATCH] fancynpcs, fancyholograms: Use sets of Version Strings for checking if a version is valid (#142) * use set for checking if a version is valid * use Paper PR for snapshot reference --------- Co-authored-by: TheosRee --- build.gradle.kts | 7 +++++++ .../main/java/de/oliver/fancyholograms/FancyHolograms.java | 2 +- .../fancyholograms/main/FancyHologramsPlugin.java | 2 +- .../src/main/java/de/oliver/fancynpcs/FancyNpcs.java | 2 +- .../de/oliver/fancynpcs/commands/CloudCommandManager.java | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b977c4a9..6b3e943f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,5 +15,12 @@ allprojects { maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.fancyinnovations.com/releases") maven(url = "https://jitpack.io") + maven("https://maven-prs.papermc.io/Paper/pr13194") { + name = "Maven for PR #13194" // https://github.com/PaperMC/Paper/pull/13194 + mavenContent { + includeModule("io.papermc.paper", "dev-bundle") + includeModule("io.papermc.paper", "paper-api") + } + } } } diff --git a/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FancyHolograms.java b/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FancyHolograms.java index ab8fa58a..88b2ce3d 100644 --- a/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FancyHolograms.java +++ b/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FancyHolograms.java @@ -292,7 +292,7 @@ public final class FancyHolograms extends JavaPlugin implements FancyHologramsPl private void registerListeners() { getServer().getPluginManager().registerEvents(new PlayerListener(this), this); getServer().getPluginManager().registerEvents(new WorldListener(), this); - 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")) { + if (Set.of("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8").contains(Bukkit.getMinecraftVersion())) { getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this); } diff --git a/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsPlugin.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsPlugin.java index 776d7678..ac309d09 100644 --- a/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsPlugin.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsPlugin.java @@ -311,7 +311,7 @@ public final class FancyHologramsPlugin extends JavaPlugin implements FancyHolog getServer().getPluginManager().registerEvents(new PlayerListener(this), this); getServer().getPluginManager().registerEvents(new WorldLoadedListener(), this); - if (Bukkit.getMinecraftVersion().equals("1.21.4") || Bukkit.getMinecraftVersion().equals("1.21.5") || Bukkit.getMinecraftVersion().equals("1.21.6")) { + if (Set.of("1.21.4", "1.21.5", "1.21.6").contains(Bukkit.getMinecraftVersion())) { getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this); } 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 32ec2046..d1f0f38d 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java @@ -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 (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") || Bukkit.getMinecraftVersion().equals("1.21.9") || Bukkit.getMinecraftVersion().equals("1.21.10") || Bukkit.getMinecraftVersion().equals("1.21.11")) { + 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").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 90810b4c..a439876a 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 @@ -33,6 +33,7 @@ import org.incendo.cloud.parser.standard.EnumParser; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Set; import java.util.Optional; import static org.incendo.cloud.exception.handling.ExceptionHandler.unwrappingHandler; @@ -198,8 +199,7 @@ public final class CloudCommandManager { annotationParser.parse(FancyNpcsDebugCMD.INSTANCE); } - 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") || Bukkit.getMinecraftVersion().equals("1.21.8") || Bukkit.getMinecraftVersion().equals("1.21.9") || Bukkit.getMinecraftVersion().equals("1.21.10") || Bukkit.getMinecraftVersion().equals("1.21.11")) { + 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").contains(Bukkit.getMinecraftVersion())) { annotationParser.parse(ScaleCMD.INSTANCE); }