Added Instant and Base64 byte[] codecs

Author: LatvianModder

src/main/java/dev/latvian/mods/klib/codec/KLibCodecs.java

@@ -6,12 +6,16 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import com.mojang.util.UndashedUuid;
+import dev.latvian.mods.klib.util.StringUtils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 import net.minecraft.commands.arguments.TimeArgument;
 import net.minecraft.util.StringRepresentable;
 
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -78,6 +82,48 @@ static <T> Codec<List<T>> listOrSelf(Codec<T> elementCodec) {
 	Codec<Integer> INT16 = Codec.intRange(Short.MIN_VALUE, Short.MAX_VALUE);
 	Codec<Integer> UINT16 = Codec.intRange(0, -Short.MIN_VALUE + Short.MAX_VALUE);
 
+	Codec<byte[]> B64_BYTE_ARRAY = Codec.STRING.flatXmap(string -> {
+		try {
+			return DataResult.success(StringUtils.B64_DECODER.decode(string));
+		} catch (Exception ex) {
+			return DataResult.error(() -> "Invalid Base64 string: " + string);
+		}
+	}, array -> {
+		try {
+			return DataResult.success(StringUtils.B64_ENCODER.encodeToString(array));
+		} catch (Exception ex) {
+			return DataResult.error(() -> "Invalid Base64 array: " + Arrays.toString(array));
+		}
+	});
+
+	Codec<Instant> INSTANT = Codec.STRING.flatXmap(string -> {
+		try {
+			return DataResult.success(Instant.parse(string));
+		} catch (Exception ex) {
+			return DataResult.error(() -> "Invalid date: " + string);
+		}
+	}, instant -> {
+		try {
+			return DataResult.success(instant.toString());
+		} catch (Exception ex) {
+			return DataResult.error(() -> "Invalid date: " + instant);
+		}
+	});
+
+	Codec<Instant> ISO_INSTANT = Codec.STRING.flatXmap(string -> {
+		try {
+			return DataResult.success(Instant.from(DateTimeFormatter.ISO_INSTANT.parse(string)));
+		} catch (Exception ex) {
+			return DataResult.error(() -> "Invalid ISO date: " + string);
+		}
+	}, instant -> {
+		try {
+			return DataResult.success(DateTimeFormatter.ISO_INSTANT.format(instant));
+		} catch (Exception ex) {
+			return DataResult.error(() -> "Invalid ISO date: " + instant);
+		}
+	});
+
 	static <E> Codec<E> anyEnumCodec(E[] enumValues, Function<E, String> nameGetter) {
 		var map = new HashMap<String, E>(enumValues.length);
 

src/main/java/dev/latvian/mods/klib/codec/KLibStreamCodecs.java

@@ -12,6 +12,7 @@
 import net.minecraft.tags.TagKey;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -142,6 +143,8 @@ public void encode(RegistryFriendlyByteBuf buf, String value) {
 		}
 	};
 
+	StreamCodec<ByteBuf, Instant> INSTANT = ByteBufCodecs.LONG.map(Instant::ofEpochMilli, Instant::toEpochMilli);
+
 	static <T> StreamCodec<ByteBuf, ResourceKey<T>> resourceKey(ResourceKey<? extends Registry<T>> registry) {
 		return ResourceLocation.STREAM_CODEC.map(id -> ResourceKey.create(registry, id), ResourceKey::location);
 	}

src/main/java/dev/latvian/mods/klib/data/DataTypes.java

@@ -65,6 +65,7 @@
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.Vec3;
 
+import java.time.Instant;
 import java.util.UUID;
 
 public interface DataTypes {
@@ -79,6 +80,9 @@ public interface DataTypes {
 	DataType<Double> DOUBLE = DataType.of(Codec.DOUBLE, ByteBufCodecs.DOUBLE, Double.class);
 	DataType<String> STRING = DataType.of(Codec.STRING, ByteBufCodecs.STRING_UTF8, String.class);
 	DataType<UUID> UUID = DataType.of(KLibCodecs.UUID, KLibStreamCodecs.UUID, UUID.class);
+	DataType<byte[]> B64_BYTE_ARRAY = DataType.of(KLibCodecs.B64_BYTE_ARRAY, ByteBufCodecs.BYTE_ARRAY, byte[].class);
+	DataType<Instant> INSTANT = DataType.of(KLibCodecs.INSTANT, KLibStreamCodecs.INSTANT, Instant.class);
+	DataType<Instant> ISO_INSTANT = DataType.of(KLibCodecs.ISO_INSTANT, KLibStreamCodecs.INSTANT, Instant.class);
 
 	DataType<Component> TEXT_COMPONENT = DataType.of(ComponentSerialization.CODEC, ComponentSerialization.STREAM_CODEC, Component.class);
 	DataType<Mirror> MIRROR = DataType.of(Mirror.values());
@@ -109,6 +113,9 @@ static void register() {
 		DataType.register(ID.java("double"), DOUBLE, () -> DoubleArgumentType.doubleArg(), DoubleArgumentType::getDouble);
 		DataType.register(ID.java("string"), STRING, StringArgumentType::string, StringArgumentType::getString);
 		DataType.register(ID.java("uuid"), UUID, UuidArgument::uuid, UuidArgument::getUuid);
+		DataType.register(ID.java("b64_byte_array"), B64_BYTE_ARRAY);
+		DataType.register(ID.java("instant"), INSTANT);
+		DataType.register(ID.java("iso_instant"), ISO_INSTANT);
 
 		DataType.register(ID.mc("id"), ID.DATA_TYPE, ResourceLocationArgument::id, ResourceLocationArgument::getId);
 		DataType.register(ID.mc("text_component"), TEXT_COMPONENT, ComponentArgument::textComponent, ComponentArgument::getResolvedComponent);

src/main/java/dev/latvian/mods/klib/io/IOUtils.java

@@ -158,23 +158,22 @@ static void appendBytes(Path path, ByteBuffer buf, long remainingBytes) throws I
 	}
 
 	static byte[] digest(String algorithm, Path file) throws NoSuchAlgorithmException, IOException {
-		var md5 = MessageDigest.getInstance(algorithm);
+		var md = MessageDigest.getInstance(algorithm);
 
 		try (var channel = Files.newByteChannel(file)) {
 			var buf = ByteBuffer.allocate(2048);
 
 			while (channel.read(buf) != -1) {
 				buf.flip();
-				md5.update(buf);
+				md.update(buf);
 				buf.clear();
 			}
 
-			return md5.digest();
+			return md.digest();
 		}
 	}
 
 	static String md5(Path file) throws NoSuchAlgorithmException, IOException {
 		return StringUtils.toHex(digest("MD5", file));
 	}
 }
-