diff --git a/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionPlant.java b/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionPlant.java index e755e59..11868e4 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionPlant.java +++ b/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionPlant.java @@ -85,8 +85,7 @@ public class ActionPlant extends AbstractBuiltInAction { PotConfig potConfig = Registries.ITEM_TO_POT.get(potItemID); CustomCropsBlockState potState = potBlock.fixOrGetState(world, potPos3, potConfig, potItemID); if (potState == null) { - plugin.getPluginLogger().warn("Pot doesn't exist below the crop when executing `plant` action at location[" + world.worldName() + "," + potPos3 + "]"); - return; + plugin.debug(() -> "Pot doesn't exist below the crop when executing `plant` action at location[" + world.worldName() + "," + potPos3 + "]"); } CropBlock cropBlock = (CropBlock) BuiltInBlockMechanics.CROP.mechanic(); diff --git a/compatibility-craftengine-r1/build.gradle.kts b/compatibility-craftengine-r1/build.gradle.kts index a72bc7f..99b8815 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.16") - compileOnly("net.momirealms:craft-engine-bukkit:0.0.16") + compileOnly("net.momirealms:craft-engine-core:0.0.34") + compileOnly("net.momirealms:craft-engine-bukkit:0.0.34") } tasks.withType { diff --git a/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineProvider.java b/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineProvider.java index c2af3be..6147a56 100644 --- a/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineProvider.java +++ b/compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineProvider.java @@ -23,6 +23,7 @@ import net.momirealms.craftengine.bukkit.api.CraftEngineItems; import net.momirealms.craftengine.bukkit.entity.furniture.LoadedFurniture; import net.momirealms.craftengine.core.block.ImmutableBlockState; import net.momirealms.craftengine.core.entity.furniture.AnchorType; +import net.momirealms.craftengine.core.item.ItemBuildContext; import net.momirealms.craftengine.core.util.Key; import net.momirealms.craftengine.libraries.nbt.CompoundTag; import net.momirealms.customcrops.api.core.CustomItemProvider; @@ -74,7 +75,7 @@ public class CraftEngineProvider implements CustomItemProvider { @Override public @Nullable ItemStack itemStack(Player player, String id) { return Optional.ofNullable(CraftEngineItems.byId(Key.of(id))) - .map(it -> it.buildItemStack(null)) + .map(it -> it.buildItemStack(ItemBuildContext.EMPTY)) .orElse(null); } diff --git a/compatibility-oraxen-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/oraxen_r1/OraxenProvider.java b/compatibility-oraxen-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/oraxen_r1/OraxenProvider.java index a491aba..e24d6bc 100644 --- a/compatibility-oraxen-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/oraxen_r1/OraxenProvider.java +++ b/compatibility-oraxen-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/oraxen_r1/OraxenProvider.java @@ -50,6 +50,7 @@ public class OraxenProvider implements CustomItemProvider { @Override public boolean placeCustomBlock(Location location, String id) { if (OraxenItems.exists(id)) { + removeCustomBlock(location); OraxenBlocks.place(id, location); return true; } else { diff --git a/gradle.properties b/gradle.properties index e48c688..133c79f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.31 +project_version=3.6.32 config_version=42 project_group=net.momirealms @@ -18,7 +18,7 @@ asm_commons_version=9.7.1 jar_relocator_version=1.7 adventure_bundle_version=4.19.0 adventure_platform_version=4.3.4 -sparrow_heart_version=0.51 +sparrow_heart_version=0.52 cloud_core_version=2.0.0 cloud_services_version=2.0.0 cloud_brigadier_version=2.0.0-beta.10