From 8abd17b6705f56ae0cf69598ee07d4370fda0056 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Tue, 27 Aug 2024 23:46:38 +0700 Subject: [PATCH] Optional itemstack stream codecs, for some reason --- src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt | 4 ++-- .../kotlin/ru/dbotthepony/mc/otm/network/DelegateSyncher.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt index 0529123c4..4f1c85c5f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt @@ -212,7 +212,7 @@ fun FriendlyByteBuf.writeItemType(value: Item) { } fun RegistryFriendlyByteBuf.writeItem(value: ItemStack) { - ItemStack.STREAM_CODEC.encode(this, value) + ItemStack.OPTIONAL_STREAM_CODEC.encode(this, value) } fun RegistryFriendlyByteBuf.writeComponent(value: Component) { @@ -228,7 +228,7 @@ fun FriendlyByteBuf.readItemType(): Item { } fun RegistryFriendlyByteBuf.readItem(): ItemStack { - return ItemStack.STREAM_CODEC.decode(this) + return ItemStack.OPTIONAL_STREAM_CODEC.decode(this) } fun RegistryFriendlyByteBuf.readComponent(): Component { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/DelegateSyncher.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/DelegateSyncher.kt index 1c4dd1d90..4816d559e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/DelegateSyncher.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/DelegateSyncher.kt @@ -626,15 +626,15 @@ class DelegateSyncher : Observer { } fun item(value: ItemStack = ItemStack.EMPTY, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()): DelegateSyncher.Slot { - return add(ListenableDelegate.maskSmart(value, getter, setter), ItemStack.STREAM_CODEC.wrap()) + return add(ListenableDelegate.maskSmart(value, getter, setter), ItemStack.OPTIONAL_STREAM_CODEC.wrap()) } fun computedItem(delegate: Supplier): DelegateSyncher.Slot { - return computed(delegate, ItemStack.STREAM_CODEC.wrap()) + return computed(delegate, ItemStack.OPTIONAL_STREAM_CODEC.wrap()) } fun observedItem(value: ItemStack = ItemStack.EMPTY, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()): DelegateSyncher.ObservedSlot { - return add(Delegate.maskSmart(value, getter, setter), ItemStack.STREAM_CODEC.wrap()) + return add(Delegate.maskSmart(value, getter, setter), ItemStack.OPTIONAL_STREAM_CODEC.wrap()) } /**