diff --git a/pom.xml b/pom.xml index 6595600..ae7a756 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ com.craftaro CraftaroCore - 3.1.0-SNAPSHOT + 3.3.0-SNAPSHOT compile diff --git a/src/main/java/com/craftaro/epicfarming/EpicFarming.java b/src/main/java/com/craftaro/epicfarming/EpicFarming.java index 3d4c2f7..a9a31c7 100644 --- a/src/main/java/com/craftaro/epicfarming/EpicFarming.java +++ b/src/main/java/com/craftaro/epicfarming/EpicFarming.java @@ -354,7 +354,7 @@ public class EpicFarming extends SongodaPlugin { ItemStack item = Settings.FARM_BLOCK_MATERIAL.getMaterial().parseItem(); ItemMeta meta = item.getItemMeta(); meta.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.equals("")) { meta.setLore(Collections.singletonList(line)); } diff --git a/src/main/java/com/craftaro/epicfarming/farming/Farm.java b/src/main/java/com/craftaro/epicfarming/farming/Farm.java index 8a47e5b..3899951 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/Farm.java +++ b/src/main/java/com/craftaro/epicfarming/farming/Farm.java @@ -100,7 +100,7 @@ public class Farm implements Data { } if (Settings.USE_PROTECTION_PLUGINS.getBoolean() && !ProtectionManager.canInteract(player, this.location)) { - player.sendMessage(EpicFarming.getInstance().getLocale().getMessage("event.general.protected").getPrefixedMessage()); + EpicFarming.getInstance().getLocale().getMessage("event.general.protected").sendPrefixedMessage(player); return; } diff --git a/src/main/java/com/craftaro/epicfarming/farming/FarmType.java b/src/main/java/com/craftaro/epicfarming/farming/FarmType.java index bcd345a..47e069f 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/FarmType.java +++ b/src/main/java/com/craftaro/epicfarming/farming/FarmType.java @@ -9,7 +9,7 @@ public enum FarmType { return EpicFarming.getPlugin(EpicFarming.class) .getLocale() .getMessage("general.interface." + name().toLowerCase()) - .getMessage(); + .toText(); } } diff --git a/src/main/java/com/craftaro/epicfarming/farming/levels/Level.java b/src/main/java/com/craftaro/epicfarming/farming/levels/Level.java index 2f719f4..4a989e3 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/levels/Level.java +++ b/src/main/java/com/craftaro/epicfarming/farming/levels/Level.java @@ -36,22 +36,22 @@ public class Level { EpicFarming instance = EpicFarming.getPlugin(EpicFarming.class); this.description.add(instance.getLocale().getMessage("interface.button.radius") - .processPlaceholder("radius", this.radius).getMessage()); + .processPlaceholder("radius", this.radius).toText()); this.description.add(instance.getLocale().getMessage("interface.button.speed") - .processPlaceholder("speed", this.speedMultiplier).getMessage()); + .processPlaceholder("speed", this.speedMultiplier).toText()); if (this.autoReplant) { this.description.add(instance.getLocale().getMessage("interface.button.autoreplant") .processPlaceholder("status", instance.getLocale().getMessage("general.interface.unlocked") - .getMessage()).getMessage()); + .toText()).toText()); } if (this.pages > 1) { this.description.add(instance.getLocale().getMessage("interface.button.pages") - .processPlaceholder("amount", this.pages).getMessage()); + .processPlaceholder("amount", this.pages).toText()); } for (Module module : this.registeredModules) { diff --git a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java index b250b69..c39c62b 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java +++ b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoBreeding.java @@ -143,7 +143,7 @@ public class ModuleAutoBreeding extends Module { return this.plugin.getLocale() .getMessage("interface.button.autobreeding") .processPlaceholder("status", this.autoBreedCap) - .getMessage(); + .toText(); } private void handleStackedBreed(LivingEntity entity) { diff --git a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java index 1668067..69d88dc 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java +++ b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoButcher.java @@ -92,7 +92,7 @@ public class ModuleAutoButcher extends Module { @Override public String getDescription() { return this.plugin.getLocale().getMessage("interface.button.autobutcher") - .processPlaceholder("status", this.autoButcherDelay).getMessage(); + .processPlaceholder("status", this.autoButcherDelay).toText(); } private boolean isEnabled(Farm farm) { diff --git a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java index e47fe37..46f7c5f 100644 --- a/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java +++ b/src/main/java/com/craftaro/epicfarming/farming/levels/modules/ModuleAutoCollect.java @@ -175,8 +175,8 @@ public class ModuleAutoCollect extends Module { return this.plugin.getLocale() .getMessage("interface.button.autocollect") .processPlaceholder("status", - this.plugin.getLocale().getMessage("general.interface.unlocked").getMessage()) - .getMessage(); + this.plugin.getLocale().getMessage("general.interface.unlocked").toText()) + .toText(); } public boolean isEnabled(Farm farm) { @@ -283,7 +283,7 @@ public class ModuleAutoCollect extends Module { return EpicFarming.getPlugin(EpicFarming.class) .getLocale() .getMessage("general.interface." + name().replace("_", "").toLowerCase()) - .getMessage(); + .toText(); } } } diff --git a/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java b/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java index f17cb8f..db2de80 100644 --- a/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java +++ b/src/main/java/com/craftaro/epicfarming/gui/OverviewGui.java @@ -1,5 +1,6 @@ package com.craftaro.epicfarming.gui; +import com.craftaro.core.chat.AdventureUtils; import com.craftaro.core.gui.CustomizableGui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; @@ -98,10 +99,10 @@ public class OverviewGui extends CustomizableGui { List farmLore = this.level.getDescription(); farmLore.add(""); if (nextLevel == null) { - farmLore.add(this.plugin.getLocale().getMessage("event.upgrade.maxed").getMessage()); + farmLore.add(this.plugin.getLocale().getMessage("event.upgrade.maxed").toText()); } else { farmLore.add(this.plugin.getLocale().getMessage("interface.button.level") - .processPlaceholder("level", nextLevel.getLevel()).getMessage()); + .processPlaceholder("level", nextLevel.getLevel()).toText()); farmLore.addAll(nextLevel.getDescription()); } @@ -110,16 +111,16 @@ public class OverviewGui extends CustomizableGui { String[] parts = this.plugin.getLocale().getMessage("interface.button.boostedstats") .processPlaceholder("amount", Integer.toString(boostData.getMultiplier())) .processPlaceholder("time", TimeUtils.makeReadable(boostData.getEndTime() - System.currentTimeMillis())) - .getMessage().split("\\|"); + .toText().split("\\|"); farmLore.add(""); for (String line : parts) { - farmLore.add(TextUtils.formatText(line)); + farmLore.add(AdventureUtils.formatLegacy(line)); } } setItem("farm", 13, GuiUtils.createButtonItem(Settings.FARM_BLOCK_MATERIAL.getMaterial(XMaterial.END_ROD), this.plugin.getLocale().getMessage("general.nametag.farm") - .processPlaceholder("level", this.level.getLevel()).getMessage(), + .processPlaceholder("level", this.level.getLevel()).toText(), farmLore)); if (this.player != null && Settings.UPGRADE_WITH_XP.getBoolean() && this.player.hasPermission("EpicFarming.Upgrade.XP")) { @@ -162,9 +163,9 @@ public class OverviewGui extends CustomizableGui { ItemMeta farmTypeMeta = farmType.getItemMeta(); farmTypeMeta.setDisplayName(this.plugin.getLocale().getMessage("interface.button.farmtype") .processPlaceholder("type", this.farm.getFarmType().translate()) - .getMessage()); + .toText()); farmTypeMeta.setLore(Collections.singletonList(this.plugin.getLocale().getMessage("interface.button.farmtypelore") - .getMessage())); + .toText())); farmType.setItemMeta(farmTypeMeta); Map layouts = new HashMap<>(); diff --git a/src/main/java/com/craftaro/epicfarming/utils/Methods.java b/src/main/java/com/craftaro/epicfarming/utils/Methods.java index f2687d1..c2a92af 100644 --- a/src/main/java/com/craftaro/epicfarming/utils/Methods.java +++ b/src/main/java/com/craftaro/epicfarming/utils/Methods.java @@ -26,7 +26,7 @@ public class Methods { .getLocale() .getMessage("general.nametag.farm") .processPlaceholder("level", level) - .getMessage(); + .toText(); } public static void animate(Location location, XMaterial material) {