Conversion to client-side stacks in fake-entity metadata

Fixes #283
xenondevs · Oct 3, 2023 · 00d98d3 · 00d98d3
1 parent 6d51ace
commit 00d98d3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/Metadata.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/Metadata.kt
@@ -3,7 +3,10 @@ package xyz.xenondevs.nova.world.fakeentity.metadata
 import io.netty.buffer.Unpooled
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.syncher.EntityDataSerializer
+import net.minecraft.network.syncher.EntityDataSerializers
+import net.minecraft.world.item.ItemStack
 import xyz.xenondevs.nmsutils.network.PacketIdRegistry
+import xyz.xenondevs.nova.item.logic.PacketItems
 import java.util.*
 
 abstract class Metadata internal constructor() {
@@ -49,7 +52,7 @@ abstract class Metadata internal constructor() {
     }
 
     internal fun <T, R> entry(index: Int, serializer: EntityDataSerializer<R>, default: T, toRaw: (T) -> R): MappedNonNullMetadataEntry<T, R>.MappedDelegate {
-        val entry = MappedNonNullMetadataEntry(index, serializer, toRaw, { default }, default)
+        val entry = MappedNonNullMetadataEntry(index, serializer, toRaw, { throw UnsupportedOperationException() }, default)
         entries += entry
         return entry.mappedDelegate
     }
@@ -72,4 +75,15 @@ abstract class Metadata internal constructor() {
         return entry
     }
 
+    internal fun itemStack(index: Int, useName: Boolean, default: ItemStack): MappedNonNullMetadataEntry<ItemStack, ItemStack>.MappedDelegate {
+        val entry = MappedNonNullMetadataEntry(
+            index, EntityDataSerializers.ITEM_STACK,
+            { PacketItems.getClientSideStack(null, it, useName)},
+            { PacketItems.getServerSideStack(it) },
+            default
+        )
+        entries += entry
+        return entry.mappedDelegate
+    }
+
 }
diff --git a/.../src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/impl/ItemDisplayMetadata.kt b/.../src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/impl/ItemDisplayMetadata.kt
@@ -6,7 +6,7 @@ import net.minecraft.world.item.ItemStack
 
 class ItemDisplayMetadata : DisplayMetadata() {
 
-    var itemStack: ItemStack by entry(23, EntityDataSerializers.ITEM_STACK, ItemStack.EMPTY)
+    var itemStack: ItemStack by itemStack(23, true, ItemStack.EMPTY)
     var itemDisplay: ItemDisplayContext by entry(24, EntityDataSerializers.BYTE, ItemDisplayContext.NONE) { it.ordinal.toByte() }
 
 }
diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/impl/ItemFrameMetadata.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/impl/ItemFrameMetadata.kt
@@ -5,7 +5,7 @@ import net.minecraft.world.item.ItemStack
 
 class ItemFrameMetadata : EntityMetadata() {
 
-    var item: ItemStack by entry(8, EntityDataSerializers.ITEM_STACK, ItemStack.EMPTY)
+    var item: ItemStack by itemStack(8, false, ItemStack.EMPTY)
     var rotation: Int by entry(9, EntityDataSerializers.INT, 0)
 
 }
diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/impl/ItemMetadata.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/fakeentity/metadata/impl/ItemMetadata.kt
@@ -1,10 +1,9 @@
 package xyz.xenondevs.nova.world.fakeentity.metadata.impl
 
-import net.minecraft.network.syncher.EntityDataSerializers
 import net.minecraft.world.item.ItemStack
 
 class ItemMetadata : EntityMetadata() {
 
-    var item: ItemStack by entry(8, EntityDataSerializers.ITEM_STACK, ItemStack.EMPTY)
+    var item: ItemStack by itemStack(8, true, ItemStack.EMPTY)
 
 }