[1.20.2] Endec - Simplier Codec Alternative #184

Dragon-Seeker · 2023-10-10T23:28:38Z

Endec is an implementation based on a previous attempt and Codec by @gliscowo. Such is an attempt at being a similar but different alternative Minecraft DFU system Codec.

Features:

Support for Networking by default (ByteBuf implementations like PacketByteBuf)
Less Functional Programming
Interop with Minecraft Codec

Such still requires refinement as such still lacks some of the various DFU implementations like MapCodec and possibly changes to general implementations.

BasiqueEvangelist · 2023-10-10T23:32:07Z

code eck

- Adjust "any" methods to better reflect where they are located - Fix error within writeAny for json and nbt - Implement readAny NBT - Add AW for forwarding Dyn Ops - Fix errors within testing command

AlphaMode · 2023-10-11T02:42:30Z

Bode ck

BasiqueEvangelist

æ

BasiqueEvangelist · 2023-10-14T14:31:46Z

src/main/java/io/wispforest/owo/serialization/Codeck.java

+    //Kinda mega cursed but...
+    static <e, T> Codeck<T> of(BiConsumer<Serializer<e>, T> encode, Function<Deserializer<e>, T> decode) {
+        return new Codeck<T>() {
+            @Override
+            public <E> void encode(Serializer<E> serializer, T value) {
+                encode.accept((Serializer<e>) serializer, value);
+            }
+
+            @Override
+            public <E> T decode(Deserializer<E> deserializer) {
+                return decode.apply((Deserializer<e>) deserializer);
+            }
+        };
+    }


This would be a bit cleaner if encode and decode were bespoke interfaces that had the proper generics in them

I really would not want to split such into separate interfaces

src/main/java/io/wispforest/owo/serialization/Codeck.java

BasiqueEvangelist · 2023-10-14T14:42:32Z

src/main/java/io/wispforest/owo/serialization/impl/MapCodeck.java

+        return new MapCodeck<>(codeck, s -> s, s -> s);
+    }
+
+    public <R> MapCodeck<R, V> keyThen(Function<K, R> toFunc, Function<R, K> fromFunc) {


Is this method in the Public API? IntelliJ might complain about using it outside of owo if the impl package is made internal

Possible, such is still up in the air about how the folder structure should be done.

BasiqueEvangelist · 2023-10-14T14:48:37Z

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

+
+    protected final Deque<Supplier<NbtElement>> stack = new ArrayDeque<>();
+
+    private boolean unsafe = true;


This doesn't really make it unsafe, though. All it does is make it lax on format errors

I would call such unsafe but I am up for a better name

src/main/java/io/wispforest/owo/serialization/Codeck.java

…lization using Attributes - Add Variable Length Ints

- Adjust networking test - Fix improper encode and decode for String - Use VAR_INT codeck for enum

src/main/java/io/wispforest/owo/serialization/Codeck.java

BasiqueEvangelist · 2023-10-22T16:37:03Z

src/main/java/io/wispforest/owo/serialization/Codeck.java

+                            StructField.of("z", StructCodeck.INT, BlockPos::getX),
+                            BlockPos::new
+                    ),
+                    SerializationAttribute.HUMAN_READABLE


Won't this result in hard to edit NBT?

Maybe, I have no clue how such would be represented, to say the least. It was mostly just a guess

src/main/java/io/wispforest/owo/serialization/Deserializer.java

BasiqueEvangelist · 2023-10-22T16:40:44Z

src/main/java/io/wispforest/owo/serialization/Endable.java

+/**
+ * Interface that indicates that the object has an end operation to such
+ */


IMHO it would be nicer to just make an interface that extends AutoCloseable and just makes close not throw anything, kind of like InfallibleCloseable in gadget.

Possibly a good idea as such exists just as a way to prevent issues with calling close method and end is just used due to what glisco used within her version.

BasiqueEvangelist · 2023-10-22T16:44:29Z

src/main/java/io/wispforest/owo/serialization/SelfDescribedSerializer.java

+
+    @Override
+    default <V> void writeOptional(Codeck<V> codeck, Optional<V> optional) {
+        optional.ifPresentOrElse(v -> codeck.encode(this, v), this::empty);


Don't NbtEnds disappear after serialization, making deserialization use the default field value instead?

Unknown, keeping such until fully confirm that it is not required as I don't want to just discard such just yet

BasiqueEvangelist · 2023-10-22T16:48:22Z

src/main/java/io/wispforest/owo/serialization/impl/CooptCodeck.java

+        }
+
+        return error
+                ? DataResult.error(exception != null ? exception::getMessage : () -> "The corresponding Format for the given DynamicOps could not be located!")


This shouldn't really be a problem, as if you get a funky DynamicOps you can always just NbtOps or JsonOps and then convert everything to the needed dynamic ops

True but I rather have this error instead to properly map such due to how conversion between formats can cause a lose of information potentially

src/main/java/io/wispforest/owo/serialization/impl/ListCodeck.java

BasiqueEvangelist · 2023-10-22T16:53:14Z

src/main/java/io/wispforest/owo/serialization/impl/SerializationAttribute.java

+    SELF_DESCRIBING(),
+    BINARY(),
+    HUMAN_READABLE(),
+    COMPRESSED();


As in compressed with gzip/whatever? Why would a Codeck want to care about this?

As in the the data should be as small as possible but still hold onto some form of structure as in not intended to be human readable but still can be read in a sense based on order or something

…fferently

BasiqueEvangelist · 2023-10-23T05:33:29Z

src/main/java/io/wispforest/owo/serialization/Codeck.java

+                    SerializationAttribute.HUMAN_READABLE)
+            .orElse(Codeck.LONG.then(ChunkPos::new, ChunkPos::toLong));
+
+    Codeck<BitSet> BITSET = Codeck.LONG_ARRAY.then(BitSet::valueOf, BitSet::toLongArray);


won't this lose the precise length of the bitset?

Unknown but such was copied from PacketBufSerilizer which calls writeBitSet and readBitSet using a long array within PacketByteBuf

src/main/java/io/wispforest/owo/serialization/SequenceDeserializer.java

src/main/java/io/wispforest/owo/serialization/impl/StructCodeckBuilder.java

- Fix list method for changing the list constructor Co-Authored-By: BasiqueEvangelist <[email protected]>

…OwoHandshake

…ed method call on StructDeserializer Co-Authored-By: BasiqueEvangelist <[email protected]>

BasiqueEvangelist

Ant & Dec

BasiqueEvangelist · 2023-10-25T07:00:33Z

src/main/java/io/wispforest/owo/network/OwoHandshake.java

+    private static final Endec<Map<Identifier, Integer>> RESPONSE_SERIALIZER =
+            (Endec<Map<Identifier, Integer>>) (Object) ReflectionEndecBuilder.createMapSerializer(Map.class, Identifier.class, Integer.class);


This should probably be updated to use a proper MapEndec

BasiqueEvangelist · 2023-10-25T07:02:47Z

src/main/java/io/wispforest/owo/serialization/Endec.java

+
+    <E> T decode(Deserializer<E> deserializer);
+
+    default <E> E encode(Supplier<Serializer<E>> serializerCreator, T value){


why does this take a supplier if it just invokes it once anyways

It is an easy way of constructing a supplier of the desired serializer type and returning the value held by such serializer as the return.

BasiqueEvangelist · 2023-10-25T07:04:46Z

src/main/java/io/wispforest/owo/serialization/SequenceDeserializer.java

+    boolean hasNext();
+
+    E next();


Doesn't Iterator have these methods anyways? 🤨

Did such as a note to what is being implemented exactly and needs to be implemented

BasiqueEvangelist · 2023-10-25T07:07:34Z

src/main/java/io/wispforest/owo/serialization/impl/StructField.java

+
+public class StructField<S, F> {
+
+    public MutableObject<F> defaultValue = null;


Why is this a MutableObject?

Such acts as a way of telling if a given value is defaulted. Such allows for the default value of null as setting the mutable object to be a instance of what ever defaulted value wanted.

What
You mean like it can either be null (required), or non-null, containing the actual default value?

Yes, with the default value allowing for either a value of the given type or null

…deserialization

- Add KeyField - Adjust StructField to be a extenstion of KeyField - Add various helper method ontop of KeyField and StructField - Adjust Nbt and Json Serializers for Prefix support

…pedRecipe

- remove compressed and binary attributes as they both serve little purpose - update SelfDescribedDeserializer#readAny to accept a Serializer as a visitor to construct data instead of converting to intermediate types - reimplement JsonEndec and NbtEndec on top of updated readAny(...) specification - experimental implementation for Endec.ofCodec

…se (de)serializer interfaces

BasiqueEvangelist · 2023-11-17T21:40:15Z

src/main/java/io/wispforest/owo/serialization/impl/json/JsonDeserializer.java

+                var value = primitive.getAsBigDecimal();
+
+                try {
+                    var asLong = value.longValueExact();
+
+                    if ((byte) asLong == asLong) {
+                        visitor.writeByte(element.getAsByte());
+                    } else if ((short) asLong == asLong) {
+                        visitor.writeShort(element.getAsShort());
+                    } else if ((int) asLong == asLong) {
+                        visitor.writeInt(element.getAsInt());
+                    } else {
+                        visitor.writeLong(asLong);
+                    }
+                } catch (ArithmeticException bruh /* quite cringe java moment, why use an exception for this */) {
+                    var asDouble = value.doubleValue();
+
+                    if ((float) asDouble == asDouble) {
+                        visitor.writeFloat(element.getAsFloat());
+                    } else {
+                        visitor.writeDouble(asDouble);
+                    }
+                }


couldn't you just use .getAsNumber and then check the type of the returned value?

…-serializer method ordering, remove binary nbt format

This is for the few that have been left behind with Mojang's implementation of Codec and lack the ability to handle any of their 17 field objects.

… codec

…ated accesswidener entries

Also add support for nested generic calls with Map, List and Set on the getGeneric method

- separate non-primitive endecs into BuiltInEndecs - use wildcard generics on (De)Serializer parameters - implement Endec.dispatchedStruct for DFU parity

…umentation to Endec interface

…e (always require a default value), refactor StructField to be independent of now-different KeyedEndec

Initial Codeck implementation

f6d935b

Dragon-Seeker changed the title ~~[1.20.2] Implement Simplier Codeck Alternative~~ [1.20.2] Implement Simplier Codec Alternative Oct 10, 2023

Method refactors and fix errors

7ac9a08

- Adjust "any" methods to better reflect where they are located - Fix error within writeAny for json and nbt - Implement readAny NBT - Add AW for forwarding Dyn Ops - Fix errors within testing command

BasiqueEvangelist reviewed Oct 14, 2023

View reviewed changes

Dragon-Seeker added 2 commits October 21, 2023 17:54

Implement More Targeted approach for doing different methods of steri…

dd47bef

…lization using Attributes - Add Variable Length Ints

Implement Codeck within Owo Networking

e13e5c3

- Adjust networking test - Fix improper encode and decode for String - Use VAR_INT codeck for enum

BasiqueEvangelist reviewed Oct 22, 2023

View reviewed changes

Dragon-Seeker added 3 commits October 22, 2023 16:42

Adjust Attributes use case within De-Serilizers

e090877

Remove SelfDescribedSerilalizer and handle Format Specific Codecks di…

cb59dbc

…fferently

Fix incorrect constructor calls

8559f26

BasiqueEvangelist reviewed Oct 23, 2023

View reviewed changes

Dragon-Seeker and others added 2 commits October 23, 2023 16:44

Preallocate list and map with the given size before adding entries

440e0be

- Fix list method for changing the list constructor Co-Authored-By: BasiqueEvangelist <[email protected]>

Adjust Test Command for Codeck and Replace PacketBufSeriaizer within …

f6c017d

…OwoHandshake

Dragon-Seeker force-pushed the 1.20.2-Codeck branch from 3c8c9f6 to f6c017d Compare October 23, 2023 21:46

Dragon-Seeker and others added 3 commits October 23, 2023 17:12

Resolve issue with inablity to have StructField be called with requir…

2a9e5bd

…ed method call on StructDeserializer Co-Authored-By: BasiqueEvangelist <[email protected]>

Rename unsafe to safeHandling

7336ee7

Change name to Endec as the possible final name

08cde20

Dragon-Seeker changed the title ~~[1.20.2] Implement Simplier Codec Alternative~~ [1.20.2] Endec - Simplier Codec Alternative Oct 24, 2023

Fix Coopt Class name and add easy way of converting to DFU Codec

cfdfc6b

BasiqueEvangelist reviewed Oct 25, 2023

View reviewed changes

Add test for CooptCodec and adjust how error recover is handled with …

2247a50

…deserialization

Dragon-Seeker mentioned this pull request Oct 30, 2023

[1.20] Rework to NbtKey.Type #162

Closed

Dragon-Seeker and others added 4 commits November 7, 2023 17:23

Implement MapCarrier with Endec

d14078f

- Add KeyField - Adjust StructField to be a extenstion of KeyField - Add various helper method ontop of KeyField and StructField - Adjust Nbt and Json Serializers for Prefix support

Implement BinaryNbtSerializer and fix class loading issue with UwUSha…

3bcfaca

…pedRecipe

[endec] move struct-, sequence- and map- (de)serializer types into ba…

ed9d552

…se (de)serializer interfaces

BasiqueEvangelist reviewed Nov 17, 2023

View reviewed changes

[endec] clean up all (de)serializer implementations, standardize (de)…

1b3b887

…-serializer method ordering, remove binary nbt format

Dragon-Seeker force-pushed the 1.20.2-Codeck branch from 289f1d4 to d7c7341 Compare November 19, 2023 00:13

gliscowo force-pushed the 1.20.2-Codeck branch from d7c7341 to 1b3b887 Compare November 19, 2023 00:18

Dragon-Seeker and others added 12 commits November 18, 2023 18:24

Just going to leave this here

7d71fec

This is for the few that have been left behind with Mojang's implementation of Codec and lack the ability to handle any of their 17 field objects.

[endec] do you like electronic dance music?

6a7d27e

[endec] add support for assuming attributes when embedding endec into…

a6588c6

… codec

[endec] remove reimplementations of vanilla recipes codecs and associ…

797d059

…ated accesswidener entries

[endec] quote field names in deserializer error messages

7ba7a8a

[endec] superficial cleanup

5251110

Cleanup ReflectionEndecBuilder

192dae0

Also add support for nested generic calls with Map, List and Set on the getGeneric method

[endec] initial cleanup on endec interface

e4f8808

- separate non-primitive endecs into BuiltInEndecs - use wildcard generics on (De)Serializer parameters - implement Endec.dispatchedStruct for DFU parity

[endec] remove MapEndec and ListEndec classes, being adding basic doc…

269f57a

…umentation to Endec interface

[endec] refactor MapCarrier implementations and related infrastructur…

9508b19

…e (always require a default value), refactor StructField to be independent of now-different KeyedEndec

[endec] add Endec.forEnum

9b0cc57

Merge branch '1.20.2' into 1.20.2-Codeck

9a6edbe

Dragon-Seeker closed this Nov 21, 2023

Dragon-Seeker deleted the 1.20.2-Codeck branch November 21, 2023 00:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[1.20.2] Endec - Simplier Codec Alternative #184

[1.20.2] Endec - Simplier Codec Alternative #184

Dragon-Seeker commented Oct 10, 2023 •

edited

Loading

BasiqueEvangelist commented Oct 10, 2023

AlphaMode commented Oct 11, 2023

BasiqueEvangelist left a comment

BasiqueEvangelist Oct 14, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 14, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 14, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 22, 2023

Dragon-Seeker Oct 22, 2023

BasiqueEvangelist Oct 22, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 22, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 22, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 22, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 23, 2023

Dragon-Seeker Oct 23, 2023

BasiqueEvangelist left a comment

BasiqueEvangelist Oct 25, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 25, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 25, 2023

Dragon-Seeker Oct 25, 2023

Dragon-Seeker Nov 9, 2023

BasiqueEvangelist Oct 25, 2023

Dragon-Seeker Oct 25, 2023

BasiqueEvangelist Oct 26, 2023

Dragon-Seeker Oct 26, 2023

BasiqueEvangelist Nov 17, 2023


		protected final Deque<Supplier<NbtElement>> stack = new ArrayDeque<>();

		private boolean unsafe = true;

		private static final Endec<Map<Identifier, Integer>> RESPONSE_SERIALIZER =
		(Endec<Map<Identifier, Integer>>) (Object) ReflectionEndecBuilder.createMapSerializer(Map.class, Identifier.class, Integer.class);


		<E> T decode(Deserializer<E> deserializer);

		default <E> E encode(Supplier<Serializer<E>> serializerCreator, T value){


		public class StructField<S, F> {

		public MutableObject<F> defaultValue = null;

[1.20.2] Endec - Simplier Codec Alternative #184

[1.20.2] Endec - Simplier Codec Alternative #184

Conversation

Dragon-Seeker commented Oct 10, 2023 • edited Loading

BasiqueEvangelist commented Oct 10, 2023

AlphaMode commented Oct 11, 2023

BasiqueEvangelist left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BasiqueEvangelist left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Dragon-Seeker commented Oct 10, 2023 •

edited

Loading