more fixes for optionals in nbt... i am exploding

Author: gliscowo

gradle.properties

@@ -7,7 +7,7 @@ minecraft_version=1.21
 yarn_mappings=1.21+build.2
 loader_version=0.15.11
 # Mod Properties
-mod_version=0.12.15.1
+mod_version=0.12.15.4
 maven_group=io.wispforest
 archives_base_name=owo-lib
 # Dependencies

src/main/java/io/wispforest/owo/serialization/format/nbt/NbtDeserializer.java

@@ -185,8 +185,9 @@ public boolean hasNext() {
 
         @Override
         public V next() {
+            var element = this.elements.next();
             return NbtDeserializer.this.frame(
-                    this.elements::next,
+                    () -> element,
                     () -> this.valueEndec.decode(this.ctx, NbtDeserializer.this),
                     false
             );

src/main/java/io/wispforest/owo/serialization/format/nbt/NbtSerializer.java

@@ -106,7 +106,7 @@ public <V> void writeOptional(SerializationContext ctx, Endec<V> endec, Optional
         this.frame(encoded -> {
             try (var struct = this.struct()) {
                 struct.field("present", ctx, Endec.BOOLEAN, optional.isPresent());
-                optional.ifPresent(value -> struct.field("value", ctx, endec, value));
+                optional.ifPresent(value -> struct.field("value", ctx.withoutAttributes(OptionalFieldFlag.INSTANCE), endec, value));
             }
 
             var compound = encoded.require("optional representation");