Skip to content

Commit

Permalink
Bump Minestom
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeoDog896
LeoDog896 committed May 27, 2022
1 parent 78c340d commit be65b11
Show file tree
Hide file tree
Showing 22 changed files with 47 additions and 44 deletions.
10 changes: 5 additions & 5 deletions build.gradle.kts
View file
Expand Up @@ -35,19 +35,19 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")

// Compile Minestom into project
compileOnly("com.github.Minestom", "Minestom", "4ee5cbe424")
compileOnly("com.github.Minestom", "Minestom", "7867313290")

// implement KStom
compileOnly("com.github.Project-Cepi:KStom:15bab227a2")
compileOnly("com.github.Project-Cepi:KStom:82f7000079")

// add energy
compileOnly("com.github.Project-Cepi:EnergyExtension:f2bcdfc79e")

// import kotlinx serialization
compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")

// Add MiniMessage
compileOnly("net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT")
compileOnly("net.kyori:adventure-text-minimessage:4.10.1")

// Add Kepi
compileOnly("com.github.Project-Cepi:Kepi:071b288ed0")
Expand All @@ -71,7 +71,7 @@ dependencies {
compileOnly("com.github.Project-Cepi:MinestomPVP:b9cb14d4bf")

// Add canvas
implementation("com.mattworzala:canvas:1.1.5")
implementation("com.github.Project-Cepi:canvas:a61710f9e2")
}

tasks.withType<Test> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/world/cepi/itemextension/combat/TargetHandler.kt
View file
Expand Up @@ -100,7 +100,7 @@ object TargetHandler {

if (!checkIsItem(item)) return false

val cepiItem: Item = item.meta.get(Item.key, itemSerializationModule)!!
val cepiItem: Item = item.meta().get(Item.key, itemSerializationModule)!!

// Check if any action of an item requires a target
return cepiItem.softGet<ActionTrait>().any { it.useTargeting }
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/world/cepi/itemextension/combat/events/CombatHandler.kt
View file
Expand Up @@ -218,7 +218,7 @@ object CombatHandler {

run set@ {
(entity as? LivingEntity)?.itemInMainHand = cepiItem.renderItem(
(entity as? LivingEntity)?.itemInMainHand?.amount ?: return@set
(entity as? LivingEntity)?.itemInMainHand?.amount() ?: return@set
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/world/cepi/itemextension/combat/events/DeathHandler.kt
View file
Expand Up @@ -20,7 +20,7 @@ object DeathHandler {
private fun deathMessage(player: Player, secondsLeft: Int) = player.showTitle(Title.title(
Component.text("You died!", NamedTextColor.RED),
Component.text("Respawning in $secondsLeft...", NamedTextColor.WHITE),
Title.Times.of(Ticks.duration(0), Ticks.duration(21), Ticks.duration(0))
Title.Times.times(Ticks.duration(0), Ticks.duration(21), Ticks.duration(0))
))


Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/command/GiveCommand.kt
View file
Expand Up @@ -55,8 +55,8 @@ object GiveCommand : Kommand({
Component.text(context.get(amountArg), NamedTextColor.BLUE)
.append(Component.space())
.append(context.get(itemArg).displayName ?: Component.text(
context.get(itemArg).material
.namespace().path
context.get(itemArg).material()
.namespace().path()
.lowercase()
.split("_")
.joinToString(" ") { it.replaceFirstChar { it.uppercase() } }
Expand Down
10 changes: 5 additions & 5 deletions src/main/kotlin/world/cepi/itemextension/command/NBTCommand.kt
View file
Expand Up @@ -37,25 +37,25 @@ internal object NBTCommand : Kommand({
val item = player.itemInMainHand

player.sendMessage(
Component.text(item.meta.toSNBT(), NamedTextColor.GRAY)
Component.text(item.meta().toSNBT(), NamedTextColor.GRAY)
.hoverEvent(HoverEvent.showText(Component.text("Click to copy", NamedTextColor.YELLOW)))
.clickEvent(ClickEvent.copyToClipboard(item.meta.toSNBT()))
.clickEvent(ClickEvent.copyToClipboard(item.meta().toSNBT()))
)
}

syntax(get, "ignoreDisplay".literal()) {
val item = player.itemInMainHand

player.sendMessage(
Component.text(item.meta.toNBT().withRemovedKeys("display").toSNBT(), NamedTextColor.GRAY)
Component.text(item.meta().toNBT().withRemovedKeys("display").toSNBT(), NamedTextColor.GRAY)
.hoverEvent(HoverEvent.showText(Component.text("Click to copy", NamedTextColor.YELLOW)))
.clickEvent(ClickEvent.copyToClipboard(item.meta.toSNBT()))
.clickEvent(ClickEvent.copyToClipboard(item.meta().toSNBT()))
)
}

syntax(set, nbt, material) {
player.itemInMainHand = ItemStack.fromNBT(
context[material].material,
context[material].material(),
context[nbt]
)
}
Expand Down
4 changes: 2 additions & 2 deletions ...n/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/CreateSubcommand.kt
View file
Expand Up @@ -25,10 +25,10 @@ object CreateSubcommand : Kommand({
val item = Item()

if (context[materialArgument] != ItemStack.of(Material.PAPER)) {
item.put(MaterialTrait(context[materialArgument].material, context[materialArgument].meta.customModelData))
item.put(MaterialTrait(context[materialArgument].material(), context[materialArgument].meta().customModelData))
}

AddCreationalItem.put(player, item.renderItem(if (itemStack.amount == 0) 1 else itemStack.amount))
AddCreationalItem.put(player, item.renderItem(if (itemStack.amount() == 0) 1 else itemStack.amount()))
player.sendFormattedTranslatableMessage("item", "create")

player.playSound(Kepi.newItemSound)
Expand Down
4 changes: 2 additions & 2 deletions ...n/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/RemoveSubcommand.kt
View file
Expand Up @@ -22,7 +22,7 @@ object RemoveSubcommand : Kommand(name = "remove") {
syntax(traitList) {
val itemStack = player.itemInMainHand

if (itemStack.material == Material.AIR) {
if (itemStack.material() == Material.AIR) {
player.sendFormattedTranslatableMessage("item", "main.required")
return@syntax
}
Expand All @@ -43,7 +43,7 @@ object RemoveSubcommand : Kommand(name = "remove") {
Component.text(processTraitName(trait.simpleName!!), NamedTextColor.BLUE)
.append(Component.text("", NamedTextColor.GRAY))
)
player.itemInMainHand = item.renderItem(player.itemInMainHand.amount)
player.itemInMainHand = item.renderItem(player.itemInMainHand.amount())
player.playSound(Kepi.editItemSound)
} else
player.sendFormattedTranslatableMessage("item", "trait.none", Component.text(context.get(traitList), NamedTextColor.BLUE))
Expand Down
4 changes: 2 additions & 2 deletions ...in/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/ResetSubcommand.kt
View file
Expand Up @@ -12,7 +12,7 @@ object ResetSubcommand : Kommand({
syntax {
val itemStack = player.itemInMainHand

if (itemStack.material == Material.AIR) {
if (itemStack.material() == Material.AIR) {
player.sendFormattedTranslatableMessage("mob", "main.required")
return@syntax
}
Expand All @@ -22,7 +22,7 @@ object ResetSubcommand : Kommand({
if (isCepiItem) {
val item = itemStack.cepiItem!!
item.removeAllTraits()
player.itemInMainHand = item.renderItem(itemStack.amount)
player.itemInMainHand = item.renderItem(itemStack.amount())
player.sendFormattedTranslatableMessage("item", "reset")
player.playSound(Kepi.editItemSound)
} else
Expand Down
2 changes: 1 addition & 1 deletion ...main/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/SetSubcommand.kt
View file
Expand Up @@ -82,7 +82,7 @@ object SetSubcommand : Kommand(name = "set") {

item.put(instance)

player.itemInMainHand = item.renderItem(player.itemInMainHand.amount.coerceIn(1, Integer.MAX_VALUE))
player.itemInMainHand = item.renderItem(player.itemInMainHand.amount().coerceIn(1, Integer.MAX_VALUE))

player.sendFormattedTranslatableMessage("item", "trait.add", Component.text(processTraitName(lastTrait.simpleName!!), NamedTextColor.BLUE))

Expand Down
4 changes: 2 additions & 2 deletions ...n/kotlin/world/cepi/itemextension/command/itemcommand/loaders/actions/UpdateSubcommand.kt
View file
Expand Up @@ -11,7 +11,7 @@ object UpdateSubcommand : Kommand({
syntax {
val itemStack = player.itemInMainHand

if (itemStack.material == Material.AIR) {
if (itemStack.material() == Material.AIR) {
player.sendFormattedTranslatableMessage("item", "main.required")
return@syntax
}
Expand All @@ -20,7 +20,7 @@ object UpdateSubcommand : Kommand({

if (isCepiItem) {
val item = itemStack.cepiItem!!
player.itemInMainHand = item.renderItem(itemStack.amount)
player.itemInMainHand = item.renderItem(itemStack.amount())
player.sendFormattedTranslatableMessage("item", "render")
} else
player.sendFormattedTranslatableMessage("item", "formatted.required")
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/Item.kt
View file
Expand Up @@ -98,11 +98,11 @@ fun checkIsItem(itemStack: ItemStack): Boolean {

if (itemStack.isAir) return false

return itemStack.meta.get<Item>(key, itemSerializationModule) != null
return itemStack.meta().get<Item>(key, itemSerializationModule) != null
}

val ItemStack.cepiItem: Item?
get() = this.meta.get(key, itemSerializationModule)
get() = this.meta().get(key, itemSerializationModule)

/**
* DSL for creating cepi items
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/world/cepi/itemextension/item/context/ItemContextParser.kt
View file
Expand Up @@ -14,7 +14,7 @@ import world.cepi.kstom.item.get
object ItemContextParser : ContextParser<Item> {

override fun parse(sender: CommandSender): Item? =
(sender as? Player)?.itemInMainHand?.meta?.get(Item.key, itemSerializationModule)
(sender as? Player)?.itemInMainHand?.meta()?.get(Item.key, itemSerializationModule)

override val callbackMessage = Component.text("No cepi item found in main hand!")

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/world/cepi/itemextension/item/context/ItemOffHandContextParser.kt
View file
Expand Up @@ -14,7 +14,7 @@ import world.cepi.kstom.item.get
object ItemOffHandContextParser : ContextParser<Item> {

override fun parse(sender: CommandSender): Item? =
(sender as? Player)?.itemInOffHand?.meta?.get(Item.key, itemSerializationModule)
(sender as? Player)?.itemInOffHand?.meta()?.get(Item.key, itemSerializationModule)

override val callbackMessage = Component.text("No cepi item found in main hand!")

Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/traits/ItemTrait.kt
View file
Expand Up @@ -2,7 +2,8 @@ package world.cepi.itemextension.item.traits

import kotlinx.serialization.Serializable
import net.kyori.adventure.text.Component
import net.minestom.server.item.ItemMetaBuilder
import net.minestom.server.item.ItemMeta
import net.minestom.server.item.ItemStack
import world.cepi.itemextension.item.Item
import world.cepi.itemextension.item.traits.list.*
import world.cepi.itemextension.item.traits.list.actions.PrimaryActionTrait
Expand All @@ -24,7 +25,7 @@ abstract class ItemTrait {
*
* @param item The item that is being rendered.
*/
open fun task(item: ItemMetaBuilder, originalItem: Item) { }
open fun task(item: ItemMeta.Builder, originalItem: Item) { }

/**
* This function is called based on the [ItemTrait.Companion.classList] of the [ItemTrait]
Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/traits/list/DamageTrait.kt
View file
Expand Up @@ -5,7 +5,8 @@ import kotlinx.serialization.Serializable
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.format.NamedTextColor
import net.kyori.adventure.text.format.TextDecoration
import net.minestom.server.item.ItemMetaBuilder
import net.minestom.server.item.ItemMeta
import net.minestom.server.item.ItemStack
import net.minestom.server.tag.Tag
import world.cepi.itemextension.item.Item
import world.cepi.itemextension.item.traits.ItemTrait
Expand All @@ -28,7 +29,7 @@ data class DamageTrait(
)
}

override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) {
override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) {
set(Tag.Float("damage"), damage)
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/traits/list/DurabilityTrait.kt
View file
Expand Up @@ -5,7 +5,8 @@ import kotlinx.serialization.Serializable
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.format.NamedTextColor
import net.kyori.adventure.text.format.TextDecoration
import net.minestom.server.item.ItemMetaBuilder
import net.minestom.server.item.ItemMeta
import net.minestom.server.item.ItemStack
import world.cepi.itemextension.item.Item
import world.cepi.itemextension.item.traits.ItemTrait

Expand All @@ -15,7 +16,7 @@ class DurabilityTrait(val maxDurability: Int, val currentDurability: Int) : Item

override val taskIndex = 1f

override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) {
override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) {
damage(
(maxDurability - currentDurability) *
(originalItem.get<MaterialTrait>()!!.material.registry().maxDamage() / maxDurability)
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/traits/list/KnockbackTrait.kt
View file
Expand Up @@ -2,7 +2,7 @@ package world.cepi.itemextension.item.traits.list

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import net.minestom.server.item.ItemMetaBuilder
import net.minestom.server.item.ItemMeta
import net.minestom.server.tag.Tag
import world.cepi.itemextension.item.Item
import world.cepi.itemextension.item.traits.ItemTrait
Expand All @@ -13,7 +13,7 @@ data class KnockbackTrait(val amount: Float): ItemTrait() {

override val taskIndex = 0f

override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) {
override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) {
set(Tag.Float("knockback"), amount)
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/traits/list/MaterialTrait.kt
View file
Expand Up @@ -2,7 +2,7 @@ package world.cepi.itemextension.item.traits.list

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import net.minestom.server.item.ItemMetaBuilder
import net.minestom.server.item.ItemMeta
import net.minestom.server.item.Material
import world.cepi.itemextension.item.Item
import world.cepi.itemextension.item.traits.ItemTrait
Expand All @@ -24,7 +24,7 @@ data class MaterialTrait(

override val taskIndex = -1f

override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) {
override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) {
if (customModelData != 0) customModelData(customModelData)
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/traits/list/NameTrait.kt
View file
Expand Up @@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.format.NamedTextColor
import net.kyori.adventure.text.format.TextDecoration
import net.minestom.server.item.ItemMetaBuilder
import net.minestom.server.item.ItemMeta
import world.cepi.itemextension.item.Item
import world.cepi.itemextension.item.traits.ItemTrait

Expand All @@ -19,7 +19,7 @@ data class NameTrait(

override val taskIndex = 10f

override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) {
override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) {
val color = originalItem.get<RarityTrait>()?.rarity?.color ?: NamedTextColor.WHITE
displayName(Component.text(name, color).decoration(TextDecoration.ITALIC, false))
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/item/traits/list/PriceTrait.kt
View file
Expand Up @@ -2,7 +2,7 @@ package world.cepi.itemextension.item.traits.list

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import net.minestom.server.item.ItemMetaBuilder
import net.minestom.server.item.ItemMeta
import net.minestom.server.tag.Tag
import world.cepi.itemextension.item.Item
import world.cepi.itemextension.item.traits.ItemTrait
Expand All @@ -20,7 +20,7 @@ data class PriceTrait(

override val taskIndex = 0f

override fun task(item: ItemMetaBuilder, originalItem: Item): Unit = with(item) {
override fun task(item: ItemMeta.Builder, originalItem: Item): Unit = with(item) {
set(Tag.Integer("price"), price)
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/world/cepi/itemextension/stats/StatsHandler.kt
View file
Expand Up @@ -64,10 +64,10 @@ object StatsHandler {

val item: Item = (
if (isSlotChanged)
changedSlots[it]?.meta?.get(Item.key, itemSerializationModule) ?: return@mapNotNull null
changedSlots[it]?.meta()?.get(Item.key, itemSerializationModule) ?: return@mapNotNull null
else
null
) ?: entity.getEquipment(it).meta.get(Item.key, itemSerializationModule) ?: return@mapNotNull null
) ?: entity.getEquipment(it).meta().get(Item.key, itemSerializationModule) ?: return@mapNotNull null
it to item
}.toMap()

Expand Down

0 comments on commit be65b11

Please sign in to comment.