From 822ac2ca391d1b4f78747570880d201796a0ab14 Mon Sep 17 00:00:00 2001
From: Sakura Ryoko <sakura@ryoko.soy>
Date: Tue, 10 Dec 2024 19:03:47 -0500
Subject: [PATCH] Update NbtUtils with BlockPos and EntityPos calls

---
 .../fi/dy/masa/malilib/util/nbt/NbtUtils.java | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/main/java/fi/dy/masa/malilib/util/nbt/NbtUtils.java b/src/main/java/fi/dy/masa/malilib/util/nbt/NbtUtils.java
index b6132c0383..68a904d42b 100644
--- a/src/main/java/fi/dy/masa/malilib/util/nbt/NbtUtils.java
+++ b/src/main/java/fi/dy/masa/malilib/util/nbt/NbtUtils.java
@@ -85,6 +85,11 @@ public static <T> NbtList asListTag(Collection<T> values, Function<T, NbtElement
         return list;
     }
 
+    public static @NotNull NbtCompound createBlockPos(@Nonnull BlockPos pos)
+    {
+        return writeBlockPos(pos, new NbtCompound());
+    }
+
     public static @NotNull NbtCompound createBlockPosTag(@Nonnull BlockPos pos)
     {
         return writeBlockPos(pos, new NbtCompound());
@@ -95,6 +100,11 @@ public static <T> NbtList asListTag(Collection<T> values, Function<T, NbtElement
         return putVec3i(new NbtCompound(), pos);
     }
 
+    public static @NotNull NbtCompound createEntityPosition(@Nonnull Vec3d pos)
+    {
+        return createEntityPositionToTag(pos);
+    }
+
     public static @NotNull NbtCompound createEntityPositionToTag(@Nonnull Vec3d pos)
     {
         return writeVec3dToListTag(pos, new NbtCompound(), NbtKeys.POS);
@@ -108,6 +118,11 @@ public static <T> NbtList asListTag(Collection<T> values, Function<T, NbtElement
         return tag;
     }
 
+    public static @NotNull NbtCompound writeBlockPosToTag(@Nonnull BlockPos pos, @Nonnull NbtCompound tag)
+    {
+        return writeBlockPos(pos, tag);
+    }
+
     public static @NotNull NbtCompound writeBlockPos(@Nonnull BlockPos pos, @Nonnull NbtCompound tag)
     {
         NbtWrap.putInt(tag, "x", pos.getX());
@@ -190,6 +205,11 @@ public static BlockPos readBlockPosFromArrayTag(@Nonnull NbtCompound tag, String
         return null;
     }
 
+    public static @NotNull NbtCompound removeBlockPos(@Nonnull NbtCompound tag)
+    {
+        return removeBlockPosFromTag(tag);
+    }
+
     public static @NotNull NbtCompound removeBlockPosFromTag(@Nonnull NbtCompound tag)
     {
         NbtWrap.remove(tag, "x");
@@ -199,6 +219,11 @@ public static BlockPos readBlockPosFromArrayTag(@Nonnull NbtCompound tag, String
         return tag;
     }
 
+    public static @NotNull NbtCompound writeEntityPosition(@Nonnull Vec3d pos, @Nonnull NbtCompound tag)
+    {
+        return writeVec3dToListTag(pos, tag, NbtKeys.POS);
+    }
+
     public static @NotNull NbtCompound writeEntityPositionToTag(@Nonnull Vec3d pos, @Nonnull NbtCompound tag)
     {
         return writeVec3dToListTag(pos, tag, NbtKeys.POS);