diff --git a/bukkit/compatibility/build.gradle.kts b/bukkit/compatibility/build.gradle.kts index 171607a61..05d1dc29f 100644 --- a/bukkit/compatibility/build.gradle.kts +++ b/bukkit/compatibility/build.gradle.kts @@ -8,6 +8,7 @@ repositories { maven("https://repo.infernalsuite.com/repository/maven-snapshots/") // slime world maven("https://repo.momirealms.net/releases/") maven("https://mvn.lumine.io/repository/maven-public/") // model engine + maven("https://nexus.phoenixdevt.fr/repository/maven-public/") // mmoitems } dependencies { @@ -28,6 +29,9 @@ dependencies { compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.8") // BetterModels compileOnly("io.github.toxicity188:BetterModel:1.4.2") + // MMOItems + compileOnly("net.Indyuce:MMOItems-API:6.10-SNAPSHOT") + compileOnly("io.lumine:MythicLib-dist:1.6.2-SNAPSHOT") } java { diff --git a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/MMOItemsProvider.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/MMOItemsProvider.java new file mode 100644 index 000000000..a22ade2d0 --- /dev/null +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/MMOItemsProvider.java @@ -0,0 +1,28 @@ +package net.momirealms.craftengine.bukkit.compatibility.item; + +import net.Indyuce.mmoitems.MMOItems; +import net.Indyuce.mmoitems.api.Type; +import net.Indyuce.mmoitems.api.item.mmoitem.MMOItem; +import net.momirealms.craftengine.core.item.ExternalItemProvider; +import net.momirealms.craftengine.core.item.ItemBuildContext; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.Nullable; + +import java.util.Locale; + +import static java.util.Objects.requireNonNull; + +public class MMOItemsProvider implements ExternalItemProvider { + @Override + public String plugin() { + return "MMOItems"; + } + + @Override + public @Nullable ItemStack build(String id, ItemBuildContext context) { + String[] split = id.split(":", 2); + MMOItem mmoItem = MMOItems.plugin.getMMOItem(Type.get(split[0]), split[1].toUpperCase(Locale.ENGLISH)); + return mmoItem == null ? new ItemStack(Material.AIR) : requireNonNull(mmoItem.newBuilder().build()); + } +} diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java index 422013f93..ab17f6790 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java @@ -1,5 +1,6 @@ package net.momirealms.craftengine.bukkit.item; +import net.momirealms.craftengine.bukkit.compatibility.item.MMOItemsProvider; import net.momirealms.craftengine.bukkit.compatibility.item.NeigeItemsProvider; import net.momirealms.craftengine.bukkit.item.behavior.AxeItemBehavior; import net.momirealms.craftengine.bukkit.item.behavior.BoneMealItemBehavior; @@ -89,6 +90,9 @@ public class BukkitItemManager extends AbstractItemManager { if (this.plugin.isPluginEnabled("NeigeItems")) { registerExternalItemProvider(new NeigeItemsProvider()); } + if (this.plugin.isPluginEnabled("MMOItems")) { + registerExternalItemProvider(new MMOItemsProvider()); + } } @Override diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java index d0c11d59b..f44c1ca75 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java @@ -1100,10 +1100,12 @@ public class PacketConsumers { try { IntList intList = FastNMS.INSTANCE.field$ClientboundRemoveEntitiesPacket$entityIds(packet); for (int i = 0, size = intList.size(); i < size; i++) { - List entities = user.furnitureView().remove(intList.getInt(i)); + int entityId = intList.getInt(i); + user.entityView().remove(entityId); + List entities = user.furnitureView().remove(entityId); if (entities == null) continue; - for (int entityId : entities) { - intList.add(entityId); + for (int subEntityId : entities) { + intList.add(subEntityId); } } } catch (Exception e) {