Repo-Mirror/Custom-Crops
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Crops.git synced 2025-12-19 15:09:25 +00:00
Code Issues Releases Activity

fix compatibility

Browse Source
This commit is contained in:
XiaoMoMi
2025-05-26 19:58:29 +08:00
parent 665f4142ad
commit d3fcdbcd94
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java
View File

@@ -118,6 +118,18 @@ public class VersionHelper {
return mojmap; 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 // Method to compare two version strings
private static boolean compareVer(String newV, String currentV) { private static boolean compareVer(String newV, String currentV) {
if (newV == null || currentV == null || newV.isEmpty() || currentV.isEmpty()) { if (newV == null || currentV == null || newV.isEmpty() || currentV.isEmpty()) {

4
compatibility-craftengine-r1/build.gradle.kts
View File

@@ -7,8 +7,8 @@ repositories {
dependencies { dependencies {
compileOnly(project(":api")) compileOnly(project(":api"))
compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") 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-core:0.0.54.6")
compileOnly("net.momirealms:craft-engine-bukkit:0.0.54") compileOnly("net.momirealms:craft-engine-bukkit:0.0.54.6")
} }
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {

4
compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineListener.java
View File

@@ -37,7 +37,7 @@ public class CraftEngineListener extends AbstractCustomEventListener {
EquipmentSlot slot = event.hand() == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND; EquipmentSlot slot = event.hand() == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND;
itemManager.handlePlayerInteractFurniture( itemManager.handlePlayerInteractFurniture(
event.getPlayer(), event.getPlayer(),
event.furniture().location(), event.location(),
event.furniture().id().toString(), event.furniture().id().toString(),
slot, slot,
event.getPlayer().getInventory().getItem(slot), event.getPlayer().getInventory().getItem(slot),
@@ -65,7 +65,7 @@ public class CraftEngineListener extends AbstractCustomEventListener {
public void onBreakFurniture(FurnitureBreakEvent event) { public void onBreakFurniture(FurnitureBreakEvent event) {
itemManager.handlePlayerBreak( itemManager.handlePlayerBreak(
event.getPlayer(), event.getPlayer(),
event.furniture().baseEntity().getLocation(), event.location(),
event.getPlayer().getInventory().getItemInMainHand(), event.getPlayer().getInventory().getItemInMainHand(),
event.furniture().id().toString(), event.furniture().id().toString(),
event event

5
compatibility-craftengine-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/custom/craftengine_r1/CraftEngineProvider.java
View File

@@ -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.CraftEngineBlocks;
import net.momirealms.craftengine.bukkit.api.CraftEngineFurniture; import net.momirealms.craftengine.bukkit.api.CraftEngineFurniture;
import net.momirealms.craftengine.bukkit.api.CraftEngineItems; 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.block.ImmutableBlockState;
import net.momirealms.craftengine.core.entity.furniture.AnchorType; import net.momirealms.craftengine.core.entity.furniture.AnchorType;
import net.momirealms.craftengine.core.item.ItemBuildContext; 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.core.util.Key;
import net.momirealms.craftengine.libraries.nbt.CompoundTag; import net.momirealms.craftengine.libraries.nbt.CompoundTag;
import net.momirealms.customcrops.api.core.CustomItemProvider; import net.momirealms.customcrops.api.core.CustomItemProvider;
@@ -52,7 +51,7 @@ public class CraftEngineProvider implements CustomItemProvider {
@Override @Override
public @Nullable Entity placeFurniture(Location location, String id) { 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; if (furniture == null) return null;
return furniture.baseEntity(); return furniture.baseEntity();
} }

2
gradle.properties
View File

@@ -1,6 +1,6 @@
# Project settings # Project settings
# Rule: [major update].[feature update].[bug fix] # Rule: [major update].[feature update].[bug fix]
project_version=3.6.37 project_version=3.6.38
config_version=42 config_version=42
project_group=net.momirealms project_group=net.momirealms

3
plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemManager.java
View File

@@ -37,6 +37,7 @@ import net.momirealms.customcrops.api.integration.ItemProvider;
import net.momirealms.customcrops.api.util.EventUtils; import net.momirealms.customcrops.api.util.EventUtils;
import net.momirealms.customcrops.api.util.LocationUtils; import net.momirealms.customcrops.api.util.LocationUtils;
import net.momirealms.customcrops.api.util.PluginUtils; import net.momirealms.customcrops.api.util.PluginUtils;
import net.momirealms.customcrops.common.helper.VersionHelper;
import net.momirealms.customcrops.common.item.Item; import net.momirealms.customcrops.common.item.Item;
import org.bukkit.Registry; import org.bukkit.Registry;
import org.bukkit.*; import org.bukkit.*;
@@ -194,7 +195,7 @@ public class BukkitItemManager extends AbstractItemManager {
if (Integer.parseInt(split[1]) > 0) { if (Integer.parseInt(split[1]) > 0) {
above408 = true; above408 = true;
} else { } else {
if (Integer.parseInt(String.valueOf(split[2].charAt(0))) >= 8) { if (VersionHelper.getVersion(split[2]) >= 8) {
above408 = true; above408 = true;
} }
} }