From cbf25fa5226742a71a79bacf0dd5643026673ddc Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sat, 12 Apr 2025 22:39:37 +0800 Subject: [PATCH] 3.6.34 --- .../api/action/builtin/ActionPlant.java | 1 + compatibility-craftengine-r1/build.gradle.kts | 4 ++-- .../custom/craftengine_r1/CraftEngineProvider.java | 3 ++- .../integration/custom/nexo_r1/NexoProvider.java | 3 ++- gradle.properties | 14 +++++++------- 5 files changed, 14 insertions(+), 11 deletions(-) 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 11868e4..2fbfdbf 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 @@ -37,6 +37,7 @@ import net.momirealms.customcrops.api.core.world.Pos3; import net.momirealms.customcrops.api.event.CropPlantEvent; import net.momirealms.customcrops.api.misc.value.MathValue; import net.momirealms.customcrops.api.util.EventUtils; +import net.momirealms.customcrops.api.util.LocationUtils; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; diff --git a/compatibility-craftengine-r1/build.gradle.kts b/compatibility-craftengine-r1/build.gradle.kts index a3ff1ce..d0af9b7 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.41") - compileOnly("net.momirealms:craft-engine-bukkit:0.0.41") + compileOnly("net.momirealms:craft-engine-core:0.0.45") + compileOnly("net.momirealms:craft-engine-bukkit:0.0.45") } 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 9e61097..70583a3 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 @@ -27,6 +27,7 @@ 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; +import net.momirealms.customcrops.api.util.LocationUtils; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Entity; @@ -50,7 +51,7 @@ public class CraftEngineProvider implements CustomItemProvider { @Override public @Nullable Entity placeFurniture(Location location, String id) { - LoadedFurniture furniture = CraftEngineFurniture.place(location, Key.of(id), AnchorType.GROUND); + LoadedFurniture furniture = CraftEngineFurniture.place(LocationUtils.toSurfaceCenterLocation(location), Key.of(id), AnchorType.GROUND); if (furniture == null) return null; return furniture.baseEntity(); } diff --git a/compatibility-nexo-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/nexo_r1/NexoProvider.java b/compatibility-nexo-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/nexo_r1/NexoProvider.java index f0031d2..3e6ece3 100644 --- a/compatibility-nexo-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/nexo_r1/NexoProvider.java +++ b/compatibility-nexo-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/nexo_r1/NexoProvider.java @@ -25,6 +25,7 @@ import com.nexomc.nexo.mechanics.Mechanic; import com.nexomc.nexo.mechanics.furniture.FurnitureMechanic; import net.momirealms.customcrops.api.BukkitCustomCropsPlugin; import net.momirealms.customcrops.api.core.CustomItemProvider; +import net.momirealms.customcrops.api.util.LocationUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Rotation; @@ -59,7 +60,7 @@ public class NexoProvider implements CustomItemProvider { @Override public @Nullable Entity placeFurniture(Location location, String id) { - Entity entity = NexoFurniture.place(id, location, Rotation.NONE, BlockFace.UP); + Entity entity = NexoFurniture.place(id, LocationUtils.toSurfaceCenterLocation(location), Rotation.NONE, BlockFace.UP); if (entity == null) { BukkitCustomCropsPlugin.getInstance().getPluginLogger().warn("Furniture[" + id +"] doesn't exist. Please double check if that furniture exists."); } diff --git a/gradle.properties b/gradle.properties index 5e2343f..63e172e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.33 +project_version=3.6.34 config_version=42 project_group=net.momirealms @@ -41,9 +41,9 @@ vault_version=1.7 netty_version=4.1.117 # Proxy settings -#systemProp.socks.proxyHost=127.0.0.1 -#systemProp.socks.proxyPort=7890 -#systemProp.http.proxyHost=127.0.0.1 -#systemProp.http.proxyPort=7890 -#systemProp.https.proxyHost=127.0.0.1 -#systemProp.https.proxyPort=7890 +systemProp.socks.proxyHost=127.0.0.1 +systemProp.socks.proxyPort=7890 +systemProp.http.proxyHost=127.0.0.1 +systemProp.http.proxyPort=7890 +systemProp.https.proxyHost=127.0.0.1 +systemProp.https.proxyPort=7890