From d4d09d58c3c438e82de6356f8ae2da1244124594 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sun, 20 Jul 2025 00:32:46 +0800 Subject: [PATCH] 3.6.43 --- .../api/core/AbstractCustomEventListener.java | 20 +++++++++++++++---- compatibility-nexo-r1/build.gradle.kts | 2 +- gradle.properties | 12 +++++------ .../bukkit/item/BukkitItemFactory.java | 2 +- plugin/src/main/resources/config.yml | 1 + 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/api/src/main/java/net/momirealms/customcrops/api/core/AbstractCustomEventListener.java b/api/src/main/java/net/momirealms/customcrops/api/core/AbstractCustomEventListener.java index 9210e82..41d69c4 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/core/AbstractCustomEventListener.java +++ b/api/src/main/java/net/momirealms/customcrops/api/core/AbstractCustomEventListener.java @@ -17,6 +17,7 @@ package net.momirealms.customcrops.api.core; +import io.papermc.paper.event.block.BlockBreakBlockEvent; import net.momirealms.customcrops.api.BukkitCustomCropsPlugin; import net.momirealms.customcrops.api.action.ActionManager; import net.momirealms.customcrops.api.context.Context; @@ -41,10 +42,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; +import org.bukkit.event.*; import org.bukkit.event.block.*; import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityExplodeEvent; @@ -437,4 +435,18 @@ public abstract class AbstractCustomEventListener implements Listener { Block block = event.getBlock(); itemManager.handlePhysicsBreak(block.getLocation(), block.getBlockData().getAsString(), event); } + +// @EventHandler(ignoreCancelled = true) +// public void onBlockBreak(BlockBreakBlockEvent event) { +// Block block = event.getBlock(); +// itemManager.handlePhysicsBreak(block.getLocation(), block.getBlockData().getAsString(), new Cancellable() { +// @Override +// public boolean isCancelled() { +// return false; +// } +// @Override +// public void setCancelled(boolean b) { +// } +// }); +// } } diff --git a/compatibility-nexo-r1/build.gradle.kts b/compatibility-nexo-r1/build.gradle.kts index 5c99348..f71f948 100644 --- a/compatibility-nexo-r1/build.gradle.kts +++ b/compatibility-nexo-r1/build.gradle.kts @@ -8,7 +8,7 @@ repositories { dependencies { compileOnly(project(":api")) compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") - compileOnly("com.nexomc:nexo:1.7.3") + compileOnly("com.nexomc:nexo:1.8.0") } tasks.withType { diff --git a/gradle.properties b/gradle.properties index bd71833..eaf1de4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.41 +project_version=3.6.43 config_version=42 project_group=net.momirealms @@ -18,13 +18,13 @@ asm_commons_version=9.8 jar_relocator_version=1.7 adventure_bundle_version=4.23.0 adventure_platform_version=4.4.0 -sparrow_heart_version=0.56 +sparrow_heart_version=0.59 cloud_core_version=2.0.0 cloud_services_version=2.0.0 -cloud_brigadier_version=2.0.0-beta.10 -cloud_bukkit_version=2.0.0-beta.10 -cloud_paper_version=2.0.0-beta.10 -cloud_minecraft_extras_version=2.0.0-beta.10 +cloud_brigadier_version=2.0.0-beta.11 +cloud_bukkit_version=2.0.0-beta.11 +cloud_paper_version=2.0.0-beta.11 +cloud_minecraft_extras_version=2.0.0-beta.11 boosted_yaml_version=1.3.7 mojang_brigadier_version=1.0.18 bstats_version=3.0.2 diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java index 8217294..1c3ad99 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java @@ -48,7 +48,7 @@ public abstract class BukkitItemFactory extends ItemFactory { return new ComponentItemFactory(plugin); } - case "1.21.5", "1.21.6" -> { + case "1.21.5", "1.21.6", "1.21.7", "1.21.8" -> { return new ComponentItemFactory1_21_5(plugin); } default -> throw new IllegalStateException("Unsupported server version: " + plugin.getServerVersion()); diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml index b7bd65d..0e94bd3 100644 --- a/plugin/src/main/resources/config.yml +++ b/plugin/src/main/resources/config.yml @@ -97,6 +97,7 @@ mechanics: # Scarecrow settings to prevent crops from being attacked by crows scarecrow: enable: true + # You can use a list of IDs here id: '{0}scarecrow' type: FURNITURE range: 7