From 4e00c88e39093b2bc54350b6d667c0d97f50cbbc Mon Sep 17 00:00:00 2001 From: ceze88 Date: Thu, 25 Jul 2024 14:45:14 +0200 Subject: [PATCH] Implement new core changes --- .../epichoppers/hopper/levels/Level.java | 12 +++++------ .../craftaro/epichoppers/utils/Methods.java | 2 +- .../com/craftaro/epichoppers/EpicHoppers.java | 2 +- .../epichoppers/gui/GUIAutoSellFilter.java | 8 ++++---- .../craftaro/epichoppers/gui/GUIFilter.java | 14 ++++++------- .../craftaro/epichoppers/gui/GUIOverview.java | 20 +++++++++---------- .../epichoppers/gui/GUISmeltable.java | 2 +- .../levels/modules/ModuleAutoCrafting.java | 8 ++++---- .../hopper/levels/modules/ModuleAutoSell.java | 6 +++--- .../levels/modules/ModuleAutoSmelter.java | 6 +++--- .../levels/modules/ModuleBlockBreak.java | 15 +++++++------- .../levels/modules/ModuleMobHopper.java | 13 ++++++------ .../hopper/levels/modules/ModuleSuction.java | 8 ++++---- .../epichoppers/listeners/BlockListeners.java | 6 +++--- .../listeners/InteractListeners.java | 5 +++-- 15 files changed, 63 insertions(+), 64 deletions(-) diff --git a/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/levels/Level.java b/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/levels/Level.java index 728d625..a1bbbae 100644 --- a/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/levels/Level.java +++ b/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/hopper/levels/Level.java @@ -31,17 +31,17 @@ public class Level { this.description.clear(); this.description.add(getPlugin().getLocale().getMessage("interface.hopper.range") - .processPlaceholder("range", this.range).getMessage()); + .processPlaceholder("range", this.range).toText()); this.description.add(getPlugin().getLocale().getMessage("interface.hopper.amount") - .processPlaceholder("amount", this.amount).getMessage()); + .processPlaceholder("amount", this.amount).toText()); if (this.linkAmount != 1) { this.description.add(getPlugin().getLocale().getMessage("interface.hopper.linkamount") - .processPlaceholder("amount", this.linkAmount).getMessage()); + .processPlaceholder("amount", this.linkAmount).toText()); } if (this.filter) { this.description.add(getPlugin().getLocale().getMessage("interface.hopper.filter") .processPlaceholder("enabled", getPlugin().getLocale() - .getMessage("general.word.enabled").getMessage()).getMessage()); + .getMessage("general.word.enabled").getMessage()).toText()); } if (this.teleport) { this.description.add(getPlugin() @@ -52,8 +52,8 @@ public class Level { getPlugin() .getLocale() .getMessage("general.word.enabled") - .getMessage()) - .getMessage()); + .toText()) + .toText()); } for (Module module : this.registeredModules) { diff --git a/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/Methods.java b/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/Methods.java index b097cf8..5c220f9 100644 --- a/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/Methods.java +++ b/EpicHoppers-API/src/main/java/com/craftaro/epichoppers/utils/Methods.java @@ -80,7 +80,7 @@ public class Methods { String name = getPlugin().getLocale() .getMessage("general.nametag.nameformat") .processPlaceholder("level", level) - .getMessage(); + .toText(); return TextUtils.formatText(name); diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java index 406af72..6fc0fe7 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/EpicHoppers.java @@ -235,7 +235,7 @@ public class EpicHoppers extends SongodaPlugin { ItemStack item = XMaterial.HOPPER.parseItem(); ItemMeta itemmeta = item.getItemMeta(); itemmeta.setDisplayName(TextUtils.formatText(Methods.formatName(level.getLevel()))); - String line = getLocale().getMessage("general.nametag.lore").getMessage(); + String line = getLocale().getMessage("general.nametag.lore").toText(); if (!line.isEmpty()) { itemmeta.setLore(Arrays.asList(line.split("\n"))); } diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java index ccb2349..8e3a250 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIAutoSellFilter.java @@ -72,7 +72,7 @@ public class GUIAutoSellFilter extends CustomizableGui { // Whitelist ItemStack indicatorItem = XMaterial.WHITE_STAINED_GLASS_PANE.parseItem(); ItemMeta indicatorMeta = indicatorItem.getItemMeta(); - indicatorMeta.setDisplayName(plugin.getLocale().getMessage("interface.autosell-filter.whitelist").getMessage()); + indicatorMeta.setDisplayName(plugin.getLocale().getMessage("interface.autosell-filter.whitelist").toText()); indicatorItem.setItemMeta(indicatorMeta); int[] whiteSlots = {0, 1, 2, 45, 46, 47}; @@ -92,7 +92,7 @@ public class GUIAutoSellFilter extends CustomizableGui { // Blacklist indicatorItem = XMaterial.BLACK_STAINED_GLASS_PANE.parseItem(); indicatorMeta = indicatorItem.getItemMeta(); - indicatorMeta.setDisplayName(plugin.getLocale().getMessage("interface.autosell-filter.blacklist").getMessage()); + indicatorMeta.setDisplayName(plugin.getLocale().getMessage("interface.autosell-filter.blacklist").toText()); indicatorItem.setItemMeta(indicatorMeta); int[] blackSlots = {3, 4, 5, 48, 49, 50}; @@ -113,12 +113,12 @@ public class GUIAutoSellFilter extends CustomizableGui { indicatorItem = XMaterial.PAPER.parseItem(); indicatorMeta = indicatorItem.getItemMeta(); - indicatorMeta.setDisplayName(plugin.getLocale().getMessage("interface.autosell-filter.infotitle").getMessage()); + indicatorMeta.setDisplayName(plugin.getLocale().getMessage("interface.autosell-filter.infotitle").toText()); ArrayList loreInfo = new ArrayList<>(); String[] parts = plugin .getLocale() .getMessage("interface.autosell-filter.infolore") - .getMessage() + .toText() .split("\\|"); for (String line : parts) { diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java index eca3761..5ed13ca 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIFilter.java @@ -64,7 +64,7 @@ public class GUIFilter extends CustomizableGui { ItemStack it = XMaterial.WHITE_STAINED_GLASS_PANE.parseItem(); ItemMeta itm = it.getItemMeta(); - itm.setDisplayName(plugin.getLocale().getMessage("interface.filter.whitelist").getMessage()); + itm.setDisplayName(plugin.getLocale().getMessage("interface.filter.whitelist").toText()); it.setItemMeta(itm); setButton("back", 8, GuiUtils.createButtonItem(XMaterial.ARROW.parseItem(), @@ -93,7 +93,7 @@ public class GUIFilter extends CustomizableGui { it = XMaterial.BLACK_STAINED_GLASS_PANE.parseItem(); itm = it.getItemMeta(); - itm.setDisplayName(plugin.getLocale().getMessage("interface.filter.blacklist").getMessage()); + itm.setDisplayName(plugin.getLocale().getMessage("interface.filter.blacklist").toText()); it.setItemMeta(itm); int[] blackSlots = {2, 3, 47, 48}; @@ -114,7 +114,7 @@ public class GUIFilter extends CustomizableGui { it = XMaterial.BARRIER.parseItem(); itm = it.getItemMeta(); - itm.setDisplayName(plugin.getLocale().getMessage("interface.filter.void").getMessage()); + itm.setDisplayName(plugin.getLocale().getMessage("interface.filter.void").toText()); it.setItemMeta(itm); int[] avoid = {4, 5, 49, 50}; @@ -134,9 +134,9 @@ public class GUIFilter extends CustomizableGui { ItemStack itemInfo = XMaterial.PAPER.parseItem(); ItemMeta itemMetaInfo = itemInfo.getItemMeta(); - itemMetaInfo.setDisplayName(plugin.getLocale().getMessage("interface.filter.infotitle").getMessage()); + itemMetaInfo.setDisplayName(plugin.getLocale().getMessage("interface.filter.infotitle").toText()); ArrayList loreInfo = new ArrayList<>(); - String[] parts = plugin.getLocale().getMessage("interface.filter.infolore").getMessage().split("\\|"); + String[] parts = plugin.getLocale().getMessage("interface.filter.infolore").toText().split("\\|"); for (String line : parts) { loreInfo.add(TextUtils.formatText(line)); } @@ -148,11 +148,11 @@ public class GUIFilter extends CustomizableGui { ItemStack hook = XMaterial.TRIPWIRE_HOOK.parseItem(); ItemMeta hookMeta = hook.getItemMeta(); - hookMeta.setDisplayName(plugin.getLocale().getMessage("interface.hopper.rejectsync").getMessage()); + hookMeta.setDisplayName(plugin.getLocale().getMessage("interface.hopper.rejectsync").toText()); ArrayList loreHook = new ArrayList<>(); parts = plugin.getLocale().getMessage("interface.hopper.synclore") .processPlaceholder("amount", filter.getEndPoint() != null ? 1 : 0) - .getMessage().split("\\|"); + .toText().split("\\|"); for (String line : parts) { loreHook.add(TextUtils.formatText(line)); } diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java index d2674fd..24c444f 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUIOverview.java @@ -79,7 +79,7 @@ public class GUIOverview extends CustomizableGui { ItemStack pearl = new ItemStack(Material.ENDER_PEARL, 1); ItemMeta pearlMeta = pearl.getItemMeta(); - pearlMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.perltitle").getMessage()); + pearlMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.perltitle").toText()); ArrayList lorePearl = new ArrayList<>(); String[] parts = this.plugin.getLocale().getMessage("interface.hopper.perllore2") .processPlaceholder( @@ -88,7 +88,7 @@ public class GUIOverview extends CustomizableGui { ? this.plugin.getLocale().getMessage("general.word.disabled").getMessage() : this.hopper.getTeleportTrigger().name() ) - .getMessage() + .toText() .split("\\|"); for (String line : parts) { lorePearl.add(TextUtils.formatText(line)); @@ -98,9 +98,9 @@ public class GUIOverview extends CustomizableGui { ItemStack filter = new ItemStack(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13) ? Material.COMPARATOR : Material.valueOf("REDSTONE_COMPARATOR"), 1); ItemMeta filterMeta = filter.getItemMeta(); - filterMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.filtertitle").getMessage()); + filterMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.filtertitle").toText()); ArrayList loreFilter = new ArrayList<>(); - parts = this.plugin.getLocale().getMessage("interface.hopper.filterlore").getMessage().split("\\|"); + parts = this.plugin.getLocale().getMessage("interface.hopper.filterlore").toText().split("\\|"); for (String line : parts) { loreFilter.add(TextUtils.formatText(line)); } @@ -110,14 +110,14 @@ public class GUIOverview extends CustomizableGui { ItemStack item = new ItemStack(Material.HOPPER, 1); ItemMeta itemmeta = item.getItemMeta(); - itemmeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.currentlevel").processPlaceholder("level", level.getLevel()).getMessage()); + itemmeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.currentlevel").processPlaceholder("level", level.getLevel()).toText()); List lore = level.getDescription(); if (this.plugin.getConfig().getBoolean("Main.Allow hopper Upgrading")) { lore.add(""); if (nextLevel == null) { - lore.add(this.plugin.getLocale().getMessage("interface.hopper.alreadymaxed").getMessage()); + lore.add(this.plugin.getLocale().getMessage("interface.hopper.alreadymaxed").toText()); } else { - lore.add(this.plugin.getLocale().getMessage("interface.hopper.nextlevel").processPlaceholder("level", nextLevel.getLevel()).getMessage()); + lore.add(this.plugin.getLocale().getMessage("interface.hopper.nextlevel").processPlaceholder("level", nextLevel.getLevel()).toText()); lore.addAll(nextLevel.getDescription()); } } @@ -127,7 +127,7 @@ public class GUIOverview extends CustomizableGui { parts = this.plugin.getLocale().getMessage("interface.hopper.boostedstats") .processPlaceholder("amount", Integer.toString(boostData.getMultiplier())) .processPlaceholder("time", TimeUtils.makeReadable(boostData.getEndTime() - System.currentTimeMillis())) - .getMessage().split("\\|"); + .toText().split("\\|"); lore.add(""); for (String line : parts) { lore.add(TextUtils.formatText(line)); @@ -139,11 +139,11 @@ public class GUIOverview extends CustomizableGui { ItemStack hook = new ItemStack(Material.TRIPWIRE_HOOK, 1); ItemMeta hookMeta = hook.getItemMeta(); - hookMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.synchopper").getMessage()); + hookMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.synchopper").toText()); ArrayList loreHook = new ArrayList<>(); parts = this.plugin.getLocale().getMessage("interface.hopper.synclore") .processPlaceholder("amount", this.hopper.getLinkedBlocks().stream().distinct().count()) - .getMessage().split("\\|"); + .toText().split("\\|"); for (String line : parts) { loreHook.add(TextUtils.formatText(line)); } diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java index 669a352..0af07b0 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/gui/GUISmeltable.java @@ -117,7 +117,7 @@ public class GUISmeltable extends CustomizableGui { meta.setLore(Arrays.asList(TextUtils.formatText(" &7-> &e" + CompatibleMaterial.getFurnaceResult(material).getType().name()), TextUtils.formatText("&7Enabled: &6" + String.valueOf(enabled).toLowerCase() + "&7."), "", - this.plugin.getLocale().getMessage("interface.hopper.toggle").getMessage())); + this.plugin.getLocale().getMessage("interface.hopper.toggle").toText())); item.setItemMeta(meta); return item; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java index 9501520..bee4385 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java @@ -192,10 +192,10 @@ public class ModuleAutoCrafting extends Module { ItemStack crafting = XMaterial.CRAFTING_TABLE.parseItem(); ItemMeta craftingMeta = crafting.getItemMeta(); craftingMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.craftingtitle") - .getMessage()); + .toText()); ArrayList lorecrafting = new ArrayList<>(); String[] parts = this.plugin.getLocale().getMessage("interface.hopper.craftinglore") - .getMessage().split("\\|"); + .toText().split("\\|"); for (String line : parts) { lorecrafting.add(TextUtils.formatText(line)); } @@ -223,8 +223,8 @@ public class ModuleAutoCrafting extends Module { public String getDescription() { return this.plugin.getLocale() .getMessage("interface.hopper.crafting") - .processPlaceholder("enabled", this.plugin.getLocale().getMessage("general.word.enabled").getMessage()) - .getMessage(); + .processPlaceholder("enabled", this.plugin.getLocale().getMessage("general.word.enabled").toText()) + .toText(); } @Override diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java index 75778b6..0fc381b 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSell.java @@ -147,13 +147,13 @@ public class ModuleAutoSell extends Module { ItemStack sellItem = XMaterial.SUNFLOWER.parseItem(); ItemMeta sellMeta = sellItem.getItemMeta(); - sellMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.selltitle").getMessage()); + sellMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.selltitle").toText()); ArrayList loreSell = new ArrayList<>(); String[] parts = this.plugin.getLocale().getMessage("interface.hopper.selllore") .processPlaceholder("timeleft", getTime(hopper) == -9999 ? "∞" : (int) Math.floor(getTime(hopper) / 20)) .processPlaceholder("state", isNotifying(hopper)) - .getMessage() + .toText() .split("\\|"); for (String line : parts) { @@ -192,7 +192,7 @@ public class ModuleAutoSell extends Module { return this.plugin.getLocale() .getMessage("interface.hopper.autosell") .processPlaceholder("seconds", (int) Math.floor(this.timeOut / 20)) - .getMessage(); + .toText(); } @Override diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java index 53c0285..9414603 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleAutoSmelter.java @@ -92,7 +92,7 @@ public class ModuleAutoSmelter extends Module { public ItemStack getGUIButton(Hopper hopper) { ItemStack block = XMaterial.IRON_INGOT.parseItem(); ItemMeta blockMeta = block.getItemMeta(); - blockMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.smelttitle").getMessage()); + blockMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.smelttitle").toText()); ArrayList loreBlock = new ArrayList<>(); String[] parts = this.plugin.getLocale().getMessage("interface.hopper.smeltlore") .processPlaceholder("timeleft", getTime(hopper) == -9999 ? "∞" : (int) Math.floor(getTime(hopper) / 20.0)) @@ -100,7 +100,7 @@ public class ModuleAutoSmelter extends Module { this.plugin.getLocale().getMessage("general.word.enabled").getMessage() : this.plugin.getLocale().getMessage("general.word.disabled").getMessage() ) - .getMessage() + .toText() .split("\\|"); for (String line : parts) { loreBlock.add(TextUtils.formatText(line)); @@ -138,7 +138,7 @@ public class ModuleAutoSmelter extends Module { @Override public String getDescription() { return this.plugin.getLocale().getMessage("interface.hopper.autosmelt") - .processPlaceholder("ticks", (int) Math.floor(this.timeOut / 20.0)).getMessage(); + .processPlaceholder("ticks", (int) Math.floor(this.timeOut / 20.0)).toText(); } private int getTime(Hopper hopper) { diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleBlockBreak.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleBlockBreak.java index 04c9d7d..39d6bff 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleBlockBreak.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleBlockBreak.java @@ -1,6 +1,7 @@ package com.craftaro.epichoppers.hopper.levels.modules; import com.craftaro.core.SongodaPlugin; +import com.craftaro.core.chat.AdventureUtils; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.utils.TextUtils; @@ -127,22 +128,20 @@ public class ModuleBlockBreak extends Module { @Override public ItemStack getGUIButton(Hopper hopper) { ItemStack block = new ItemStack(Material.IRON_ORE, 1); - ItemMeta blockMeta = block.getItemMeta(); - blockMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.blocktitle").getMessage()); + AdventureUtils.formatItemName(block, this.plugin.getLocale().getMessage("interface.hopper.blocktitle").getMessage()); ArrayList loreBlock = new ArrayList<>(); String[] parts = this.plugin.getLocale() .getMessage("interface.hopper.blocklore") .processPlaceholder("enabled", isEnabled(hopper) - ? this.plugin.getLocale().getMessage("general.word.enabled").getMessage() - : this.plugin.getLocale().getMessage("general.word.disabled").getMessage() + ? this.plugin.getLocale().getMessage("general.word.enabled").toText() + : this.plugin.getLocale().getMessage("general.word.disabled").toText() ) - .getMessage() + .toText() .split("\\|"); for (String line : parts) { loreBlock.add(TextUtils.formatText(line)); } - blockMeta.setLore(loreBlock); - block.setItemMeta(blockMeta); + AdventureUtils.formatItemLore(block, loreBlock); return block; } @@ -159,7 +158,7 @@ public class ModuleBlockBreak extends Module { @Override public String getDescription() { return this.plugin.getLocale().getMessage("interface.hopper.blockbreak") - .processPlaceholder("ticks", this.ticksPerBreak).getMessage(); + .processPlaceholder("ticks", this.ticksPerBreak).toText(); } @Override diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleMobHopper.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleMobHopper.java index 10dca8e..0c8bd5a 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleMobHopper.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleMobHopper.java @@ -1,6 +1,7 @@ package com.craftaro.epichoppers.hopper.levels.modules; import com.craftaro.core.SongodaPlugin; +import com.craftaro.core.chat.AdventureUtils; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.utils.TextUtils; import com.craftaro.epichoppers.hopper.Hopper; @@ -67,17 +68,15 @@ public class ModuleMobHopper extends Module { @Override public ItemStack getGUIButton(Hopper hopper) { ItemStack block = new ItemStack(Material.ROTTEN_FLESH, 1); - ItemMeta blockMeta = block.getItemMeta(); - blockMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.hopper.mobtitle").getMessage()); + AdventureUtils.formatItemName(block, this.plugin.getLocale().getMessage("interface.hopper.mobtitle").getMessage()); ArrayList loreBlock = new ArrayList<>(); String[] parts = this.plugin.getLocale().getMessage("interface.hopper.moblore").processPlaceholder("enabled", - isEnabled(hopper) ? this.plugin.getLocale().getMessage("general.word.enabled").getMessage() - : this.plugin.getLocale().getMessage("general.word.disabled").getMessage()).getMessage().split("\\|"); + isEnabled(hopper) ? this.plugin.getLocale().getMessage("general.word.enabled").toText() + : this.plugin.getLocale().getMessage("general.word.disabled").getMessage()).toText().split("\\|"); for (String line : parts) { loreBlock.add(TextUtils.formatText(line)); } - blockMeta.setLore(loreBlock); - block.setItemMeta(blockMeta); + AdventureUtils.formatItemLore(block, loreBlock); return block; } @@ -96,7 +95,7 @@ public class ModuleMobHopper extends Module { return this.plugin.getLocale() .getMessage("interface.hopper.mobhopper") .processPlaceholder("ticks", this.amount) - .getMessage(); + .toText(); } public boolean isEnabled(Hopper hopper) { diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java index 8cc4af3..d6caf51 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/modules/ModuleSuction.java @@ -191,11 +191,11 @@ public class ModuleSuction extends Module { Locale locale = this.plugin.getLocale(); ItemStack item = XMaterial.CAULDRON.parseItem(); ItemMeta meta = item.getItemMeta(); - meta.setDisplayName(locale.getMessage("interface.hopper.suctiontitle").getMessage()); + meta.setDisplayName(locale.getMessage("interface.hopper.suctiontitle").toText()); List lore = new ArrayList<>(); String[] parts = locale.getMessage("interface.hopper.suctionlore") - .processPlaceholder("status", isEnabled(hopper) ? locale.getMessage("general.word.enabled").getMessage() : locale.getMessage("general.word.disabled").getMessage()) - .processPlaceholder("radius", getRadius(hopper)).getMessage().split("\\|"); + .processPlaceholder("status", isEnabled(hopper) ? locale.getMessage("general.word.enabled").toText() : locale.getMessage("general.word.disabled").toText()) + .processPlaceholder("radius", getRadius(hopper)).toText().split("\\|"); for (String line : parts) { lore.add(TextUtils.formatText(line)); } @@ -247,6 +247,6 @@ public class ModuleSuction extends Module { return this.plugin.getLocale() .getMessage("interface.hopper.suction") .processPlaceholder("suction", this.maxSearchRadius) - .getMessage(); + .toText(); } } diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/BlockListeners.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/BlockListeners.java index 2b56f54..1671a36 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/BlockListeners.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/BlockListeners.java @@ -52,7 +52,7 @@ public class BlockListeners implements Listener { int max = maxHoppers(player); if (max != -1 && amt > max) { - player.sendMessage(this.plugin.getLocale().getMessage("event.hopper.toomany").processPlaceholder("amount", max).getMessage()); + player.sendMessage(this.plugin.getLocale().getMessage("event.hopper.toomany").processPlaceholder("amount", max).toText()); e.setCancelled(true); return; } @@ -64,7 +64,7 @@ public class BlockListeners implements Listener { } if (!this.plugin.getHopperManager().isReady()) { - player.sendMessage(this.plugin.getLocale().getMessage("event.hopper.notready").getMessage()); + player.sendMessage(this.plugin.getLocale().getMessage("event.hopper.notready").toText()); e.setCancelled(true); return; } @@ -121,7 +121,7 @@ public class BlockListeners implements Listener { } if (!this.plugin.getHopperManager().isReady()) { - player.sendMessage(this.plugin.getLocale().getMessage("event.hopper.notready").getMessage()); + player.sendMessage(this.plugin.getLocale().getMessage("event.hopper.notready").toText()); event.setCancelled(true); return; } diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/InteractListeners.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/InteractListeners.java index dfc8747..260b429 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/InteractListeners.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/InteractListeners.java @@ -1,5 +1,6 @@ package com.craftaro.epichoppers.listeners; +import com.craftaro.core.chat.AdventureUtils; import com.craftaro.core.hooks.ProtectionManager; import com.craftaro.core.hooks.WorldGuardHook; import com.craftaro.epichoppers.hopper.Hopper; @@ -63,7 +64,7 @@ public class InteractListeners implements Listener { } if (Settings.USE_PROTECTION_PLUGINS.getBoolean() && ProtectionManager.canInteract(player, event.getClickedBlock().getLocation()) && WorldGuardHook.isInteractAllowed(event.getClickedBlock().getLocation())) { - player.sendMessage(this.plugin.getLocale().getMessage("event.general.protected").getPrefixedMessage()); + AdventureUtils.sendMessage(this.plugin, this.plugin.getLocale().getMessage("event.general.protected").getPrefixedMessage()); return; } @@ -81,7 +82,7 @@ public class InteractListeners implements Listener { if (playerData.getSyncType() == null) { if (event.getClickedBlock().getType() == Material.HOPPER) { if (!this.plugin.getHopperManager().isReady()) { - player.sendMessage(this.plugin.getLocale().getMessage("event.hopper.notready").getMessage()); + AdventureUtils.sendMessage(this.plugin, this.plugin.getLocale().getMessage("event.hopper.notready").getPrefixedMessage()); event.setCancelled(true); return; }