From a488e0671f3c014941b6ff0072e380b41c7cd5bb Mon Sep 17 00:00:00 2001 From: Zontreck Date: Wed, 14 Feb 2024 04:34:49 -0700 Subject: [PATCH] Fix compile errors --- src/main/java/dev/zontreck/libzontreck/LibZontreck.java | 7 +++---- .../java/dev/zontreck/libzontreck/currency/Account.java | 4 ++-- src/main/java/dev/zontreck/libzontreck/currency/Bank.java | 8 ++------ .../currency/events/BankAccountCreatedEvent.java | 2 +- .../libzontreck/currency/events/BankReadyEvent.java | 2 +- .../currency/events/TransactionHistoryFlushEvent.java | 2 +- .../networking/packets/S2CWalletUpdatedPacket.java | 2 +- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/main/java/dev/zontreck/libzontreck/LibZontreck.java b/src/main/java/dev/zontreck/libzontreck/LibZontreck.java index bc5fe5e..a556dc6 100644 --- a/src/main/java/dev/zontreck/libzontreck/LibZontreck.java +++ b/src/main/java/dev/zontreck/libzontreck/LibZontreck.java @@ -9,7 +9,6 @@ import java.util.Map; import java.util.UUID; import dev.zontreck.ariaslib.util.DelayedExecutorService; -import dev.zontreck.eventsbus.Bus; import dev.zontreck.libzontreck.chestgui.ChestGUIRegistry; import dev.zontreck.libzontreck.currency.Bank; import dev.zontreck.libzontreck.currency.CurrencyHelper; @@ -89,14 +88,14 @@ public class LibZontreck { MinecraftForge.EVENT_BUS.register(new NetworkEvents()); MinecraftForge.EVENT_BUS.register(ChestGUIRegistry.class); - Bus.Reset(); ModMenuTypes.REGISTRY.register(bus); //CreativeModeTabs.register(bus); ModItems.register(bus); - Bus.Register(CurrencyHelper.class, null); - Bus.Register(Bank.class, null); + MinecraftForge.EVENT_BUS.register(CurrencyHelper.class); + MinecraftForge.EVENT_BUS.register(Bank.class); + } private void setup(final FMLCommonSetupEvent event) diff --git a/src/main/java/dev/zontreck/libzontreck/currency/Account.java b/src/main/java/dev/zontreck/libzontreck/currency/Account.java index e0b81f8..394be28 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/Account.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/Account.java @@ -1,7 +1,6 @@ package dev.zontreck.libzontreck.currency; -import dev.zontreck.eventsbus.Bus; import dev.zontreck.libzontreck.chat.ChatColor; import dev.zontreck.libzontreck.currency.events.TransactionHistoryFlushEvent; import dev.zontreck.libzontreck.profiles.Profile; @@ -11,6 +10,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.Tag; +import net.minecraftforge.common.MinecraftForge; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -94,7 +94,7 @@ public class Account LongTermTransactionHistoryRecord rec = LongTermTransactionHistoryRecord.of(player_id); rec.addHistory(history); rec.commit(); - Bus.Post(new TransactionHistoryFlushEvent(this, rec, history)); + MinecraftForge.EVENT_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 bbc6657..2f65b59 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/Bank.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/Bank.java @@ -1,10 +1,6 @@ package dev.zontreck.libzontreck.currency; -import com.google.common.collect.Lists; -import dev.zontreck.eventsbus.Bus; import dev.zontreck.libzontreck.LibZontreck; -import dev.zontreck.libzontreck.chat.ChatColor; -import dev.zontreck.libzontreck.chat.ChatColorFactory; import dev.zontreck.libzontreck.currency.events.BankAccountCreatedEvent; import dev.zontreck.libzontreck.currency.events.BankReadyEvent; import dev.zontreck.libzontreck.currency.events.TransactionEvent; @@ -81,7 +77,7 @@ public class Bank accounts.add(new Account((CompoundTag) t)); } - Bus.Post(new BankReadyEvent()); + MinecraftForge.EVENT_BUS.post(new BankReadyEvent()); } catch (IOException e) { throw new RuntimeException(e); } @@ -128,7 +124,7 @@ public class Bank instance.accounts.add(new Account(ID)); instance.commit(); - Bus.Post(new BankAccountCreatedEvent(getAccount(ID))); + MinecraftForge.EVENT_BUS.post(new BankAccountCreatedEvent(getAccount(ID))); }else { } } diff --git a/src/main/java/dev/zontreck/libzontreck/currency/events/BankAccountCreatedEvent.java b/src/main/java/dev/zontreck/libzontreck/currency/events/BankAccountCreatedEvent.java index 1961f97..6ff98b0 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/events/BankAccountCreatedEvent.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/events/BankAccountCreatedEvent.java @@ -1,8 +1,8 @@ package dev.zontreck.libzontreck.currency.events; -import dev.zontreck.eventsbus.Event; import dev.zontreck.libzontreck.currency.Account; +import net.minecraftforge.eventbus.api.Event; public class BankAccountCreatedEvent extends Event { diff --git a/src/main/java/dev/zontreck/libzontreck/currency/events/BankReadyEvent.java b/src/main/java/dev/zontreck/libzontreck/currency/events/BankReadyEvent.java index c7fcfc0..5dcf914 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/events/BankReadyEvent.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/events/BankReadyEvent.java @@ -1,7 +1,7 @@ package dev.zontreck.libzontreck.currency.events; -import dev.zontreck.eventsbus.Event; +import net.minecraftforge.eventbus.api.Event; /** * Contains no information by itself, it only signals that the Bank is open for business diff --git a/src/main/java/dev/zontreck/libzontreck/currency/events/TransactionHistoryFlushEvent.java b/src/main/java/dev/zontreck/libzontreck/currency/events/TransactionHistoryFlushEvent.java index ef1d1dc..34bb7a8 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/events/TransactionHistoryFlushEvent.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/events/TransactionHistoryFlushEvent.java @@ -1,10 +1,10 @@ package dev.zontreck.libzontreck.currency.events; -import dev.zontreck.eventsbus.Event; import dev.zontreck.libzontreck.currency.Account; import dev.zontreck.libzontreck.currency.LongTermTransactionHistoryRecord; import dev.zontreck.libzontreck.currency.Transaction; +import net.minecraftforge.eventbus.api.Event; import java.util.List; 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 f585f07..059a2ed 100644 --- a/src/main/java/dev/zontreck/libzontreck/networking/packets/S2CWalletUpdatedPacket.java +++ b/src/main/java/dev/zontreck/libzontreck/networking/packets/S2CWalletUpdatedPacket.java @@ -1,6 +1,6 @@ package dev.zontreck.libzontreck.networking.packets; -import dev.zontreck.eventsbus.Bus; + import dev.zontreck.libzontreck.currency.Transaction; import dev.zontreck.libzontreck.currency.events.WalletUpdatedEvent; import dev.zontreck.libzontreck.util.ServerUtilities;