Merge branch '1.21-CodecToEndec_NbtFixes' of https://github.com/Drago…

…n-Seeker/owo-lib into 1.21-CodecToEndec_NbtFixes

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

@@ -1,6 +1,5 @@
 package io.wispforest.owo.serialization;
 
-import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.*;
 import io.netty.buffer.ByteBuf;
@@ -13,7 +12,6 @@
 import io.wispforest.endec.format.forwarding.ForwardingSerializer;
 import io.wispforest.owo.mixin.ForwardingDynamicOpsAccessor;
 import io.wispforest.owo.mixin.RegistryOpsAccessor;
-import io.wispforest.owo.serialization.endec.EitherEndec;
 import io.wispforest.owo.serialization.endec.MinecraftEndecs;
 import io.wispforest.owo.serialization.format.ContextHolder;
 import io.wispforest.owo.serialization.format.ContextedDelegatingOps;
@@ -140,26 +138,6 @@ public static <T> Endec<T> toEndecWithRegistries(Codec<T> codec, PacketCodec<Reg
         );
     }
 
-    /**
-     * Create an endec which serializes an instance of {@link Either}, using {@code first}
-     * for the left and {@code second} for the right variant
-     * <p>
-     * In a self-describing format, the serialized representation is simply that of the endec of
-     * whichever variant is represented. In the general for non-self-described formats, the
-     * which variant is represented must also be stored
-     */
-    public static <F, S> Endec<Either<F, S>> eitherEndec(Endec<F> first, Endec<S> second) {
-        return new EitherEndec<>(first, second, false);
-    }
-
-    /**
-     * Like {@link #eitherEndec(Endec, Endec)}, but ensures when decoding from a self-described format
-     * that only {@code first} or {@code second}, but not both, succeed
-     */
-    public static <F, S> Endec<Either<F, S>> xorEndec(Endec<F> first, Endec<S> second) {
-        return new EitherEndec<>(first, second, true);
-    }
-
     //--
 
     /**