Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-22 15:05:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed color system to remove terrible {} syntax and replace with minimessage

Browse Source
This commit is contained in:
Auxilor 2021-10-05 09:00:08 +01:00
parent 1b497b0ab9
commit 9f5d84d81c
2 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java
View File

@ -22,6 +22,7 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.border.MatteBorder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -263,27 +264,15 @@ public class EnchantmentCache {
*/
public String getNameWithLevel(final int level,
@Nullable final Player player) {
String formattedName = name;
String unformattedName = name;
String processed = name;
if (enchantment instanceof EcoEnchant enchant && player != null) {
if (!enchant.areRequirementsMet(player)) {
String color = PLUGIN.getDisplayModule().getOptions().getRequirementsOptions().getRequirementColor();
if (color.contains("{}")) {
unformattedName = color.replace("{}", unformattedName);
formattedName = color.replace("{}", formattedName);
} else {
unformattedName = color + unformattedName;
formattedName = color + formattedName;
}
processed = PLUGIN.getDisplayModule().getOptions().getRequirementsOptions().getRequirementColor() + processed;
}
}
if (color.contains("{}")) {
formattedName = color.replace("{}", formattedName);
} else {
formattedName = color + formattedName;
}
formattedName = StringUtils.format(formattedName);
if (!(enchantment.getMaxLevel() == 1 && level == 1)) {
if (!(enchantment.getMaxLevel() == 1 && level == 1) && level != 0) {
String numberString = " ";
NumbersOptions numbersOptions = PLUGIN.getDisplayModule().getOptions().getNumbersOptions();
@ -296,30 +285,21 @@ public class EnchantmentCache {
if (level > enchantment.getMaxLevel() && PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().isReformatAboveMaxLevel()) {
if (PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().isNumbersOnly()) {
String color = PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().getAboveMaxLevelFormat();
if (color.contains("{}")) {
numberString = color.replace("{}", numberString);
} else {
numberString = color + numberString;
}
String aboveMaxLevel = PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().getAboveMaxLevelFormat();
return formattedName + StringUtils.format(numberString);
processed = processed + aboveMaxLevel + numberString;
} else {
String clone = unformattedName;
String color = PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().getAboveMaxLevelFormat();
if (color.contains("{}")) {
clone = color.replace("{}", clone);
} else {
clone = color + clone;
}
return StringUtils.format(clone + numberString);
String aboveMaxLevel = PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().getAboveMaxLevelFormat();
processed = aboveMaxLevel + processed + numberString;
}
} else {
return formattedName + numberString;
processed = processed + numberString;
}
} else {
return formattedName;
}
processed = color + processed;
processed = StringUtils.format(processed, StringUtils.FormatOption.WITHOUT_PLACEHOLDERS);
return processed;
}
/**
@ -416,14 +396,7 @@ public class EnchantmentCache {
* @return The name.
*/
public String getName() {
String formattedName = name;
if (color.contains("{}")) {
formattedName = color.replace("{}", formattedName);
} else {
formattedName = color + formattedName;
}
return StringUtils.format(formattedName);
return getNameWithLevel(0);
}
}
}

2
eco-core/core-plugin/src/main/resources/lang.yml
View File

@ -35,7 +35,7 @@ messages:
no-targets: "&cCannot be applied"
no-conflicts: "&cNo conflicts"
missing-requirements-format: "&m"
missing-requirements-format: "<strikethrough>"
curse-color: "&c"
normal-color: "&7"