diff --git a/build.gradle b/build.gradle index 66b6de1..218b81f 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:6.31.0' + compileOnly 'com.willfp:eco:6.33.0' implementation 'com.willfp:libreforge:3.33.3' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java index b940ce2..f88bec3 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java @@ -99,7 +99,7 @@ public class ReforgesPlugin extends LibReforgePlugin { @Override @NotNull public String getMinimumEcoVersion() { - return "6.31.0"; + return "6.33.0"; } /** diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt index 53e2cd8..3ba2123 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt @@ -1,6 +1,5 @@ package com.willfp.reforges.display -import com.willfp.eco.core.Prerequisite import com.willfp.eco.core.display.Display import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.display.DisplayPriority @@ -10,7 +9,6 @@ import com.willfp.eco.util.StringUtils import com.willfp.reforges.ReforgesPlugin import com.willfp.reforges.reforges.meta.ReforgeTarget import com.willfp.reforges.reforges.util.ReforgeUtils -import net.kyori.adventure.text.Component import net.kyori.adventure.text.TextReplacementConfig import net.kyori.adventure.text.format.TextDecoration import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer @@ -82,6 +80,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin }.toList() lore.addAll(0, stoneLore) } + if (reforge != null) { if (plugin.configYml.getBool("reforge.display-in-lore")) { val addLore: MutableList = ArrayList() @@ -92,34 +91,35 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin addLore.replaceAll { "${Display.PREFIX}$it" } lore.addAll(addLore) } - if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) { - val displayName = (meta.displayName() ?: Component.translatable(itemStack)).replaceText(replacement) - meta.persistentDataContainer.set( + if (plugin.configYml.getBool("reforge.display-in-name")) { + val displayName = fastItemStack.displayNameComponent.replaceText(replacement) + + val newName = StringUtils.toComponent("${reforge.name} ") + .decoration(TextDecoration.ITALIC, false).append(displayName) + + fastItemStack.setDisplayName(newName) + + fastItemStack.persistentDataContainer.set( originalComponentKey, PersistentDataType.STRING, serializer.serialize(displayName) ) - val newName = StringUtils.toComponent("${reforge.name} ") - .decoration(TextDecoration.ITALIC, false).append(displayName) - meta.displayName(newName) } } - itemStack.itemMeta = meta + fastItemStack.lore = lore } override fun revert(itemStack: ItemStack) { ReforgeTarget.getForItem(itemStack) ?: return - val meta = itemStack.itemMeta ?: return + val fis = FastItemStack.wrap(itemStack) - if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) { + if (plugin.configYml.getBool("reforge.display-in-name")) { val originalName = - meta.persistentDataContainer.get(originalComponentKey, PersistentDataType.STRING) ?: return - meta.persistentDataContainer.remove(originalComponentKey) - meta.displayName(serializer.deserialize(originalName).replaceText(replacement)) + fis.persistentDataContainer.get(originalComponentKey, PersistentDataType.STRING) ?: return + fis.persistentDataContainer.remove(originalComponentKey) + fis.setDisplayName(serializer.deserialize(originalName).replaceText(replacement)) } - - itemStack.itemMeta = meta } -} \ No newline at end of file +} diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index 92aff85..4c7edd6 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -150,7 +150,7 @@ reforge: - "&8This item can be reforged!" display-in-lore: true - display-in-name: true # Requires paper to be installed on the server + display-in-name: true reforged-prefix: - "" diff --git a/gradle.properties b/gradle.properties index 5b1720a..33b1415 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 4.61.4 +version = 4.61.5 plugin-name = Reforges \ No newline at end of file