Fix compile errors

This commit is contained in:
Zontreck 2024-02-14 04:34:49 -07:00
parent 6b90951ab2
commit a488e0671f
7 changed files with 11 additions and 16 deletions

View file

@ -9,7 +9,6 @@ import java.util.Map;
import java.util.UUID; import java.util.UUID;
import dev.zontreck.ariaslib.util.DelayedExecutorService; import dev.zontreck.ariaslib.util.DelayedExecutorService;
import dev.zontreck.eventsbus.Bus;
import dev.zontreck.libzontreck.chestgui.ChestGUIRegistry; import dev.zontreck.libzontreck.chestgui.ChestGUIRegistry;
import dev.zontreck.libzontreck.currency.Bank; import dev.zontreck.libzontreck.currency.Bank;
import dev.zontreck.libzontreck.currency.CurrencyHelper; import dev.zontreck.libzontreck.currency.CurrencyHelper;
@ -89,14 +88,14 @@ public class LibZontreck {
MinecraftForge.EVENT_BUS.register(new NetworkEvents()); MinecraftForge.EVENT_BUS.register(new NetworkEvents());
MinecraftForge.EVENT_BUS.register(ChestGUIRegistry.class); MinecraftForge.EVENT_BUS.register(ChestGUIRegistry.class);
Bus.Reset();
ModMenuTypes.REGISTRY.register(bus); ModMenuTypes.REGISTRY.register(bus);
//CreativeModeTabs.register(bus); //CreativeModeTabs.register(bus);
ModItems.register(bus); ModItems.register(bus);
Bus.Register(CurrencyHelper.class, null); MinecraftForge.EVENT_BUS.register(CurrencyHelper.class);
Bus.Register(Bank.class, null); MinecraftForge.EVENT_BUS.register(Bank.class);
} }
private void setup(final FMLCommonSetupEvent event) private void setup(final FMLCommonSetupEvent event)

View file

@ -1,7 +1,6 @@
package dev.zontreck.libzontreck.currency; package dev.zontreck.libzontreck.currency;
import dev.zontreck.eventsbus.Bus;
import dev.zontreck.libzontreck.chat.ChatColor; import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.currency.events.TransactionHistoryFlushEvent; import dev.zontreck.libzontreck.currency.events.TransactionHistoryFlushEvent;
import dev.zontreck.libzontreck.profiles.Profile; import dev.zontreck.libzontreck.profiles.Profile;
@ -11,6 +10,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag; import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.NbtUtils;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;
import net.minecraftforge.common.MinecraftForge;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
@ -94,7 +94,7 @@ public class Account
LongTermTransactionHistoryRecord rec = LongTermTransactionHistoryRecord.of(player_id); LongTermTransactionHistoryRecord rec = LongTermTransactionHistoryRecord.of(player_id);
rec.addHistory(history); rec.addHistory(history);
rec.commit(); rec.commit();
Bus.Post(new TransactionHistoryFlushEvent(this, rec, history)); MinecraftForge.EVENT_BUS.post(new TransactionHistoryFlushEvent(this, rec, history));
rec = null; rec = null;
history = new ArrayList<>(); history = new ArrayList<>();
} }

View file

@ -1,10 +1,6 @@
package dev.zontreck.libzontreck.currency; 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.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.BankAccountCreatedEvent;
import dev.zontreck.libzontreck.currency.events.BankReadyEvent; import dev.zontreck.libzontreck.currency.events.BankReadyEvent;
import dev.zontreck.libzontreck.currency.events.TransactionEvent; import dev.zontreck.libzontreck.currency.events.TransactionEvent;
@ -81,7 +77,7 @@ public class Bank
accounts.add(new Account((CompoundTag) t)); accounts.add(new Account((CompoundTag) t));
} }
Bus.Post(new BankReadyEvent()); MinecraftForge.EVENT_BUS.post(new BankReadyEvent());
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -128,7 +124,7 @@ public class Bank
instance.accounts.add(new Account(ID)); instance.accounts.add(new Account(ID));
instance.commit(); instance.commit();
Bus.Post(new BankAccountCreatedEvent(getAccount(ID))); MinecraftForge.EVENT_BUS.post(new BankAccountCreatedEvent(getAccount(ID)));
}else { }else {
} }
} }

View file

@ -1,8 +1,8 @@
package dev.zontreck.libzontreck.currency.events; package dev.zontreck.libzontreck.currency.events;
import dev.zontreck.eventsbus.Event;
import dev.zontreck.libzontreck.currency.Account; import dev.zontreck.libzontreck.currency.Account;
import net.minecraftforge.eventbus.api.Event;
public class BankAccountCreatedEvent extends Event public class BankAccountCreatedEvent extends Event
{ {

View file

@ -1,7 +1,7 @@
package dev.zontreck.libzontreck.currency.events; 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 * Contains no information by itself, it only signals that the Bank is open for business

View file

@ -1,10 +1,10 @@
package dev.zontreck.libzontreck.currency.events; package dev.zontreck.libzontreck.currency.events;
import dev.zontreck.eventsbus.Event;
import dev.zontreck.libzontreck.currency.Account; import dev.zontreck.libzontreck.currency.Account;
import dev.zontreck.libzontreck.currency.LongTermTransactionHistoryRecord; import dev.zontreck.libzontreck.currency.LongTermTransactionHistoryRecord;
import dev.zontreck.libzontreck.currency.Transaction; import dev.zontreck.libzontreck.currency.Transaction;
import net.minecraftforge.eventbus.api.Event;
import java.util.List; import java.util.List;

View file

@ -1,6 +1,6 @@
package dev.zontreck.libzontreck.networking.packets; package dev.zontreck.libzontreck.networking.packets;
import dev.zontreck.eventsbus.Bus;
import dev.zontreck.libzontreck.currency.Transaction; import dev.zontreck.libzontreck.currency.Transaction;
import dev.zontreck.libzontreck.currency.events.WalletUpdatedEvent; import dev.zontreck.libzontreck.currency.events.WalletUpdatedEvent;
import dev.zontreck.libzontreck.util.ServerUtilities; import dev.zontreck.libzontreck.util.ServerUtilities;