From 29814e35b1674bdce0ab79a376b6f35727466381 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sun, 19 Nov 2023 05:12:23 -0700 Subject: [PATCH] Fix a mod crash --- gradle.properties | 4 ++-- .../java/dev/zontreck/libzontreck/LibZontreck.java | 1 + .../dev/zontreck/libzontreck/currency/Account.java | 8 +------- .../java/dev/zontreck/libzontreck/currency/Bank.java | 12 +----------- .../networking/packets/S2CWalletUpdatedPacket.java | 8 +------- 5 files changed, 6 insertions(+), 27 deletions(-) diff --git a/gradle.properties b/gradle.properties index d7e95d9..e761f04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ org.gradle.daemon=false parchment_version=2023.09.03 # luckperms_api_version=5.4 -libac=1.4.1 -eventsbus=1.0.16 +libac=1.4.3 +eventsbus=1.0.29 ## Environment Properties # The Minecraft version must agree with the Forge version to get a valid artifact diff --git a/src/main/java/dev/zontreck/libzontreck/LibZontreck.java b/src/main/java/dev/zontreck/libzontreck/LibZontreck.java index d569bd1..a22b09d 100644 --- a/src/main/java/dev/zontreck/libzontreck/LibZontreck.java +++ b/src/main/java/dev/zontreck/libzontreck/LibZontreck.java @@ -81,6 +81,7 @@ public class LibZontreck { MinecraftForge.EVENT_BUS.register(new Commands()); MinecraftForge.EVENT_BUS.register(new NetworkEvents()); + Bus.Reset(); Bus.Register(CurrencyHelper.class, null); Bus.Register(Bank.class, null); diff --git a/src/main/java/dev/zontreck/libzontreck/currency/Account.java b/src/main/java/dev/zontreck/libzontreck/currency/Account.java index 52b511e..e0b81f8 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/Account.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/Account.java @@ -94,13 +94,7 @@ public class Account LongTermTransactionHistoryRecord rec = LongTermTransactionHistoryRecord.of(player_id); rec.addHistory(history); rec.commit(); - try { - Bus.Post(new TransactionHistoryFlushEvent(this, rec, history)); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } + Bus.Post(new TransactionHistoryFlushEvent(this, rec, history)); rec = null; history = new ArrayList<>(); } diff --git a/src/main/java/dev/zontreck/libzontreck/currency/Bank.java b/src/main/java/dev/zontreck/libzontreck/currency/Bank.java index d129104..a94b4c2 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/Bank.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/Bank.java @@ -84,10 +84,6 @@ public class Bank Bus.Post(new BankReadyEvent()); } catch (IOException e) { throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); } } @@ -132,13 +128,7 @@ public class Bank instance.accounts.add(new Account(ID)); instance.commit(); - try { - Bus.Post(new BankAccountCreatedEvent(getAccount(ID))); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } + Bus.Post(new BankAccountCreatedEvent(getAccount(ID))); }else { } } diff --git a/src/main/java/dev/zontreck/libzontreck/networking/packets/S2CWalletUpdatedPacket.java b/src/main/java/dev/zontreck/libzontreck/networking/packets/S2CWalletUpdatedPacket.java index 614a4cf..6d26432 100644 --- a/src/main/java/dev/zontreck/libzontreck/networking/packets/S2CWalletUpdatedPacket.java +++ b/src/main/java/dev/zontreck/libzontreck/networking/packets/S2CWalletUpdatedPacket.java @@ -63,13 +63,7 @@ public class S2CWalletUpdatedPacket implements IPacket return ServerUtilities.handlePacket(supplier, new Runnable() { @Override public void run() { - try { - Bus.Post(new WalletUpdatedEvent(ID, oldBal, balance, tx)); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } + Bus.Post(new WalletUpdatedEvent(ID, oldBal, balance, tx)); } });