diff --git a/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java b/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java index ed6e23e..5e26f92 100644 --- a/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java +++ b/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java @@ -118,6 +118,18 @@ public class VersionHelper { return mojmap; } + public static int getVersion(String version) { + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < version.length(); i++) { + char ch = version.charAt(i); + if (ch >= '0' && ch <= '9') { + builder.append(ch); + break; + } + } + return Integer.parseInt(builder.toString()); + } + // Method to compare two version strings private static boolean compareVer(String newV, String currentV) { if (newV == null || currentV == null || newV.isEmpty() || currentV.isEmpty()) { diff --git a/compatibility-craftengine-r1/build.gradle.kts b/compatibility-craftengine-r1/build.gradle.kts index a226dd6..7736a37 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.54") - compileOnly("net.momirealms:craft-engine-bukkit:0.0.54") + compileOnly("net.momirealms:craft-engine-core:0.0.54.6") + compileOnly("net.momirealms:craft-engine-bukkit:0.0.54.6") } 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 5565bde..03f1ee5 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 @@ -37,7 +37,7 @@ public class CraftEngineListener extends AbstractCustomEventListener { EquipmentSlot slot = event.hand() == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND; itemManager.handlePlayerInteractFurniture( event.getPlayer(), - event.furniture().location(), + event.location(), event.furniture().id().toString(), slot, event.getPlayer().getInventory().getItem(slot), @@ -65,7 +65,7 @@ public class CraftEngineListener extends AbstractCustomEventListener { public void onBreakFurniture(FurnitureBreakEvent event) { itemManager.handlePlayerBreak( event.getPlayer(), - event.furniture().baseEntity().getLocation(), + event.location(), event.getPlayer().getInventory().getItemInMainHand(), event.furniture().id().toString(), event 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 f0e5d26..6167b94 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 @@ -20,11 +20,10 @@ package net.momirealms.customcrops.bukkit.integration.custom.craftengine_r1; import net.momirealms.craftengine.bukkit.api.CraftEngineBlocks; import net.momirealms.craftengine.bukkit.api.CraftEngineFurniture; import net.momirealms.craftengine.bukkit.api.CraftEngineItems; -import net.momirealms.craftengine.bukkit.entity.furniture.LoadedFurniture; +import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurniture; 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.plugin.context.ContextKey; import net.momirealms.craftengine.core.util.Key; import net.momirealms.craftengine.libraries.nbt.CompoundTag; import net.momirealms.customcrops.api.core.CustomItemProvider; @@ -52,7 +51,7 @@ public class CraftEngineProvider implements CustomItemProvider { @Override public @Nullable Entity placeFurniture(Location location, String id) { - LoadedFurniture furniture = CraftEngineFurniture.place(LocationUtils.toSurfaceCenterLocation(location), Key.of(id), AnchorType.GROUND); + BukkitFurniture furniture = CraftEngineFurniture.place(LocationUtils.toSurfaceCenterLocation(location), Key.of(id), AnchorType.GROUND); if (furniture == null) return null; return furniture.baseEntity(); } diff --git a/gradle.properties b/gradle.properties index e36ad2a..8b80c30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.37 +project_version=3.6.38 config_version=42 project_group=net.momirealms diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java index a8b156a..b658090 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java @@ -37,6 +37,7 @@ import net.momirealms.customcrops.api.integration.ItemProvider; import net.momirealms.customcrops.api.util.EventUtils; import net.momirealms.customcrops.api.util.LocationUtils; import net.momirealms.customcrops.api.util.PluginUtils; +import net.momirealms.customcrops.common.helper.VersionHelper; import net.momirealms.customcrops.common.item.Item; import org.bukkit.Registry; import org.bukkit.*; @@ -194,7 +195,7 @@ public class BukkitItemManager extends AbstractItemManager { if (Integer.parseInt(split[1]) > 0) { above408 = true; } else { - if (Integer.parseInt(String.valueOf(split[2].charAt(0))) >= 8) { + if (VersionHelper.getVersion(split[2]) >= 8) { above408 = true; } }