From c823f0133f32b89f8ea3beeb25cbebef6f49c607 Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 21 Apr 2026 08:24:42 -0700 Subject: [PATCH] refactor: use BentoBox CraftEngineHook instead of direct API calls CraftEngineCustomBlock now delegates to CraftEngineHook static methods instead of importing CraftEngine classes directly. Removes the craft-engine-core compile dependency (craft-engine-bukkit is still needed for CraftEngineListener). Bumps bentobox.version to 3.15.0-SNAPSHOT. Co-Authored-By: Claude Sonnet 4.6 --- pom.xml | 14 +------------- .../customblock/CraftEngineCustomBlock.java | 12 ++++++------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 73c43c0..cdef79e 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 5.11.0 v1.21-SNAPSHOT - 3.13.0 + 3.15.0-SNAPSHOT 4.0.10 1.8.0 0.0.67 @@ -280,18 +280,6 @@ - - net.momirealms - craft-engine-core - ${craftengine.version} - provided - - - * - * - - - net.momirealms craft-engine-bukkit diff --git a/src/main/java/world/bentobox/aoneblock/oneblocks/customblock/CraftEngineCustomBlock.java b/src/main/java/world/bentobox/aoneblock/oneblocks/customblock/CraftEngineCustomBlock.java index 7656785..0c31d30 100644 --- a/src/main/java/world/bentobox/aoneblock/oneblocks/customblock/CraftEngineCustomBlock.java +++ b/src/main/java/world/bentobox/aoneblock/oneblocks/customblock/CraftEngineCustomBlock.java @@ -7,12 +7,10 @@ import org.bukkit.Material; import org.bukkit.block.Block; -import net.momirealms.craftengine.bukkit.api.CraftEngineBlocks; -import net.momirealms.craftengine.core.block.CustomBlock; -import net.momirealms.craftengine.core.util.Key; import world.bentobox.aoneblock.AOneBlock; import world.bentobox.aoneblock.oneblocks.OneBlockCustomBlock; import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.hooks.CraftEngineHook; public class CraftEngineCustomBlock implements OneBlockCustomBlock { private final String blockId; @@ -22,8 +20,7 @@ public CraftEngineCustomBlock(String blockId) { } public static Optional fromId(String id) { - CustomBlock block = CraftEngineBlocks.byId(Key.of(id)); - if (block != null) { + if (CraftEngineHook.exists(id)) { return Optional.of(new CraftEngineCustomBlock(id)); } return Optional.empty(); @@ -39,7 +36,10 @@ public static Optional fromMap(Map map) { public void execute(AOneBlock addon, Block block) { try { block.setType(Material.AIR); - CraftEngineBlocks.place(block.getLocation(), Key.of(blockId), false); + if (!CraftEngineHook.placeBlock(block.getLocation(), blockId)) { + BentoBox.getInstance().logError("Could not place CraftEngine block " + blockId); + block.setType(Material.STONE); + } } catch (Exception e) { BentoBox.getInstance().logError("Could not place CraftEngine block " + blockId + ": " + e.getMessage()); block.setType(Material.STONE);