From 7fcd4f1d1ee878829e0e7aea416194fc3bf42831 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Fri, 28 Mar 2025 21:33:04 +0800 Subject: [PATCH] move other plugins to compatibility module --- bukkit/build.gradle.kts | 6 ------ bukkit/compatibility/build.gradle.kts | 7 +++++++ .../bukkit/compatibility}/papi/ImageExpansion.java | 2 +- .../bukkit/compatibility/papi}/PlaceholderAPIUtils.java | 8 +++++++- .../bukkit/compatibility}/papi/ShiftExpansion.java | 2 +- .../compatibility}/worldedit/WorldEditBlockRegister.java | 2 +- .../craftengine/bukkit/block/BukkitBlockManager.java | 3 +-- .../block/{worldedit => }/WorldEditCommandHelper.java | 3 +-- .../craftengine/bukkit/plugin/BukkitCraftEngine.java | 9 ++++----- 9 files changed, 23 insertions(+), 19 deletions(-) rename bukkit/{src/main/java/net/momirealms/craftengine/bukkit/plugin => compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility}/papi/ImageExpansion.java (97%) rename bukkit/{src/main/java/net/momirealms/craftengine/bukkit/util => compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi}/PlaceholderAPIUtils.java (50%) rename bukkit/{src/main/java/net/momirealms/craftengine/bukkit/plugin => compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility}/papi/ShiftExpansion.java (97%) rename bukkit/{src/main/java/net/momirealms/craftengine/bukkit/block => compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility}/worldedit/WorldEditBlockRegister.java (93%) rename bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/{worldedit => }/WorldEditCommandHelper.java (95%) diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index 356626a34..7b21b01a6 100644 --- a/bukkit/build.gradle.kts +++ b/bukkit/build.gradle.kts @@ -5,9 +5,7 @@ plugins { repositories { maven("https://jitpack.io/") - maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi maven("https://repo.papermc.io/repository/maven-public/") - maven("https://maven.enginehub.org/repo/") // worldguard worldedit maven("https://repo.momirealms.net/releases/") mavenCentral() } @@ -24,8 +22,6 @@ dependencies { compileOnly("net.momirealms:sparrow-util:${rootProject.properties["sparrow_util_version"]}") // NMS compileOnly("net.momirealms:craft-engine-nms-helper:${rootProject.properties["nms_helper_version"]}") - // Placeholder - compileOnly("me.clip:placeholderapi:${rootProject.properties["placeholder_api_version"]}") // Platform compileOnly("dev.folia:folia-api:${rootProject.properties["paper_version"]}-R0.1-SNAPSHOT") // OpenGL Math @@ -56,8 +52,6 @@ dependencies { compileOnly("net.kyori:adventure-text-serializer-gson:${rootProject.properties["adventure_bundle_version"]}") { exclude("com.google.code.gson", "gson") } - compileOnly("com.sk89q.worldedit:worldedit-core:7.2.19") - compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.19") // Data Fixer Upper compileOnly("com.mojang:datafixerupper:${rootProject.properties["datafixerupper_version"]}") // BStats diff --git a/bukkit/compatibility/build.gradle.kts b/bukkit/compatibility/build.gradle.kts index bc8304b72..55c07995f 100644 --- a/bukkit/compatibility/build.gradle.kts +++ b/bukkit/compatibility/build.gradle.kts @@ -2,6 +2,8 @@ repositories { mavenCentral() maven("https://repo.papermc.io/repository/maven-public/") maven("https://r.irepo.space/maven/") + maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi + maven("https://maven.enginehub.org/repo/") // worldguard worldedit } dependencies { @@ -10,6 +12,11 @@ dependencies { compileOnly("dev.folia:folia-api:${rootProject.properties["paper_version"]}-R0.1-SNAPSHOT") // NeigeItems compileOnly("pers.neige.neigeitems:NeigeItems:1.21.42") + // Placeholder + compileOnly("me.clip:placeholderapi:${rootProject.properties["placeholder_api_version"]}") + // WorldEdit + compileOnly("com.sk89q.worldedit:worldedit-core:7.2.19") + compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.19") } java { diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/papi/ImageExpansion.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ImageExpansion.java similarity index 97% rename from bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/papi/ImageExpansion.java rename to bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ImageExpansion.java index 9a5ca429c..4f527f7af 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/papi/ImageExpansion.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ImageExpansion.java @@ -1,4 +1,4 @@ -package net.momirealms.craftengine.bukkit.plugin.papi; +package net.momirealms.craftengine.bukkit.compatibility.papi; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import net.momirealms.craftengine.core.font.BitmapImage; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/PlaceholderAPIUtils.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/PlaceholderAPIUtils.java similarity index 50% rename from bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/PlaceholderAPIUtils.java rename to bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/PlaceholderAPIUtils.java index 200ab0b88..824236dda 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/PlaceholderAPIUtils.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/PlaceholderAPIUtils.java @@ -1,6 +1,7 @@ -package net.momirealms.craftengine.bukkit.util; +package net.momirealms.craftengine.bukkit.compatibility.papi; import me.clip.placeholderapi.PlaceholderAPI; +import net.momirealms.craftengine.core.plugin.CraftEngine; import org.bukkit.OfflinePlayer; public class PlaceholderAPIUtils { @@ -10,4 +11,9 @@ public class PlaceholderAPIUtils { public static String parse(OfflinePlayer player, String text) { return PlaceholderAPI.setPlaceholders(player, text); } + + public static void registerExpansions(CraftEngine plugin) { + new ImageExpansion(plugin).register(); + new ShiftExpansion(plugin).register(); + } } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/papi/ShiftExpansion.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ShiftExpansion.java similarity index 97% rename from bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/papi/ShiftExpansion.java rename to bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ShiftExpansion.java index f8650a55d..ea10750f9 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/papi/ShiftExpansion.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/ShiftExpansion.java @@ -1,4 +1,4 @@ -package net.momirealms.craftengine.bukkit.plugin.papi; +package net.momirealms.craftengine.bukkit.compatibility.papi; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import net.momirealms.craftengine.core.plugin.CraftEngine; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/worldedit/WorldEditBlockRegister.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/worldedit/WorldEditBlockRegister.java similarity index 93% rename from bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/worldedit/WorldEditBlockRegister.java rename to bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/worldedit/WorldEditBlockRegister.java index 279ada1c2..6905c77c7 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/worldedit/WorldEditBlockRegister.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/worldedit/WorldEditBlockRegister.java @@ -1,4 +1,4 @@ -package net.momirealms.craftengine.bukkit.block.worldedit; +package net.momirealms.craftengine.bukkit.compatibility.worldedit; import com.sk89q.worldedit.bukkit.BukkitBlockRegistry; import com.sk89q.worldedit.util.concurrency.LazyReference; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java index 014a5a5d5..0757e0cf4 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java @@ -7,8 +7,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import dev.dejvokep.boostedyaml.YamlDocument; -import net.momirealms.craftengine.bukkit.block.worldedit.WorldEditBlockRegister; -import net.momirealms.craftengine.bukkit.block.worldedit.WorldEditCommandHelper; +import net.momirealms.craftengine.bukkit.compatibility.worldedit.WorldEditBlockRegister; import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; import net.momirealms.craftengine.bukkit.plugin.injector.BukkitInjector; import net.momirealms.craftengine.bukkit.plugin.network.PacketConsumers; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/worldedit/WorldEditCommandHelper.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/WorldEditCommandHelper.java similarity index 95% rename from bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/worldedit/WorldEditCommandHelper.java rename to bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/WorldEditCommandHelper.java index cdd32e55d..88839c776 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/worldedit/WorldEditCommandHelper.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/WorldEditCommandHelper.java @@ -1,6 +1,5 @@ -package net.momirealms.craftengine.bukkit.block.worldedit; +package net.momirealms.craftengine.bukkit.block; -import net.momirealms.craftengine.bukkit.block.BukkitBlockManager; import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; import net.momirealms.craftengine.bukkit.util.BlockStateUtils; import net.momirealms.craftengine.core.block.BlockStateParser; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java index b86f0af22..6fae96c4d 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java @@ -17,13 +17,13 @@ import net.momirealms.craftengine.bukkit.plugin.command.BukkitSenderFactory; import net.momirealms.craftengine.bukkit.plugin.gui.BukkitGuiManager; import net.momirealms.craftengine.bukkit.plugin.injector.BukkitInjector; import net.momirealms.craftengine.bukkit.plugin.network.BukkitNetworkManager; -import net.momirealms.craftengine.bukkit.plugin.papi.ImageExpansion; -import net.momirealms.craftengine.bukkit.plugin.papi.ShiftExpansion; +import net.momirealms.craftengine.bukkit.compatibility.papi.ImageExpansion; +import net.momirealms.craftengine.bukkit.compatibility.papi.ShiftExpansion; import net.momirealms.craftengine.bukkit.plugin.scheduler.BukkitSchedulerAdapter; import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer; import net.momirealms.craftengine.bukkit.sound.BukkitSoundManager; import net.momirealms.craftengine.bukkit.util.EventUtils; -import net.momirealms.craftengine.bukkit.util.PlaceholderAPIUtils; +import net.momirealms.craftengine.bukkit.compatibility.papi.PlaceholderAPIUtils; import net.momirealms.craftengine.bukkit.util.Reflections; import net.momirealms.craftengine.bukkit.world.BukkitWorldManager; import net.momirealms.craftengine.core.entity.player.Player; @@ -176,8 +176,7 @@ public class BukkitCraftEngine extends CraftEngine { // compatibility // register expansion if (this.isPluginEnabled("PlaceholderAPI")) { - new ShiftExpansion(this).register(); - new ImageExpansion(this).register(); + PlaceholderAPIUtils.registerExpansions(this); this.hasPlaceholderAPI = true; } }