Repo-Mirror/Reforges
9
0
Fork 0
mirror of https://github.com/Auxilor/Reforges.git synced 2025-12-30 12:29:10 +00:00
Code Issues Releases 1 Activity

Code cleanup

Browse Source
This commit is contained in:
Auxilor
2021-10-02 12:41:28 +01:00
parent d818bd27ae
commit 91e5f7cdfa
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eco-core/core-plugin/build.gradle
View File

@@ -2,7 +2,6 @@ group 'com.willfp'
version rootProject.version
dependencies {
compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
compileOnly 'net.kyori:adventure-api:4.9.1'
compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
}

1
eco-core/core-plugin/src/main/java/com/willfp/reforges/gui/ReforgeGUI.java
View File

@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@SuppressWarnings("deprecation")
@UtilityClass
public class ReforgeGUI {
/**

3
eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeUtils.java
View File

@@ -16,7 +16,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -51,7 +50,7 @@ public class ReforgeUtils {
List<Reforge> applicable = new ArrayList<>();
for (Reforge reforge : Reforges.values()) {
if (Arrays.asList(reforge.getTargets()).contains(target) && !reforge.getRequiresStone()) {
if (reforge.getTargets().contains(target) && !reforge.getRequiresStone()) {
applicable.add(reforge);
}
}

42
eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt
View File

@@ -11,14 +11,14 @@ 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.translation.Translatable
import net.kyori.adventure.text.TextReplacementConfig
import net.kyori.adventure.text.format.TextDecoration
import org.bukkit.Material
import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.SkullMeta
@Suppress("DEPRECATION")
class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin, DisplayPriority.HIGHEST) {
private val shadowKey = plugin.namespacedKeyFactory.create("shadowed_name")
override fun display(
itemStack: ItemStack,
vararg args: Any
@@ -71,15 +71,17 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
lore.addAll(addLore)
}
if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) {
var displayName = if (meta.hasDisplayName()) meta.displayName else StringUtils.toLegacy(
Component.translatable(itemStack as Translatable)
)
displayName = displayName.replace(
reforge.name + " ",
""
)
val newName = reforge.name + " " + displayName
meta.setDisplayName(newName)
val displayName =
(if (meta.hasDisplayName()) meta.displayName()!! else Component.translatable(itemStack))
.replaceText(
TextReplacementConfig.builder()
.match("§w(.)§w")
.replacement("")
.build()
)
val newName = StringUtils.toComponent("§w${reforge.name} §w")
.decoration(TextDecoration.ITALIC, false).append(displayName)
meta.displayName(newName)
}
}
itemStack.itemMeta = meta
@@ -94,15 +96,17 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
}
val meta = itemStack.itemMeta ?: return
val reforge = ReforgeUtils.getReforge(meta) ?: return
if (plugin.configYml.getBool("reforge.display-in-name")) {
var displayName = meta.displayName
displayName = displayName.replace(
reforge.name + " ",
""
if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) {
val displayName = meta.displayName() ?: return
meta.displayName(
displayName.replaceText(
TextReplacementConfig.builder()
.match("§w(.)§w")
.replacement("")
.build()
)
)
meta.setDisplayName(displayName)
}
itemStack.itemMeta = meta