From 833aeaaa8efe5a185d364d460e97606edfc0030e Mon Sep 17 00:00:00 2001 From: ceze88 Date: Fri, 5 Apr 2024 15:32:53 +0200 Subject: [PATCH 01/19] Fix teleport trigger not loaded from the database --- .../main/java/com/craftaro/epichoppers/hopper/HopperImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java index 22459c0..65574d9 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/HopperImpl.java @@ -93,6 +93,7 @@ public class HopperImpl implements Hopper { this.level = getLevelManager().getLevel((int) map.get("level")); this.placedBy = UUID.fromString((String) map.get("placed_by")); this.lastPlayerOpened = map.get("last_opened_by") != null ? UUID.fromString((String) map.get("last_opened_by")) : null; + this.teleportTrigger = TeleportTrigger.valueOf((String) map.get("teleport_trigger")); DataManager dataManager = EpicHoppers.getPlugin(EpicHoppers.class).getDataManager(); dataManager.getDatabaseConnector().connectDSL(dslContext -> { From 7b4caaa116f6fc63a1313f27ab3c0da0b313aa15 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Fri, 5 Apr 2024 15:33:36 +0200 Subject: [PATCH 02/19] Release v5.0.4 --- EpicHoppers-API/pom.xml | 2 +- EpicHoppers-Plugin/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index 959e033..11ded5d 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.0.3 + 5.0.4 ../pom.xml EpicHoppers-API diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index 641d180..28d1387 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.0.3 + 5.0.4 ../pom.xml EpicHoppers-Plugin diff --git a/pom.xml b/pom.xml index 81d4d68..504969f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent pom - 5.0.3 + 5.0.4 From 5acff4a3ca954103581c36f5c77065e5e70ed3b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:29:57 +0200 Subject: [PATCH 03/19] Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#18) Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.3.0 to 3.3.1. - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.3.0...maven-source-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- EpicHoppers-API/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index 11ded5d..da35143 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -38,7 +38,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 From a9678eea0aca92ef7085dac5309b1e33e8a88ec6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:30:06 +0200 Subject: [PATCH 04/19] Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.2 to 3.5.3 (#17) Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.2...maven-shade-plugin-3.5.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- EpicHoppers-Plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index 28d1387..4123cbc 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -17,7 +17,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 From b6c575c002047512d6f11bdbf86fcc9d0ce94c69 Mon Sep 17 00:00:00 2001 From: singh Date: Sat, 8 Jun 2024 00:28:51 +0530 Subject: [PATCH 05/19] [Added] 1.20.6 Support [Updated] Some NMS changes. [Fixed] LaggSpike on 1.20.6 on start due to a deprecated method. --- EpicHoppers-API/pom.xml | 2 +- EpicHoppers-Plugin/pom.xml | 22 ++++++++++++++----- .../hopper/levels/LevelManagerImpl.java | 4 ++-- .../hopper/levels/modules/ModuleSuction.java | 1 - .../listeners/HopperListeners.java | 6 ++--- .../craftaro/epichoppers/tasks/HopTask.java | 19 +++++++++++----- .../epichoppers/utils/HopperDirection.java | 2 +- pom.xml | 2 +- 8 files changed, 38 insertions(+), 20 deletions(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index 959e033..bcd0713 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -63,7 +63,7 @@ org.spigotmc spigot-api - 1.18-R0.1-SNAPSHOT + 1.20.6-R0.1-SNAPSHOT provided diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index 641d180..3ec0f3b 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -56,10 +56,10 @@ false **/nms/v*/** + **/third_party/net/kyori/** **/third_party/org/apache/** - **/third_party/net/kyori/** **/third_party/com/zaxxer/** **/third_party/org/jooq/** **/third_party/org/mariadb/** @@ -95,6 +95,16 @@ https://repo.songoda.com/repository/public/ + + bg-repo + https://repo.bg-software.com/repository/api/ + + + + songoda-public + https://repo.songoda.com/repository/minecraft-plugins/ + + jitpack.io https://jitpack.io/ @@ -119,21 +129,21 @@ org.spigotmc spigot-api - 1.19.4-R0.1-SNAPSHOT + 1.20.4-R0.1-SNAPSHOT provided com.craftaro FabledSkyBlock - 3.0.4 + 3.0.8-SNAPSHOT provided com.craftaro EpicFarming - 4.1.1 + 4.2.1-SNAPSHOT provided @@ -160,8 +170,8 @@ com.bgsoftware - wildstacker - 3.5.1 + WildStackerAPI + 2024.1 provided diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java index 99ac8f3..e9d9e97 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java @@ -1,6 +1,6 @@ package com.craftaro.epichoppers.hopper.levels; -import com.craftaro.core.nms.NmsManager; +import com.craftaro.core.nms.Nms; import com.craftaro.core.nms.nbt.NBTCore; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.epichoppers.hopper.levels.modules.Module; @@ -45,7 +45,7 @@ public class LevelManagerImpl implements LevelManager { @Override public boolean isEpicHopper(ItemStack item) { - NBTCore nbt = NmsManager.getNbt(); + NBTCore nbt = Nms.getImplementations().getNbt(); if (nbt.of(item).has("level")) { return true; 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 5e7d801..8cc4af3 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 @@ -8,7 +8,6 @@ import com.craftaro.core.locale.Locale; import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; import com.craftaro.epichoppers.hopper.Hopper; -import com.craftaro.epichoppers.hopper.HopperImpl; import com.craftaro.epichoppers.settings.Settings; import com.craftaro.epichoppers.utils.Methods; import com.craftaro.epichoppers.utils.StorageContainerCache; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/HopperListeners.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/HopperListeners.java index 321cc9d..13b064b 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/HopperListeners.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/listeners/HopperListeners.java @@ -1,7 +1,7 @@ package com.craftaro.epichoppers.listeners; import com.craftaro.core.compatibility.ServerVersion; -import com.craftaro.core.nms.NmsManager; +import com.craftaro.core.nms.Nms; import com.craftaro.epichoppers.hopper.HopperImpl; import com.craftaro.epichoppers.settings.Settings; import com.craftaro.epichoppers.EpicHoppers; @@ -140,12 +140,12 @@ public class HopperListeners implements Listener { // we need to instead cancel and manually remove the item to move source.removeItem(moveInstead); if (sourceLocation != null) { - NmsManager.getWorld().updateAdjacentComparators(sourceLocation.getBlock()); + Nms.getImplementations().getWorld().updateAdjacentComparators(sourceLocation.getBlock()); } // now add it to the hopper destination.addItem(moveInstead); if (destinationLocation != null) { - NmsManager.getWorld().updateAdjacentComparators(destinationLocation.getBlock()); + Nms.getImplementations().getWorld().updateAdjacentComparators(destinationLocation.getBlock()); } } return; diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/tasks/HopTask.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/tasks/HopTask.java index 5edd321..7750547 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/tasks/HopTask.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/tasks/HopTask.java @@ -1,7 +1,7 @@ package com.craftaro.epichoppers.tasks; +import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.epichoppers.boost.BoostData; -import com.craftaro.epichoppers.boost.BoostDataImpl; import com.craftaro.epichoppers.containers.CustomContainer; import com.craftaro.epichoppers.hopper.HopperImpl; import com.craftaro.epichoppers.hopper.levels.modules.ModuleAutoCrafting; @@ -18,6 +18,7 @@ import org.bukkit.OfflinePlayer; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Hopper; +import org.bukkit.block.data.Directional; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Minecart; @@ -81,11 +82,19 @@ public class HopTask extends BukkitRunnable { int maxToMove = hopper.getLevel().getAmount() * (boostData == null ? 1 : boostData.getMultiplier()); // Get hopper state data. - Hopper hopperState = (Hopper) block.getState(); - HopperDirection hopperDirection = HopperDirection.getDirection(hopperState.getRawData()); - Location pointingLocation = hopperDirection.getLocation(location); + HopperDirection hopperDirection; + Location pointingLocation; + if (ServerVersion.isServerVersionBelow(ServerVersion.V1_20)){ + Hopper hopperState = (Hopper) block.getState(); + hopperDirection = HopperDirection.getDirection(hopperState.getRawData()); + pointingLocation = hopperDirection.getLocation(location); + } + else{ + hopperDirection = HopperDirection.valueOf(((Directional) block.getBlockData()).getFacing().name()); + BlockFace blockFace = hopperDirection.getDirectionFacing(); + pointingLocation = block.getLocation().getBlock().getRelative(blockFace).getLocation(); + } final StorageContainerCache.Cache hopperCache = StorageContainerCache.getCachedInventory(block); - // Create list to hold blocked materials. List blockedMaterials = new ArrayList<>(); diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/HopperDirection.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/HopperDirection.java index 62db58c..e334f73 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/HopperDirection.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/utils/HopperDirection.java @@ -39,7 +39,7 @@ public enum HopperDirection { return location.clone().add(getX(), getY(), getZ()); } - public BlockFace getDirection() { + public BlockFace getDirectionFacing() { switch (this) { case NORTH: return BlockFace.NORTH; diff --git a/pom.xml b/pom.xml index 81d4d68..93a7c54 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ https://craftaro.com/marketplace/product/15 - 3.0.0-SNAPSHOT + 3.0.7-SNAPSHOT 8 1.8 From 5b5e554af895704cdfe9af2bc5437cd03143b25a Mon Sep 17 00:00:00 2001 From: ceze88 Date: Tue, 11 Jun 2024 14:59:21 +0200 Subject: [PATCH 06/19] Release v5.0.5 --- EpicHoppers-API/pom.xml | 2 +- EpicHoppers-Plugin/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index f6b8a3d..d353e7d 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.0.4 + 5.0.5 ../pom.xml EpicHoppers-API diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index 20f6cc1..ea8c1d5 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.0.4 + 5.0.5 ../pom.xml EpicHoppers-Plugin diff --git a/pom.xml b/pom.xml index 17aa87c..a77b15a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent pom - 5.0.4 + 5.0.5 From 0094106b43a26b3923e7f9a0cecfce656b2bdf42 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 22 Jun 2024 15:27:46 +0200 Subject: [PATCH 07/19] fix: replace deprecated usage of Core's NBTItem class with item-nbt-api --- .../epichoppers/hopper/levels/LevelManagerImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java index e9d9e97..208cca7 100644 --- a/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java +++ b/EpicHoppers-Plugin/src/main/java/com/craftaro/epichoppers/hopper/levels/LevelManagerImpl.java @@ -1,7 +1,6 @@ package com.craftaro.epichoppers.hopper.levels; -import com.craftaro.core.nms.Nms; -import com.craftaro.core.nms.nbt.NBTCore; +import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBT; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.epichoppers.hopper.levels.modules.Module; import org.bukkit.ChatColor; @@ -45,9 +44,7 @@ public class LevelManagerImpl implements LevelManager { @Override public boolean isEpicHopper(ItemStack item) { - NBTCore nbt = Nms.getImplementations().getNbt(); - - if (nbt.of(item).has("level")) { + if (NBT.readNbt(item).hasTag("level")) { return true; } From d9e5b4fd8a1ce365217131867b7d2d67af9ceda2 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 22 Jun 2024 15:27:10 +0200 Subject: [PATCH 08/19] chore(deps): update SongodaCore to v3.1.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a77b15a..fe7820a 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ https://craftaro.com/marketplace/product/15 - 3.0.7-SNAPSHOT + 3.1.0-SNAPSHOT 8 1.8 From 4e00c88e39093b2bc54350b6d667c0d97f50cbbc Mon Sep 17 00:00:00 2001 From: ceze88 Date: Thu, 25 Jul 2024 14:45:14 +0200 Subject: [PATCH 09/19] 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; } From 4ed8b457f9b38b3f5e942d0229001e4b67cd9c9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:57:31 +0200 Subject: [PATCH 10/19] Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0 (#20) Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.3...maven-shade-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- EpicHoppers-Plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index ea8c1d5..04f37ac 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -17,7 +17,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.3 + 3.6.0 From 856dc0c74ad807af23f896cfd074c98173b2e7a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 17:03:56 +0200 Subject: [PATCH 11/19] Bump dev.rosewood:rosestacker from 1.5.17 to 1.5.23 (#25) Bumps dev.rosewood:rosestacker from 1.5.17 to 1.5.23. --- updated-dependencies: - dependency-name: dev.rosewood:rosestacker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- EpicHoppers-Plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index 04f37ac..e79de0a 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -178,7 +178,7 @@ dev.rosewood rosestacker - 1.5.17 + 1.5.23 provided From f77c826b7417e2c13a8ce1ee160b8148dd34f5ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 17:04:35 +0200 Subject: [PATCH 12/19] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.8.0 (#24) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.3 to 3.8.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.3...maven-javadoc-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- EpicHoppers-API/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index d353e7d..535b293 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -18,7 +18,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.8.0 From 18b6dfc840ad69bc03ea17cfbf496a9e48f8b0d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 17:07:14 +0200 Subject: [PATCH 13/19] Bump com.github.Gypopo:EconomyShopGUI-API from 1.7.0 to 1.7.1 (#16) Bumps [com.github.Gypopo:EconomyShopGUI-API](https://github.com/Gypopo/EconomyShopGUI-API) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/Gypopo/EconomyShopGUI-API/releases) - [Commits](https://github.com/Gypopo/EconomyShopGUI-API/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: com.github.Gypopo:EconomyShopGUI-API dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- EpicHoppers-Plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index e79de0a..dd97c12 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -157,7 +157,7 @@ com.github.Gypopo EconomyShopGUI-API - 1.7.0 + 1.7.1 provided From 53399301bf26933dad6ef1601e6b8b12cf033213 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Wed, 21 Aug 2024 17:09:10 +0200 Subject: [PATCH 14/19] Update to core version 3.3.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe7820a..b07e2b3 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ https://craftaro.com/marketplace/product/15 - 3.1.0-SNAPSHOT + 3.3.0-SNAPSHOT 8 1.8 From 65873bb9d73abeb636c155165c19c2eb44b8e81d Mon Sep 17 00:00:00 2001 From: ceze88 Date: Wed, 21 Aug 2024 17:09:17 +0200 Subject: [PATCH 15/19] Release v5.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b07e2b3..294eef6 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent pom - 5.0.5 + 5.2.0 From 8bc22ce69305ec8deab835504d81b6c821bc2c9d Mon Sep 17 00:00:00 2001 From: ceze88 Date: Wed, 21 Aug 2024 17:10:36 +0200 Subject: [PATCH 16/19] Fix child module versions --- EpicHoppers-API/pom.xml | 2 +- EpicHoppers-Plugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index 535b293..b5ea026 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.0.5 + 5.2.0 ../pom.xml EpicHoppers-API diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index dd97c12..6ef8a9e 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.0.5 + 5.2.0 ../pom.xml EpicHoppers-Plugin From 440a71112017d05b56ef9329c5f4a1fbb887aa94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:29:22 +0200 Subject: [PATCH 17/19] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10.0 (#27) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.8.0...maven-javadoc-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- EpicHoppers-API/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index b5ea026..861a8f0 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -18,7 +18,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 From 95af1a8372c8509d9201b1a27bf1f0b207fed2eb Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 2 Oct 2024 15:32:40 +0200 Subject: [PATCH 18/19] chore: Update SongodaCore to v3.5.0-SNAPSHOT --- .../java/com/craftaro/epichoppers/hopper/levels/Level.java | 2 +- .../main/java/com/craftaro/epichoppers/gui/GUIOverview.java | 2 +- .../epichoppers/hopper/levels/modules/ModuleAutoSell.java | 4 ++-- .../hopper/levels/modules/ModuleAutoSmelter.java | 6 +++--- .../epichoppers/hopper/levels/modules/ModuleMobHopper.java | 2 +- pom.xml | 2 +- 6 files changed, 9 insertions(+), 9 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 a1bbbae..1087861 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 @@ -41,7 +41,7 @@ public class Level { if (this.filter) { this.description.add(getPlugin().getLocale().getMessage("interface.hopper.filter") .processPlaceholder("enabled", getPlugin().getLocale() - .getMessage("general.word.enabled").getMessage()).toText()); + .getMessage("general.word.enabled").toText()).toText()); } if (this.teleport) { this.description.add(getPlugin() 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 24c444f..2f69260 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 @@ -85,7 +85,7 @@ public class GUIOverview extends CustomizableGui { .processPlaceholder( "type", this.hopper.getTeleportTrigger() == TeleportTrigger.DISABLED - ? this.plugin.getLocale().getMessage("general.word.disabled").getMessage() + ? this.plugin.getLocale().getMessage("general.word.disabled").toText() : this.hopper.getTeleportTrigger().name() ) .toText() 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 0fc381b..876572f 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 @@ -151,8 +151,8 @@ public class ModuleAutoSell extends Module { 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)) + .processPlaceholder("timeleft", String.valueOf(getTime(hopper) == -9999 ? "∞" : (int) Math.floor(getTime(hopper) / 20))) + .processPlaceholder("state", String.valueOf(isNotifying(hopper))) .toText() .split("\\|"); 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 9414603..bcffdb1 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 @@ -95,10 +95,10 @@ public class ModuleAutoSmelter extends Module { 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)) + .processPlaceholder("timeleft", String.valueOf(getTime(hopper) == -9999 ? "∞" : (int) Math.floor(getTime(hopper) / 20.0))) .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() ) .toText() .split("\\|"); 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 0c8bd5a..6435bd7 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 @@ -72,7 +72,7 @@ public class ModuleMobHopper extends Module { ArrayList loreBlock = new ArrayList<>(); String[] parts = this.plugin.getLocale().getMessage("interface.hopper.moblore").processPlaceholder("enabled", isEnabled(hopper) ? this.plugin.getLocale().getMessage("general.word.enabled").toText() - : this.plugin.getLocale().getMessage("general.word.disabled").getMessage()).toText().split("\\|"); + : this.plugin.getLocale().getMessage("general.word.disabled").toText()).toText().split("\\|"); for (String line : parts) { loreBlock.add(TextUtils.formatText(line)); } diff --git a/pom.xml b/pom.xml index 294eef6..a435eab 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ https://craftaro.com/marketplace/product/15 - 3.3.0-SNAPSHOT + 3.5.0-SNAPSHOT 8 1.8 From 9f85af257c10d23c34499cb6430d86942a30a155 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 2 Oct 2024 15:32:47 +0200 Subject: [PATCH 19/19] Release v5.3.0 --- EpicHoppers-API/pom.xml | 2 +- EpicHoppers-Plugin/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EpicHoppers-API/pom.xml b/EpicHoppers-API/pom.xml index 861a8f0..01ad196 100644 --- a/EpicHoppers-API/pom.xml +++ b/EpicHoppers-API/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.2.0 + 5.3.0 ../pom.xml EpicHoppers-API diff --git a/EpicHoppers-Plugin/pom.xml b/EpicHoppers-Plugin/pom.xml index 6ef8a9e..f233dba 100644 --- a/EpicHoppers-Plugin/pom.xml +++ b/EpicHoppers-Plugin/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent - 5.2.0 + 5.3.0 ../pom.xml EpicHoppers-Plugin diff --git a/pom.xml b/pom.xml index a435eab..a779778 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.craftaro EpicHoppers-Parent pom - 5.2.0 + 5.3.0