impl: Update MMOItems and MMOCore integration

Author: osipxd

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+### Built-in integrations
+
+- Update MMOItems and MMOCore to the latest version
+
 ## [v0.6.2] (2021-12-29)
 
 ### API Changes

buildSrc/src/main/kotlin/dependencies.kt

@@ -3,10 +3,9 @@
 object rpgplugins {
     const val skillapi = "com.sucy:SkillAPI:3.102"
     const val battlelevels = "me.robin.battlelevels:battlelevels-api:6.9.1"
-    const val mmoCore = "net.Indyuce:MMOCore:1.7.0"
-    const val mmoLib = "net.Indyuce:MMOLib:1.7.3"
-    const val mmoItems = "net.Indyuce:MMOItems:6.5.5"
-    const val mythicLib = "io.lumine:MythicLib:1.0.10"
+    const val mmoCore = "net.Indyuce:MMOCore:1.9"
+    const val mmoItems = "net.Indyuce:MMOItems:6.6.5"
+    const val mythicLib = "io.lumine:MythicLib-dist:1.3-R11"
     const val heroes = ":Heroes:1.9.9"
 }
 

mimic-bukkit/build.gradle.kts

@@ -50,7 +50,6 @@ dependencies {
     compileOnly(rpgplugins.skillapi)
     compileOnly(rpgplugins.battlelevels)
     compileOnly(rpgplugins.mmoCore)
-    compileOnly(rpgplugins.mmoLib)
     compileOnly(rpgplugins.mythicLib)
     compileOnly(rpgplugins.mmoItems) { isTransitive = false }
     compileOnly(rpgplugins.heroes) { isTransitive = false }

mimic-bukkit/src/main/kotlin/impl/mmocore/MmoCoreExpLevelConverter.kt

@@ -1,6 +1,6 @@
 package ru.endlesscode.mimic.impl.mmocore
 
-import net.Indyuce.mmocore.api.experience.ExpCurve
+import net.Indyuce.mmocore.experience.ExpCurve
 import org.bukkit.OfflinePlayer
 import ru.endlesscode.mimic.level.ExpLevelConverter
 import ru.endlesscode.mimic.util.ExistingWeakReference
@@ -22,4 +22,4 @@ public class MmoCoreExpLevelConverter internal constructor(
     override fun getExpToReachLevel(level: Int): Double {
         return if (level <= 1) 0.0 else expCurve.getExperience(level).toDouble()
     }
-}
+}

mimic-bukkit/src/main/kotlin/impl/mmocore/MmoCoreLevelSystem.kt

@@ -1,7 +1,7 @@
 package ru.endlesscode.mimic.impl.mmocore
 
-import net.Indyuce.mmocore.api.experience.EXPSource
 import net.Indyuce.mmocore.api.player.PlayerData
+import net.Indyuce.mmocore.experience.EXPSource
 import org.bukkit.entity.Player
 import ru.endlesscode.mimic.level.BukkitLevelSystem
 import ru.endlesscode.mimic.level.ExpLevelConverter
@@ -58,4 +58,4 @@ public class MmoCoreLevelSystem private constructor(
 
         override fun getSystem(player: Player): BukkitLevelSystem = MmoCoreLevelSystem(player, mmoCore)
     }
-}
+}

mimic-bukkit/src/main/kotlin/impl/mmocore/MmoCoreWrapper.kt

@@ -1,9 +1,9 @@
 package ru.endlesscode.mimic.impl.mmocore
 
 import net.Indyuce.mmocore.MMOCore
-import net.Indyuce.mmocore.api.experience.ExpCurve
 import net.Indyuce.mmocore.api.player.PlayerData
 import net.Indyuce.mmocore.api.player.profess.PlayerClass
+import net.Indyuce.mmocore.experience.ExpCurve
 import org.bukkit.OfflinePlayer
 
 internal class MmoCoreWrapper {
@@ -12,4 +12,4 @@ internal class MmoCoreWrapper {
     fun getData(player: OfflinePlayer): PlayerData = PlayerData.get(player)
     fun getPlayerClass(player: OfflinePlayer): PlayerClass = PlayerData.get(player).profess
     fun getExpCurve(player: OfflinePlayer): ExpCurve = PlayerData.get(player).profess.expCurve
-}
+}

mimic-bukkit/src/main/kotlin/impl/mmoitems/MmoItemsRegistry.kt

@@ -53,10 +53,10 @@ public class MmoItemsRegistry private constructor(private val mmoItems: MmoItems
         val template = templates.find { it.id.equals(itemId, ignoreCase = true) } ?: return null
 
         return template.buildItemStack()
-            .also { it.amount = amount.coerceIn(1, it.maxStackSize) }
+            ?.also { it.amount = amount.coerceIn(1, it.maxStackSize) }
     }
 
-    private fun MMOItemTemplate.buildItemStack(): ItemStack {
+    private fun MMOItemTemplate.buildItemStack(): ItemStack? {
         return newBuilder(0, null)
             .build()
             .newBuilder()

mimic-bukkit/src/main/kotlin/impl/mmoitems/MmoItemsWrapper.kt

@@ -1,8 +1,8 @@
 package ru.endlesscode.mimic.impl.mmoitems
 
+import io.lumine.mythic.lib.api.item.NBTItem
 import net.Indyuce.mmoitems.MMOItems
 import net.Indyuce.mmoitems.manager.TemplateManager
-import net.mmogroup.mmolib.api.item.NBTItem
 import org.bukkit.inventory.ItemStack
 
 internal class MmoItemsWrapper {
@@ -11,4 +11,4 @@ internal class MmoItemsWrapper {
     val templatesManager: TemplateManager get() = MMOItems.plugin.templates
 
     fun getNbtItem(item: ItemStack): NBTItem = NBTItem.get(item)
-}
+}