From e1a059feab0a45d9e0da71ff38c67ecd8745529b Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Thu, 9 Jun 2022 18:33:24 +0200 Subject: [PATCH] Updated to 1.19 --- build.gradle.kts | 2 +- src/main/java/com/alttd/GUI/windows/BuyGUI.java | 3 +-- src/main/java/com/alttd/GUI/windows/SellGUI.java | 3 +-- src/main/java/com/alttd/util/Utilities.java | 8 ++++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e308d22..fa8eff4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ tasks { } dependencies { - compileOnly("com.alttd:Galaxy-API:1.18.2-R0.1-SNAPSHOT") + compileOnly("com.alttd:Galaxy-API:1.19-R0.1-SNAPSHOT") compileOnly("com.github.milkbowl:VaultAPI:1.7") { exclude("org.bukkit","bukkit") } diff --git a/src/main/java/com/alttd/GUI/windows/BuyGUI.java b/src/main/java/com/alttd/GUI/windows/BuyGUI.java index 1da1650..474e8a4 100644 --- a/src/main/java/com/alttd/GUI/windows/BuyGUI.java +++ b/src/main/java/com/alttd/GUI/windows/BuyGUI.java @@ -15,7 +15,6 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.milkbowl.vault.economy.Economy; -import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -128,7 +127,7 @@ public class BuyGUI extends GUIMerchant { int newPoints = econUser.getPointsMap().get(villagerType.getName()); player.sendMiniMessage(Config.PURCHASED_ITEM, TagResolver.resolver( Placeholder.unparsed("amount", String.valueOf(purchase.amount())), - Placeholder.unparsed("item", StringUtils.capitalize(purchase.material().name() + Placeholder.unparsed("item", Utilities.capitalize(purchase.material().name() .toLowerCase().replaceAll("_", " "))), Placeholder.unparsed("price", String.format("%,.2f", purchase.price())), Placeholder.unparsed("points", String.valueOf(purchase.totalPointCost())), diff --git a/src/main/java/com/alttd/GUI/windows/SellGUI.java b/src/main/java/com/alttd/GUI/windows/SellGUI.java index 1583e94..0df05af 100644 --- a/src/main/java/com/alttd/GUI/windows/SellGUI.java +++ b/src/main/java/com/alttd/GUI/windows/SellGUI.java @@ -15,7 +15,6 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.milkbowl.vault.economy.Economy; -import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -117,7 +116,7 @@ public class SellGUI extends GUIMerchant { int newPoints = econUser.getPointsMap().get(villagerType.getName()); player.sendMiniMessage(Config.SOLD_ITEM, TagResolver.resolver( Placeholder.unparsed("amount", String.valueOf(purchase.amount())), - Placeholder.unparsed("item", StringUtils.capitalize(purchase.material().name() + Placeholder.unparsed("item", Utilities.capitalize(purchase.material().name() .toLowerCase().replaceAll("_", " "))), Placeholder.unparsed("price", String.format("%,.2f", purchase.price())), Placeholder.unparsed("points", String.valueOf(-purchase.totalPointCost())), diff --git a/src/main/java/com/alttd/util/Utilities.java b/src/main/java/com/alttd/util/Utilities.java index 5e1618c..3fe13f2 100644 --- a/src/main/java/com/alttd/util/Utilities.java +++ b/src/main/java/com/alttd/util/Utilities.java @@ -138,4 +138,12 @@ public class Utilities { } return (price); } + + public static String capitalize(String str) { + if (str.isEmpty()) + return str; + if (str.length() == 1) + return str.toUpperCase(); + return str.substring(0, 1).toUpperCase() + str.substring(1); + } }