From c2984f5068cdb6bc8a628d3e2bdf73bed07305af Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 11 Jun 2025 21:35:33 +0200 Subject: [PATCH 1/2] Update DiamondBank-OG --- libs/DiamondBank-OG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/DiamondBank-OG b/libs/DiamondBank-OG index 0c6fad0..52807a2 160000 --- a/libs/DiamondBank-OG +++ b/libs/DiamondBank-OG @@ -1 +1 @@ -Subproject commit 0c6fad0ab6a9f652e7a689a3c56e45db9fcc810f +Subproject commit 52807a2d60c0516e4ad2e38f76136191c652d4ea From 00328e554580b687c13959f768fce3ae2f150d17 Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 11 Jun 2025 21:37:26 +0200 Subject: [PATCH 2/2] Update DiamondBank-OG example --- src/main/java/plugin/Listeners.java | 8 ++++---- src/main/java/plugin/TemplateOG.java | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/plugin/Listeners.java b/src/main/java/plugin/Listeners.java index 90efa61..985cfc3 100644 --- a/src/main/java/plugin/Listeners.java +++ b/src/main/java/plugin/Listeners.java @@ -1,6 +1,6 @@ package plugin; -import net.trueog.diamondbankog.DiamondBankAPI; +import net.trueog.diamondbankog.DiamondBankAPIJava.DiamondBankException; import net.trueog.utilitiesog.UtilitiesOG; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; @@ -24,13 +24,13 @@ public class Listeners implements Listener { CompletableFuture completablePlayerShards; try { completablePlayerShards = TemplateOG.diamondBankAPI().getPlayerShards(event.getPlayer().getUniqueId(), ShardType.ALL); - } catch (DiamondBankAPI.DiamondBankException.EconomyDisabledException e) { + } catch (DiamondBankException.EconomyDisabledException e) { UtilitiesOG.trueogMessage(event.getPlayer(), "The economy is disabled."); return; - } catch (DiamondBankAPI.DiamondBankException.TransactionsLockedException e) { + } catch (DiamondBankException.TransactionsLockedException e) { UtilitiesOG.trueogMessage(event.getPlayer(), "Your transactions are locked."); return; - } catch (DiamondBankAPI.DiamondBankException.OtherException e) { + } catch (DiamondBankException.OtherException e) { UtilitiesOG.trueogMessage(event.getPlayer(), "Something went wrong."); return; } diff --git a/src/main/java/plugin/TemplateOG.java b/src/main/java/plugin/TemplateOG.java index 8dba106..472cd40 100644 --- a/src/main/java/plugin/TemplateOG.java +++ b/src/main/java/plugin/TemplateOG.java @@ -1,22 +1,21 @@ package plugin; +import net.trueog.diamondbankog.DiamondBankAPIJava; import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; -import net.trueog.diamondbankog.DiamondBankAPI; - public class TemplateOG extends JavaPlugin { private static TemplateOG plugin; - private static DiamondBankAPI diamondBankAPI; + private static DiamondBankAPIJava diamondBankAPI; public void onEnable() { plugin = this; getServer().getPluginManager().registerEvents(new Listeners(), this); - RegisteredServiceProvider diamondBankAPIProvider = getServer().getServicesManager().getRegistration(DiamondBankAPI.class); + RegisteredServiceProvider diamondBankAPIProvider = getServer().getServicesManager().getRegistration(DiamondBankAPIJava.class); if (diamondBankAPIProvider == null) { getLogger().severe("DiamondBank-OG API is null"); Bukkit.getPluginManager().disablePlugin(this); @@ -29,7 +28,7 @@ public class TemplateOG extends JavaPlugin { return plugin; } - public static DiamondBankAPI diamondBankAPI() { + public static DiamondBankAPIJava diamondBankAPI() { return diamondBankAPI; } } \ No newline at end of file