diff --git a/compatibility-craftengine-r1/build.gradle.kts b/compatibility-craftengine-r1/build.gradle.kts index c03e4f6..a3ff1ce 100644 --- a/compatibility-craftengine-r1/build.gradle.kts +++ b/compatibility-craftengine-r1/build.gradle.kts @@ -7,8 +7,8 @@ repositories { dependencies { compileOnly(project(":api")) compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") - compileOnly("net.momirealms:craft-engine-core:0.0.40") - compileOnly("net.momirealms:craft-engine-bukkit:0.0.40") + compileOnly("net.momirealms:craft-engine-core:0.0.41") + compileOnly("net.momirealms:craft-engine-bukkit:0.0.41") } tasks.withType { diff --git a/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineListener.java b/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineListener.java index 054deb7..5565bde 100644 --- a/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineListener.java +++ b/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineListener.java @@ -38,7 +38,7 @@ public class CraftEngineListener extends AbstractCustomEventListener { itemManager.handlePlayerInteractFurniture( event.getPlayer(), event.furniture().location(), - event.furniture().furnitureId().toString(), + event.furniture().id().toString(), slot, event.getPlayer().getInventory().getItem(slot), event @@ -47,16 +47,18 @@ public class CraftEngineListener extends AbstractCustomEventListener { @EventHandler(ignoreCancelled = true) public void onInteractCustomBlock(CustomBlockInteractEvent event) { - EquipmentSlot slot = event.hand() == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND; - itemManager.handlePlayerInteractBlock( - event.getPlayer(), - event.location().getBlock(), - event.customBlock().id().toString(), - event.clickedFace(), - slot, - event.getPlayer().getInventory().getItem(slot), - event - ); + if (event.action() == CustomBlockInteractEvent.Action.RIGHT_CLICK) { + EquipmentSlot slot = event.hand() == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND; + itemManager.handlePlayerInteractBlock( + event.getPlayer(), + event.location().getBlock(), + event.customBlock().id().toString(), + event.clickedFace(), + slot, + event.getPlayer().getInventory().getItem(slot), + event + ); + } } @EventHandler(ignoreCancelled = true) @@ -65,7 +67,7 @@ public class CraftEngineListener extends AbstractCustomEventListener { event.getPlayer(), event.furniture().baseEntity().getLocation(), event.getPlayer().getInventory().getItemInMainHand(), - event.furniture().furnitureId().toString(), + event.furniture().id().toString(), event ); } @@ -101,7 +103,7 @@ public class CraftEngineListener extends AbstractCustomEventListener { itemManager.handlePlayerPlace( player, event.location(), - event.furniture().furnitureId().toString(), + event.furniture().id().toString(), slot, event.getPlayer().getInventory().getItem(slot), new DummyCancellable() diff --git a/gradle.properties b/gradle.properties index 62c6905..4f8ee75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.32.1 +project_version=3.6.32.3 config_version=42 project_group=net.momirealms