diff --git a/src/main/java/dev/zontreck/libzontreck/chestgui/ChestGUIButton.java b/src/main/java/dev/zontreck/libzontreck/chestgui/ChestGUIButton.java index 3e7cb91..0ed5b46 100644 --- a/src/main/java/dev/zontreck/libzontreck/chestgui/ChestGUIButton.java +++ b/src/main/java/dev/zontreck/libzontreck/chestgui/ChestGUIButton.java @@ -142,7 +142,7 @@ public class ChestGUIButton */ public boolean matchesSlot(Vector2i slot) { - return position.same(slot); + return position.Same(slot); } /** diff --git a/src/main/java/dev/zontreck/libzontreck/currency/Bank.java b/src/main/java/dev/zontreck/libzontreck/currency/Bank.java index 2f65b59..4473d88 100644 --- a/src/main/java/dev/zontreck/libzontreck/currency/Bank.java +++ b/src/main/java/dev/zontreck/libzontreck/currency/Bank.java @@ -16,8 +16,10 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.Tag; +import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.server.ServerLifecycleHooks; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -139,6 +141,9 @@ public class Bank protected static boolean postTx(Transaction tx) throws InvalidSideException, InvocationTargetException, IllegalAccessException { if(ServerUtilities.isClient())return false; TransactionEvent ev = new TransactionEvent(tx); + + MinecraftServer server = ServerLifecycleHooks.getCurrentServer(); + if(MinecraftForge.EVENT_BUS.post(ev)) { // Send the list of reasons to the user @@ -147,13 +152,14 @@ public class Bank Account from = ev.tx.from.get(); Account to = ev.tx.to.get(); + if(from.isValidPlayer()) { - ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), LibZontreck.THE_SERVER); + ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), server); } if(to.isValidPlayer()) { - ChatHelpers.broadcastTo(to.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), LibZontreck.THE_SERVER); + ChatHelpers.broadcastTo(to.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), server); } return false; @@ -194,10 +200,10 @@ public class Bank } if(from.isValidPlayer()) - ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Green!You sent !White!${0} !Dark_green!to {1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), LibZontreck.THE_SERVER); + ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Green!You sent !White!${0} !Dark_green!to {1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), server); if(to.isValidPlayer()) - ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] {0} !Dark_Green!paid you ${1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), LibZontreck.THE_SERVER); + ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] {0} !Dark_Green!paid you ${1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), server); if(to.isValidPlayer() && ServerUtilities.playerIsOffline(to.player_id)) Profile.unload(toProf); if(from.isValidPlayer() && ServerUtilities.playerIsOffline(from.player_id)) diff --git a/src/main/java/dev/zontreck/libzontreck/memory/PlayerComponent.java b/src/main/java/dev/zontreck/libzontreck/memory/PlayerComponent.java index b169ec1..886ae53 100644 --- a/src/main/java/dev/zontreck/libzontreck/memory/PlayerComponent.java +++ b/src/main/java/dev/zontreck/libzontreck/memory/PlayerComponent.java @@ -7,6 +7,7 @@ import dev.zontreck.libzontreck.exceptions.InvalidDeserialization; import dev.zontreck.libzontreck.vectors.WorldPosition; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; +import net.minecraftforge.server.ServerLifecycleHooks; public class PlayerComponent { @@ -34,7 +35,7 @@ public class PlayerComponent public static PlayerComponent fromID(UUID ID) { - return new PlayerComponent(LibZontreck.THE_SERVER.getPlayerList().getPlayer(ID)); + return new PlayerComponent(ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(ID)); } public CompoundTag serialize() diff --git a/src/main/java/dev/zontreck/libzontreck/memory/PlayerContainer.java b/src/main/java/dev/zontreck/libzontreck/memory/PlayerContainer.java index b898ba5..218fb30 100644 --- a/src/main/java/dev/zontreck/libzontreck/memory/PlayerContainer.java +++ b/src/main/java/dev/zontreck/libzontreck/memory/PlayerContainer.java @@ -5,6 +5,7 @@ import java.util.UUID; import dev.zontreck.libzontreck.LibZontreck; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; +import net.minecraftforge.server.ServerLifecycleHooks; public class PlayerContainer { public UUID ID; @@ -13,7 +14,7 @@ public class PlayerContainer { public PlayerContainer(UUID ID) { - this(LibZontreck.THE_SERVER.getPlayerList().getPlayer(ID)); + this(ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(ID)); } public PlayerContainer(ServerPlayer player) {