From 4247ae62463465990a7caba9a8d834dc56632117 Mon Sep 17 00:00:00 2001 From: zontreck Date: Tue, 9 Apr 2024 13:22:41 -0700 Subject: [PATCH] Push current work --- .../java/dev/zontreck/libzontreck/LibZontreck.java | 4 +--- .../libzontreck/events/ForgeEventHandlers.java | 5 +---- .../memory/{ => player}/PlayerComponent.java | 3 +-- .../memory/{ => player}/PlayerContainer.java | 3 +-- .../memory/{ => player}/VolatilePlayerStorage.java | 2 +- .../libzontreck/memory/world/SavedBlock.java | 12 ++++++++++++ 6 files changed, 17 insertions(+), 12 deletions(-) rename src/main/java/dev/zontreck/libzontreck/memory/{ => player}/PlayerComponent.java (94%) rename src/main/java/dev/zontreck/libzontreck/memory/{ => player}/PlayerContainer.java (87%) rename src/main/java/dev/zontreck/libzontreck/memory/{ => player}/VolatilePlayerStorage.java (97%) create mode 100644 src/main/java/dev/zontreck/libzontreck/memory/world/SavedBlock.java diff --git a/src/main/java/dev/zontreck/libzontreck/LibZontreck.java b/src/main/java/dev/zontreck/libzontreck/LibZontreck.java index 11a53a7..66a7af4 100644 --- a/src/main/java/dev/zontreck/libzontreck/LibZontreck.java +++ b/src/main/java/dev/zontreck/libzontreck/LibZontreck.java @@ -8,7 +8,6 @@ import java.util.Iterator; import java.util.Map; import java.util.UUID; -import dev.zontreck.ariaslib.util.DelayedExecutorService; import dev.zontreck.libzontreck.chestgui.ChestGUIRegistry; import dev.zontreck.libzontreck.currency.Bank; import dev.zontreck.libzontreck.currency.CurrencyHelper; @@ -23,11 +22,10 @@ import com.mojang.logging.LogUtils; import dev.zontreck.libzontreck.commands.Commands; import dev.zontreck.libzontreck.events.ForgeEventHandlers; -import dev.zontreck.libzontreck.memory.VolatilePlayerStorage; +import dev.zontreck.libzontreck.memory.player.VolatilePlayerStorage; import dev.zontreck.libzontreck.networking.ModMessages; import dev.zontreck.libzontreck.profiles.Profile; import dev.zontreck.libzontreck.util.FileTreeDatastore; -import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.server.ServerStartedEvent; import net.minecraftforge.event.server.ServerStoppingEvent; diff --git a/src/main/java/dev/zontreck/libzontreck/events/ForgeEventHandlers.java b/src/main/java/dev/zontreck/libzontreck/events/ForgeEventHandlers.java index ba07e63..ee795e6 100644 --- a/src/main/java/dev/zontreck/libzontreck/events/ForgeEventHandlers.java +++ b/src/main/java/dev/zontreck/libzontreck/events/ForgeEventHandlers.java @@ -1,13 +1,10 @@ package dev.zontreck.libzontreck.events; import dev.zontreck.ariaslib.terminal.Task; -import dev.zontreck.ariaslib.util.DelayedExecutorService; import dev.zontreck.libzontreck.LibZontreck; import dev.zontreck.libzontreck.exceptions.InvalidSideException; -import dev.zontreck.libzontreck.memory.PlayerContainer; -import dev.zontreck.libzontreck.networking.ModMessages; +import dev.zontreck.libzontreck.memory.player.PlayerContainer; import dev.zontreck.libzontreck.networking.packets.S2CServerAvailable; -import dev.zontreck.libzontreck.networking.packets.S2CWalletInitialSyncPacket; import dev.zontreck.libzontreck.profiles.Profile; import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException; import dev.zontreck.libzontreck.util.ServerUtilities; diff --git a/src/main/java/dev/zontreck/libzontreck/memory/PlayerComponent.java b/src/main/java/dev/zontreck/libzontreck/memory/player/PlayerComponent.java similarity index 94% rename from src/main/java/dev/zontreck/libzontreck/memory/PlayerComponent.java rename to src/main/java/dev/zontreck/libzontreck/memory/player/PlayerComponent.java index 886ae53..3c86f7e 100644 --- a/src/main/java/dev/zontreck/libzontreck/memory/PlayerComponent.java +++ b/src/main/java/dev/zontreck/libzontreck/memory/player/PlayerComponent.java @@ -1,8 +1,7 @@ -package dev.zontreck.libzontreck.memory; +package dev.zontreck.libzontreck.memory.player; import java.util.UUID; -import dev.zontreck.libzontreck.LibZontreck; import dev.zontreck.libzontreck.exceptions.InvalidDeserialization; import dev.zontreck.libzontreck.vectors.WorldPosition; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/dev/zontreck/libzontreck/memory/PlayerContainer.java b/src/main/java/dev/zontreck/libzontreck/memory/player/PlayerContainer.java similarity index 87% rename from src/main/java/dev/zontreck/libzontreck/memory/PlayerContainer.java rename to src/main/java/dev/zontreck/libzontreck/memory/player/PlayerContainer.java index 218fb30..fcbaa38 100644 --- a/src/main/java/dev/zontreck/libzontreck/memory/PlayerContainer.java +++ b/src/main/java/dev/zontreck/libzontreck/memory/player/PlayerContainer.java @@ -1,8 +1,7 @@ -package dev.zontreck.libzontreck.memory; +package dev.zontreck.libzontreck.memory.player; 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; diff --git a/src/main/java/dev/zontreck/libzontreck/memory/VolatilePlayerStorage.java b/src/main/java/dev/zontreck/libzontreck/memory/player/VolatilePlayerStorage.java similarity index 97% rename from src/main/java/dev/zontreck/libzontreck/memory/VolatilePlayerStorage.java rename to src/main/java/dev/zontreck/libzontreck/memory/player/VolatilePlayerStorage.java index d1abae8..630f35e 100644 --- a/src/main/java/dev/zontreck/libzontreck/memory/VolatilePlayerStorage.java +++ b/src/main/java/dev/zontreck/libzontreck/memory/player/VolatilePlayerStorage.java @@ -1,4 +1,4 @@ -package dev.zontreck.libzontreck.memory; +package dev.zontreck.libzontreck.memory.player; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/dev/zontreck/libzontreck/memory/world/SavedBlock.java b/src/main/java/dev/zontreck/libzontreck/memory/world/SavedBlock.java new file mode 100644 index 0000000..45cfa62 --- /dev/null +++ b/src/main/java/dev/zontreck/libzontreck/memory/world/SavedBlock.java @@ -0,0 +1,12 @@ +package dev.zontreck.libzontreck.memory.world; + +import net.minecraft.nbt.CompoundTag; + +public class SavedBlock +{ + private CompoundTag blockState; + private CompoundTag blockEntity; + private boolean hasBlockEntity; + + +}