From 1fb5e41bc14b5c7f7be527b681a6de8c153aad82 Mon Sep 17 00:00:00 2001 From: RVSkeLe Date: Sun, 14 Dec 2025 15:49:30 +0100 Subject: [PATCH 1/3] Fix compilation issues --- build.gradle | 5 +++-- core/build.gradle | 11 +++++++---- .../economy/shops/providers/zshop/ZShopProvider.java | 10 +++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index ff065f80..0d976617 100644 --- a/build.gradle +++ b/build.gradle @@ -22,9 +22,10 @@ allprojects { maven { name = "bg-repo"; url = "https://repo.bg-software.com/repository/api/" } maven { name = "codemc"; url = "https://repo.codemc.io/repository/bentoboxworld/" } maven { name = "nightexpress-releases"; url = "https://repo.nightexpressdev.com/releases"} - maven { name = "minecodes-repository-releases"; url = "https://repository.minecodes.pl/releases"} + maven { name = "minecodes-repository-releases"; url = "https://maven.minecodes.pl/releases"} maven { name = "Lumine Releases"; url = 'https://mvn.lumine.io/repository/maven-public/' } maven { name = "iridiumdevelopment"; url = "https://nexus.iridiumdevelopment.net/repository/maven-releases/" } + maven { name = "groupez"; url = uri("https://repo.groupez.dev/releases") } } } @@ -52,4 +53,4 @@ tasks.withType(JavaCompile).configureEach { if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { options.release.set(targetJavaVersion) } -} \ No newline at end of file +} diff --git a/core/build.gradle b/core/build.gradle index 50c5ec8c..0e6d8434 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -4,8 +4,8 @@ dependencies { compileOnly 'io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT' // Hook plugins compileOnly 'org.geysermc.floodgate:api:2.2.5-SNAPSHOT' - compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT' - compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.4.0-SNAPSHOT' + compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.14-SNAPSHOT' + compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.3.17-SNAPSHOT' compileOnly("com.github.brcdev-minecraft:shopgui-api:3.2.0") { exclude(group: "*") } compileOnly 'com.palmergames.bukkit.towny:towny:0.102.0.0' compileOnly 'com.bgsoftware:SuperiorSkyblockAPI:2025.2.1' @@ -16,7 +16,10 @@ dependencies { compileOnly 'su.nightexpress.excellentshop:Core:4.22.0' compileOnly("io.github.fabiozumbi12.RedProtect:RedProtect-Core:8.1.2") { exclude(group: "*") } compileOnly("io.github.fabiozumbi12.RedProtect:RedProtect-Spigot:8.1.2") { exclude(group: "*") } - implementation 'com.github.maiminhdung:zShop-API:9cb1b3e140' + // Temporary fix until they accept my PR + implementation 'com.github.RVSkeLe:zShop:develop-SNAPSHOT' + + compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.6") implementation 'com.github.GriefPrevention:GriefPrevention:18.0.0' implementation 'com.github.IncrediblePlugins:LandsAPI:7.19.1' implementation 'com.github.Xyness:SimpleClaimSystem:1.12.3.2' @@ -63,4 +66,4 @@ processResources { filesMatching(['plugin.yml', 'paper-plugin.yml']) { expand props } -} \ No newline at end of file +} diff --git a/core/src/main/java/github/nighter/smartspawner/hooks/economy/shops/providers/zshop/ZShopProvider.java b/core/src/main/java/github/nighter/smartspawner/hooks/economy/shops/providers/zshop/ZShopProvider.java index d464deac..4cca2e09 100644 --- a/core/src/main/java/github/nighter/smartspawner/hooks/economy/shops/providers/zshop/ZShopProvider.java +++ b/core/src/main/java/github/nighter/smartspawner/hooks/economy/shops/providers/zshop/ZShopProvider.java @@ -1,7 +1,7 @@ package github.nighter.smartspawner.hooks.economy.shops.providers.zshop; -import fr.maxlego08.zshop.api.ShopManager; -import fr.maxlego08.zshop.api.buttons.ItemButton; +import fr.maxlego08.shop.api.ShopManager; +import fr.maxlego08.shop.api.buttons.ItemButton; import github.nighter.smartspawner.SmartSpawner; import github.nighter.smartspawner.hooks.economy.shops.providers.ShopProvider; import lombok.RequiredArgsConstructor; @@ -28,8 +28,8 @@ public boolean isAvailable() { Plugin zShopPlugin = Bukkit.getPluginManager().getPlugin("zShop"); if (zShopPlugin != null && zShopPlugin.isEnabled()) { // Check if the zShop API classes are available - Class.forName("fr.maxlego08.zshop.api.ShopManager"); - Class.forName("fr.maxlego08.zshop.api.buttons.ItemButton"); + Class.forName("fr.maxlego08.shop.api.ShopManager"); + Class.forName("fr.maxlego08.shop.api.buttons.ItemButton"); // Try to get the ShopManager service ShopManager manager = getShopManager(); @@ -89,4 +89,4 @@ private Optional getItemButton(Material material) { return Optional.empty(); } } -} \ No newline at end of file +} From ab52523a563616e2f12838eca74e11942956e43e Mon Sep 17 00:00:00 2001 From: RVSkeLe Date: Sun, 14 Dec 2025 15:49:45 +0100 Subject: [PATCH 2/3] Fix CoinsEngine hook --- core/src/main/resources/paper-plugin.yml | 4 ++-- core/src/main/resources/plugin.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/paper-plugin.yml b/core/src/main/resources/paper-plugin.yml index b7b49328..9bb42349 100644 --- a/core/src/main/resources/paper-plugin.yml +++ b/core/src/main/resources/paper-plugin.yml @@ -52,7 +52,7 @@ dependencies: join-classpath: true # Economy Plugins - CoinEngine: + CoinsEngine: load: BEFORE required: false join-classpath: true @@ -188,4 +188,4 @@ permissions: smartspawner.limits.bypass: description: "Bypass spawner limits per chunk" - default: false \ No newline at end of file + default: false diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml index 599fbe89..79727d09 100644 --- a/core/src/main/resources/plugin.yml +++ b/core/src/main/resources/plugin.yml @@ -17,7 +17,7 @@ softdepend: - ExcellentShop # Utility/Economy Plugins - - CoinEngine + - CoinsEngine - Vault # Protection/Region Plugins From 75a63afa315929ecd3b9fdf38adfea5e52023356 Mon Sep 17 00:00:00 2001 From: RVSkeLe Date: Sun, 14 Dec 2025 16:00:16 +0100 Subject: [PATCH 3/3] Use proper zShop and zMenu APIs See: https://github.com/GroupeZ-dev/zShop/pull/21 --- core/build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 0e6d8434..e944bafa 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -16,9 +16,7 @@ dependencies { compileOnly 'su.nightexpress.excellentshop:Core:4.22.0' compileOnly("io.github.fabiozumbi12.RedProtect:RedProtect-Core:8.1.2") { exclude(group: "*") } compileOnly("io.github.fabiozumbi12.RedProtect:RedProtect-Spigot:8.1.2") { exclude(group: "*") } - // Temporary fix until they accept my PR - implementation 'com.github.RVSkeLe:zShop:develop-SNAPSHOT' - + compileOnly("fr.maxlego08.shop:zshop-api:3.3.1") compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.6") implementation 'com.github.GriefPrevention:GriefPrevention:18.0.0' implementation 'com.github.IncrediblePlugins:LandsAPI:7.19.1'