diff --git a/eco-extensions/softtouch/src/main/java/com/willfp/ecoenchants/softtouch/SoftTouch.java b/eco-extensions/softtouch/src/main/java/com/willfp/ecoenchants/softtouch/SoftTouch.java index afd22880..8ed6013c 100644 --- a/eco-extensions/softtouch/src/main/java/com/willfp/ecoenchants/softtouch/SoftTouch.java +++ b/eco-extensions/softtouch/src/main/java/com/willfp/ecoenchants/softtouch/SoftTouch.java @@ -34,6 +34,7 @@ public class SoftTouch extends EcoEnchant { return EnchantmentUtils.chancePlaceholder(this, level); } + @SuppressWarnings("checkstyle:OperatorWrap") @Override public void onBlockBreak(@NotNull final Player player, @NotNull final Block block, @@ -60,12 +61,13 @@ public class SoftTouch extends EcoEnchant { meta.getPersistentDataContainer().set(this.getPlugin().getNamespacedKeyFactory().create("softtouch"), PersistentDataType.STRING, type.name()); String entityName = displayNicely(type); - meta.setDisplayName( - this.getConfig().getString(EcoEnchants.CONFIG_LOCATION + "spawner-name") - .replace("%type%", entityName) - ); - List lore = this.getConfig().getStrings(EcoEnchants.CONFIG_LOCATION + "spawner-lore"); + String name = this.getConfig().getString(EcoEnchants.CONFIG_LOCATION + "name"); + name = name.replace("%type%", entityName); + name = name.replace("[", "").replace("]", ""); + meta.setDisplayName(name); + + List lore = this.getConfig().getStrings(EcoEnchants.CONFIG_LOCATION + "lore"); lore.replaceAll(s -> s.replace("%type%", entityName)); meta.setLore(lore); @@ -111,7 +113,7 @@ public class SoftTouch extends EcoEnchant { } private String displayNicely(@NotNull final EntityType type) { - String name = type.name(); + String name = type.name().toLowerCase(); name = name.replace("_", ""); name = StringUtils.capitalize(name); return name; diff --git a/eco-extensions/softtouch/src/main/resources/enchants/normal/softtouch.yml b/eco-extensions/softtouch/src/main/resources/enchants/normal/softtouch.yml index ccf75c52..2a0f2ca9 100644 --- a/eco-extensions/softtouch/src/main/resources/enchants/normal/softtouch.yml +++ b/eco-extensions/softtouch/src/main/resources/enchants/normal/softtouch.yml @@ -23,8 +23,8 @@ general-config: config: chance-per-level: 10 - spawner-name: + name: - "&a%type%&f Spawner" - spawner-lore: + lore: - "&a%type%&f Spawner" - "&fCan be placed anywhere in the world" \ No newline at end of file