Merge pull request #13 from EndlessCodeGroup/feature/quantumrpg

osipxd · web-flow · commit 836b946d97e6 · 2021-01-17T23:13:30.000+03:00
QuantumRPG
diff --git a/mimic-api/src/main/kotlin/level/LevelSystem.kt b/mimic-api/src/main/kotlin/level/LevelSystem.kt
@@ -50,13 +50,11 @@ public interface LevelSystem {
         set(value) {
             val allowedTotalExperience = value.coerceAtLeast(0.0)
 
-            val level = this.converter.expToLevel(allowedTotalExperience)
-            val fullLevel = this.converter.expToFullLevel(allowedTotalExperience)
-            val expToNextLevel = this.converter.getExpToReachNextLevel(fullLevel)
-            val levelPercent = level - fullLevel
+            val level = this.converter.expToFullLevel(allowedTotalExperience)
+            val levelExp = this.converter.levelToExp(level)
 
-            this.level = fullLevel
-            this.exp = expToNextLevel * levelPercent
+            this.level = level
+            this.exp = allowedTotalExperience - levelExp
         }
 
     /**
diff --git a/mimic-bukkit/README.md b/mimic-bukkit/README.md
@@ -39,26 +39,29 @@ You can find code of all implementations [here](src/main/kotlin/impl).
 - **[BattleLevels]**
 - **[MMOCore]**
 - **[Heroes]**
+- **[QuantumRPG]**
 
 #### [Class Systems][BukkitClassSystem.Provider]
 
 - **Permissions-based** _(Default)_ - give permission `mimic.class.[class_name]` to assign class to player
 - **[SkillAPI]**
 - **[MMOCore]**
 - **[Heroes]**
+- **[QuantumRPG]**
 
 #### [Items Registries][BukkitItemsRegistry]
 
 [MimicItemsRegistry] - Items registry combining all others items registries.
 It uses service ID as namespace for items IDs.  
 For example: `acacia_boat -> minecraft:acacia_boat`.  
-If you use item ID without namespace it will search over all registries.
+If you use item ID without a namespace, it will search over all registries.
 
- Registry                            | Namespace      
--------------------------------------|----------------
- [Minecraft][MinecraftItemsRegistry] | `minecraft:`   
- [CustomItems]                       | `customitems:` 
- [MMOItems]                          | `mmoitems:` 
+ Registry                            | ID Structure      
+-------------------------------------|--------------------------
+ [Minecraft][MinecraftItemsRegistry] | `minecraft:[id]`
+ [CustomItems]                       | `customitems:[id]`
+ [MMOItems]                          | `mmoitems:[id]`
+ [QuantumRPG]                        | `quantumrpg:[type]/[id]`
 
 [minecraft-exp]: https://minecraft.gamepedia.com/Experience
 [skillapi]: https://www.spigotmc.org/resources/4824/
@@ -67,6 +70,7 @@ If you use item ID without namespace it will search over all registries.
 [mmocore]: https://www.spigotmc.org/resources/70575/
 [mmoitems]: https://www.spigotmc.org/resources/39267/
 [heroes]: https://www.spigotmc.org/resources/24734/
+[quantumrpg]: https://www.spigotmc.org/resources/40007/
 
 [mimic-bukkit-api]: ../mimic-bukkit-api
 
diff --git a/mimic-bukkit/build.gradle.kts b/mimic-bukkit/build.gradle.kts
@@ -50,6 +50,8 @@ dependencies {
 
     // From libs/ directory
     compileOnly(":CustomItemsAPI")
+    compileOnly(":QuantumRPG:5.10.2")
+    compileOnly(":NexEngine:2.0.3")
 
     testImplementation(spigotApi)
     testImplementation(rpgplugins.skillapi)
diff --git a/mimic-bukkit/libs/NexEngine-2.0.3.jar b/mimic-bukkit/libs/NexEngine-2.0.3.jar
diff --git a/mimic-bukkit/libs/QuantumRPG-5.10.2.jar b/mimic-bukkit/libs/QuantumRPG-5.10.2.jar
diff --git a/mimic-bukkit/src/main/kotlin/Mimic.kt b/mimic-bukkit/src/main/kotlin/Mimic.kt
@@ -39,6 +39,9 @@ import ru.endlesscode.mimic.impl.mimic.PermissionsClassSystem
 import ru.endlesscode.mimic.impl.mmocore.MmoCoreClassSystem
 import ru.endlesscode.mimic.impl.mmocore.MmoCoreLevelSystem
 import ru.endlesscode.mimic.impl.mmoitems.MmoItemsRegistry
+import ru.endlesscode.mimic.impl.quantumrpg.QuantumRpgClassSystem
+import ru.endlesscode.mimic.impl.quantumrpg.QuantumRpgItemsRegistry
+import ru.endlesscode.mimic.impl.quantumrpg.QuantumRpgLevelSystem
 import ru.endlesscode.mimic.impl.skillapi.SkillApiClassSystem
 import ru.endlesscode.mimic.impl.skillapi.SkillApiLevelSystem
 import ru.endlesscode.mimic.impl.vanilla.MinecraftItemsRegistry
@@ -66,25 +69,27 @@ public class Mimic : JavaPlugin() {
         registerCommands()
     }
 
-    @Suppress("RemoveExplicitTypeArguments") // We should specify type explicitly
     private fun hookDefaultServices() {
         // LevelSystem
         hookLevels(MinecraftLevelSystem::Provider, Lowest)
         hookLevels(SkillApiLevelSystem::Provider, Normal, "com.sucy.skill.SkillAPI")
         hookLevels(BattleLevelsLevelSystem::Provider, Normal, "me.robin.battlelevels.api.BattleLevelsAPI")
         hookLevels(MmoCoreLevelSystem::Provider, Normal, "net.Indyuce.mmocore.MMOCore")
         hookLevels(HeroesLevelSystem::Provider, Normal, "com.herocraftonline.heroes.Heroes")
+        hookLevels(QuantumRpgLevelSystem::Provider, Normal, "su.nightexpress.quantumrpg.QuantumRPG")
 
         // ClassSystem
         hookClasses(PermissionsClassSystem::Provider, Lowest)
         hookClasses(SkillApiClassSystem::Provider, Normal, "com.sucy.skill.SkillAPI")
         hookClasses(MmoCoreClassSystem::Provider, Normal, "net.Indyuce.mmocore.MMOCore")
         hookClasses(HeroesClassSystem::Provider, Normal, "com.herocraftonline.heroes.Heroes")
+        hookClasses(QuantumRpgClassSystem::Provider, Normal, "su.nightexpress.quantumrpg.QuantumRPG")
 
         // ItemsRegistry
         hookItems(::MinecraftItemsRegistry, Lowest)
         hookItems(::CustomItemsRegistry, Normal, "com.jojodmo.customitems.api.CustomItemsAPI")
         hookItems(::MmoItemsRegistry, Normal, "net.Indyuce.mmoitems.MMOItems")
+        hookItems(::QuantumRpgItemsRegistry, Normal, "su.nightexpress.quantumrpg.QuantumRPG")
         hookItems({ MimicItemsRegistry(servicesManager) }, Highest)
     }
 
diff --git a/mimic-bukkit/src/main/kotlin/command/ItemsSubcommand.kt b/mimic-bukkit/src/main/kotlin/command/ItemsSubcommand.kt
@@ -32,15 +32,15 @@ import ru.endlesscode.mimic.items.BukkitItemsRegistry
 internal class ItemsSubcommand(private val itemsRegistry: BukkitItemsRegistry) : MimicCommand() {
 
     override fun afterRegister(manager: AbstractCommandManager) {
-        manager.getCommandCompletions().registerAsyncCompletion("item") { itemsRegistry.knownIds }
+        manager.commandCompletions.registerAsyncCompletion("item") { itemsRegistry.knownIds }
     }
 
     @Subcommand("info")
     @Description("Show information about items service")
     fun info(sender: CommandSender) {
         sender.send(
             "&3Items Service: &7${itemsRegistry.id}",
-            "&3Known IDs amount: &7${itemsRegistry.knownIds.size}"
+            "&3Known IDs amount: &7${itemsRegistry.knownIds.size}+"
         )
     }
 
diff --git a/mimic-bukkit/src/main/kotlin/command/LevelSystemSubcommand.kt b/mimic-bukkit/src/main/kotlin/command/LevelSystemSubcommand.kt
@@ -60,7 +60,7 @@ internal class LevelSystemSubcommand(
     fun set(
         sender: CommandSender,
         amount: Double,
-        @Default("exp") type: ExtendedValueType,
+        @Default("lvl") type: ExtendedValueType,
         @Optional @Flags("other,defaultself") player: Player
     ) {
         catchUnsupported {
diff --git a/mimic-bukkit/src/main/kotlin/impl/mimic/MimicItemsRegistry.kt b/mimic-bukkit/src/main/kotlin/impl/mimic/MimicItemsRegistry.kt
@@ -63,15 +63,13 @@ public class MimicItemsRegistry(private val servicesManager: ServicesManager) :
 
     override fun getItemId(item: ItemStack): String? {
         return services.asSequence()
-            .map { service -> service.getItemId(item)?.let { service.namespaced(it) } }
-            .filterNotNull()
+            .mapNotNull { service -> service.getItemId(item)?.let { service.namespaced(it) } }
             .firstOrNull()
     }
 
     override fun getItem(itemId: String, amount: Int): ItemStack? {
         return runOnServices(itemId) { id ->
-            map { service -> service.getItem(id, amount) }
-                .filterNotNull()
+            mapNotNull { service -> service.getItem(id, amount) }
                 .firstOrNull()
         }
     }
diff --git a/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgClassSystem.kt b/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgClassSystem.kt
@@ -0,0 +1,41 @@
+package ru.endlesscode.mimic.impl.quantumrpg
+
+import org.bukkit.entity.Player
+import ru.endlesscode.mimic.classes.BukkitClassSystem
+import ru.endlesscode.mimic.internal.stripColor
+import su.nightexpress.quantumrpg.modules.list.classes.api.RPGClass
+
+public class QuantumRpgClassSystem private constructor(
+    player: Player,
+    private val quantumRpg: QuantumRpgWrapper,
+) : BukkitClassSystem(player) {
+
+    public companion object {
+        public const val ID: String = "quantumrpg"
+    }
+
+    override val primaryClass: String?
+        get() = quantumRpg.getPlayerClass(player)?.colorlessName
+
+    override val classes: List<String>
+        get() {
+            val playerClass = quantumRpg.getPlayerClass(player) ?: return emptyList()
+            return (sequenceOf(playerClass) + playerClass.parents.asSequence())
+                .map { it.colorlessName }
+                .toList()
+        }
+
+    private val RPGClass.colorlessName: String get() = name.stripColor()
+
+    internal class Provider : BukkitClassSystem.Provider(ID) {
+
+        private val quantumRpg = QuantumRpgWrapper()
+
+        override val isEnabled: Boolean
+            get() = quantumRpg.isEnabled
+
+        override fun getSystem(player: Player): BukkitClassSystem {
+            return QuantumRpgClassSystem(player, quantumRpg)
+        }
+    }
+}
diff --git a/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgExpLevelConverter.kt b/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgExpLevelConverter.kt
@@ -0,0 +1,28 @@
+package ru.endlesscode.mimic.impl.quantumrpg
+
+import org.bukkit.entity.Player
+import ru.endlesscode.mimic.level.ExpLevelConverter
+import ru.endlesscode.mimic.util.ExistingWeakReference
+import su.nightexpress.quantumrpg.modules.list.classes.api.RPGClass
+
+public class QuantumRpgExpLevelConverter internal constructor(
+    player: Player,
+    private val quantumRPG: QuantumRpgWrapper,
+) : ExpLevelConverter {
+
+    public companion object {
+        @JvmStatic
+        public fun get(player: Player): ExpLevelConverter = QuantumRpgExpLevelConverter(player, QuantumRpgWrapper())
+    }
+
+    private val playerRef = ExistingWeakReference(player)
+
+    private val playerClass: RPGClass?
+        get() = quantumRPG.getPlayerClass(playerRef.get())
+
+    override fun getExpToReachLevel(level: Int): Double {
+        if (level <= 1) return 0.0
+        val playerClass = playerClass ?: return -1.0
+        return playerClass.getNeedExpForLevel(level).toDouble()
+    }
+}
diff --git a/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgItemsRegistry.kt b/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgItemsRegistry.kt
@@ -0,0 +1,66 @@
+package ru.endlesscode.mimic.impl.quantumrpg
+
+import org.bukkit.inventory.ItemStack
+import ru.endlesscode.mimic.items.BukkitItemsRegistry
+
+public class QuantumRpgItemsRegistry private constructor(
+    private val quantumRpg: QuantumRpgWrapper,
+) : BukkitItemsRegistry {
+
+    public companion object {
+        public const val ID: String = "quantumrpg"
+
+        private const val SEPARATOR = '/'
+    }
+
+    internal constructor() : this(QuantumRpgWrapper())
+
+    override val isEnabled: Boolean get() = quantumRpg.isEnabled
+    override val id: String get() = ID
+
+    override val knownIds: Collection<String>
+        get() = quantumRpg.itemsModules
+            .map { module -> module.itemIds.asSequence().map { module.namespaced(it) } }
+            .flatten()
+            .toList()
+
+    override fun isSameItem(item: ItemStack, itemId: String): Boolean {
+        val realItemId = getItemId(item) ?: return false
+        return itemId == realItemId || itemId == realItemId.split(SEPARATOR, limit = 2).last()
+    }
+
+    override fun isItemExists(itemId: String): Boolean {
+        return runOnModules(itemId) { id ->
+            any { it.getItemById(id) != null }
+        }
+    }
+
+    override fun getItemId(item: ItemStack): String? {
+        return quantumRpg.itemsModules
+            .mapNotNull { module -> module.getItemId(item)?.let { module.namespaced(it) } }
+            .firstOrNull()
+    }
+
+    override fun getItem(itemId: String, amount: Int): ItemStack? {
+        return runOnModules(itemId) { id ->
+            mapNotNull { module -> module.getItemById(id) }
+                .map { it.create() }
+                .firstOrNull()
+        }?.also { it.amount = amount.coerceIn(0, it.maxStackSize) }
+    }
+
+    private fun <T> runOnModules(itemId: String, block: Sequence<DropModule>.(id: String) -> T): T {
+        val (namespace, id) = if (SEPARATOR in itemId) {
+            itemId.split(SEPARATOR, limit = 2)
+        } else {
+            listOf("", itemId)
+        }
+
+        return quantumRpg.itemsModules
+            .filter { it.namespaceMatches(namespace) }
+            .block(id)
+    }
+
+    private fun DropModule.namespaced(itemId: String) = "$id$SEPARATOR$itemId"
+    private fun DropModule.namespaceMatches(namespace: String) = namespace.isEmpty() || namespace == id
+}
diff --git a/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgLevelSystem.kt b/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgLevelSystem.kt
@@ -0,0 +1,55 @@
+package ru.endlesscode.mimic.impl.quantumrpg
+
+import org.bukkit.entity.Player
+import ru.endlesscode.mimic.level.BukkitLevelSystem
+import ru.endlesscode.mimic.level.ExpLevelConverter
+import su.nightexpress.quantumrpg.modules.list.classes.api.UserClassData
+import kotlin.math.roundToInt
+
+public class QuantumRpgLevelSystem private constructor(
+    player: Player,
+    private val quantumRpg: QuantumRpgWrapper,
+) : BukkitLevelSystem(player) {
+
+    public companion object {
+        public const val ID: String = "quantumrpg"
+    }
+
+    override val converter: ExpLevelConverter = QuantumRpgExpLevelConverter(player, quantumRpg)
+
+    private val classData: UserClassData
+        get() = quantumRpg.getClassData(player)
+
+    override var level: Int
+        get() = classData.level
+        set(value) {
+            classData.level = value
+        }
+
+    override var exp: Double
+        get() = classData.exp.toDouble()
+        set(value) {
+            classData.exp = value.coerceIn(0.0, totalExpToNextLevel).roundToInt()
+        }
+
+    override val expToNextLevel: Double
+        get() = classData.getExpToUp(false).toDouble()
+
+    override val totalExpToNextLevel: Double
+        get() = classData.getExpToUp(true).toDouble()
+
+    override fun takeExp(expAmount: Double) {
+        giveExp(-expAmount.coerceAtMost(totalExp))
+    }
+
+    override fun giveExp(expAmount: Double) {
+        classData.addExp(expAmount.roundToInt())
+    }
+
+    internal class Provider : BukkitLevelSystem.Provider(ID) {
+        override val isEnabled: Boolean get() = quantumRpg.isEnabled
+        private val quantumRpg = QuantumRpgWrapper()
+
+        override fun getSystem(player: Player): BukkitLevelSystem = QuantumRpgLevelSystem(player, quantumRpg)
+    }
+}
diff --git a/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgWrapper.kt b/mimic-bukkit/src/main/kotlin/impl/quantumrpg/QuantumRpgWrapper.kt
@@ -0,0 +1,44 @@
+package ru.endlesscode.mimic.impl.quantumrpg
+
+import org.bukkit.entity.Player
+import su.nightexpress.quantumrpg.QuantumRPG
+import su.nightexpress.quantumrpg.api.QuantumAPI
+import su.nightexpress.quantumrpg.modules.ModuleCache
+import su.nightexpress.quantumrpg.modules.ModuleItem
+import su.nightexpress.quantumrpg.modules.api.QModuleDrop
+import su.nightexpress.quantumrpg.modules.list.classes.ClassManager
+import su.nightexpress.quantumrpg.modules.list.classes.api.RPGClass
+import su.nightexpress.quantumrpg.modules.list.classes.api.UserClassData
+
+internal typealias DropModule = QModuleDrop<out ModuleItem>
+
+internal class QuantumRpgWrapper {
+
+    val isEnabled: Boolean get() = QuantumRPG.instance.isEnabled
+
+    val itemsModules: Sequence<DropModule> by lazy {
+        sequenceOf(
+            modules.activeItemManager,
+            modules.arrowManager,
+            modules.conumeManager,
+            modules.resolveManager,
+            modules.essenceManager,
+            modules.extractManager,
+            modules.fortifyManager,
+            modules.gemManager,
+            modules.identifyManager,
+            modules.tierManager,
+            modules.magicDustManager,
+            modules.refineManager,
+            modules.repairManager,
+            modules.runeManager,
+        )
+    }
+
+    private val modules: ModuleCache by lazy { QuantumAPI.getModuleManager() }
+    private val userManager: ClassManager get() = modules.classManager
+
+    fun getPlayerClass(player: Player): RPGClass? = getClassData(player).playerClass
+
+    fun getClassData(player: Player): UserClassData = checkNotNull(userManager.getUserData(player))
+}
diff --git a/mimic-bukkit/src/main/kotlin/internal/Colors.kt b/mimic-bukkit/src/main/kotlin/internal/Colors.kt
diff --git a/mimic-bukkit/src/main/resources/plugin.yml b/mimic-bukkit/src/main/resources/plugin.yml

Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ import ru.endlesscode.mimic.items.BukkitItemsRegistry`
`32`	`32`	`internal class ItemsSubcommand(private val itemsRegistry: BukkitItemsRegistry) : MimicCommand() {`
`33`	`33`
`34`	`34`	`override fun afterRegister(manager: AbstractCommandManager) {`
`35`		`- manager.getCommandCompletions().registerAsyncCompletion("item") { itemsRegistry.knownIds }`
	`35`	`+ manager.commandCompletions.registerAsyncCompletion("item") { itemsRegistry.knownIds }`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Subcommand("info")`
`39`	`39`	`@Description("Show information about items service")`
`40`	`40`	`fun info(sender: CommandSender) {`
`41`	`41`	`sender.send(`
`42`	`42`	`"&3Items Service: &7${itemsRegistry.id}",`
`43`		`- "&3Known IDs amount: &7${itemsRegistry.knownIds.size}"`
	`43`	`+ "&3Known IDs amount: &7${itemsRegistry.knownIds.size}+"`
`44`	`44`	`)`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -63,15 +63,13 @@ public class MimicItemsRegistry(private val servicesManager: ServicesManager) :`
`63`	`63`
`64`	`64`	`override fun getItemId(item: ItemStack): String? {`
`65`	`65`	`return services.asSequence()`
`66`		`- .map { service -> service.getItemId(item)?.let { service.namespaced(it) } }`
`67`		`- .filterNotNull()`
	`66`	`+ .mapNotNull { service -> service.getItemId(item)?.let { service.namespaced(it) } }`
`68`	`67`	`.firstOrNull()`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`override fun getItem(itemId: String, amount: Int): ItemStack? {`
`72`	`71`	`return runOnServices(itemId) { id ->`
`73`		`- map { service -> service.getItem(id, amount) }`
`74`		`- .filterNotNull()`
	`72`	`+ mapNotNull { service -> service.getItem(id, amount) }`
`75`	`73`	`.firstOrNull()`
`76`	`74`	`}`
`77`	`75`	`}`