Added GameProfile DataType, InterpolatedFloat, InterpolatedDouble, updated dependencies

Author: LatvianModder

.gitignore

@@ -112,8 +112,7 @@ gradle-app.setting
 **/build/
 
 # Common working directory
-run/
-run_server/
+runs/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar

build.gradle

@@ -5,7 +5,7 @@ plugins {
 	id 'java'
 	id 'idea'
 	id 'maven-publish'
-	id 'net.neoforged.moddev' version "2.0.91"
+	id 'net.neoforged.moddev' version "2.0.106"
 }
 
 ext.ENV = System.getenv()
@@ -45,14 +45,14 @@ neoForge {
 			}
 
 			jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition")
-			gameDirectory = file 'run'
+			gameDirectory = file 'runs/client'
 		}
 
 		server {
 			ideName = 'Server'
 			server()
 			programArgument("--nogui")
-			gameDirectory = file 'run_server'
+			gameDirectory = file 'runs/server'
 		}
 	}
 
@@ -150,5 +150,28 @@ idea {
 	module {
 		downloadSources = true
 		downloadJavadoc = true
+
+		["client", "server"].each {
+			[
+					"config",
+					"crash-reports",
+					"debug",
+					"downloads",
+					"flashback",
+					"local",
+					"logs",
+					"mods",
+					"pack-sync",
+					"profilekeys",
+					"saves",
+					"voicechat_recordings",
+					"command_history.txt",
+					"options.txt",
+					"server.properties",
+					"world",
+			].each { ext ->
+				excludeDirs.add(file("runs/$it/$ext"))
+			}
+		}
 	}
 }

gradle.properties

@@ -10,6 +10,6 @@ mod_author=latvian.dev
 
 mod_version=2105.1.0
 
-neoforge_version=21.5.75
+neoforge_version=21.5.89
 neoForge.parchment.minecraftVersion=1.21.5
-neoForge.parchment.mappingsVersion=2025.06.01
+neoForge.parchment.mappingsVersion=2025.06.15

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'klib'

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

@@ -1,7 +1,9 @@
 package dev.latvian.mods.klib.codec;
 
+import com.mojang.authlib.GameProfile;
 import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.latvian.mods.klib.math.KMath;
 import net.minecraft.Util;
 import net.minecraft.core.SectionPos;
@@ -30,4 +32,9 @@ public interface MCCodecs {
 	Codec<SoundSource> SOUND_SOURCE = KLibCodecs.anyEnumCodec(SoundSource.values(), SoundSource::getName);
 	Codec<BlockState> BLOCK_STATE = Codec.either(BlockState.CODEC, BuiltInRegistries.BLOCK.byNameCodec()).xmap(either -> either.map(Function.identity(), Block::defaultBlockState), state -> state == state.getBlock().defaultBlockState() ? Either.right(state.getBlock()) : Either.left(state));
 	Codec<FluidState> FLUID_STATE = Codec.either(FluidState.CODEC, BuiltInRegistries.FLUID.byNameCodec()).xmap(either -> either.map(Function.identity(), Fluid::defaultFluidState), state -> state == state.getType().defaultFluidState() ? Either.right(state.getType()) : Either.left(state));
+
+	Codec<GameProfile> GAME_PROFILE = RecordCodecBuilder.create(instance -> instance.group(
+		KLibCodecs.UUID.fieldOf("uuid").forGetter(GameProfile::getId),
+		Codec.STRING.fieldOf("name").forGetter(GameProfile::getName)
+	).apply(instance, GameProfile::new));
 }

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

@@ -1,5 +1,6 @@
 package dev.latvian.mods.klib.codec;
 
+import com.mojang.authlib.GameProfile;
 import dev.latvian.mods.klib.math.KMath;
 import dev.latvian.mods.klib.util.Empty;
 import io.netty.buffer.ByteBuf;
@@ -104,4 +105,11 @@ public void encode(ByteBuf buf, CompoundTag value) {
 	StreamCodec<ByteBuf, FluidState> FLUID_STATE = ByteBufCodecs.VAR_INT.map(Fluid.FLUID_STATE_REGISTRY::byId, Fluid.FLUID_STATE_REGISTRY::getId);
 
 	StreamCodec<ByteBuf, ResourceKey<Level>> DIMENSION = KLibStreamCodecs.resourceKey(Registries.DIMENSION);
+
+	StreamCodec<ByteBuf, GameProfile> GAME_PROFILE = CompositeStreamCodec.of(
+		KLibStreamCodecs.UUID, GameProfile::getId,
+		ByteBufCodecs.STRING_UTF8, GameProfile::getName,
+		GameProfile::new
+	);
+
 }

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

@@ -424,6 +424,7 @@ public static <C, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T
 	private final Class<T> typeClass;
 	private DataType<List<T>> listType;
 	private DataType<Set<T>> setType;
+	private DataType<?> componentType;
 
 	private DataType(Codec<T> codec, StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec, Class<T> typeClass) {
 		this.codec = codec;
@@ -458,6 +459,7 @@ public <C> DataTypeField<C, T> optionalField(String name, Function<C, T> getter,
 	public DataType<List<T>> listOf() {
 		if (listType == null) {
 			listType = of(codec.listOf(), KLibStreamCodecs.listOf(streamCodec), Cast.to(List.class));
+			listType.componentType = this;
 		}
 
 		return listType;
@@ -466,11 +468,17 @@ public DataType<List<T>> listOf() {
 	public DataType<Set<T>> setOf() {
 		if (setType == null) {
 			setType = of(KLibCodecs.setOf(codec), KLibStreamCodecs.setOf(streamCodec), Cast.to(Set.class));
+			setType.componentType = this;
 		}
 
 		return setType;
 	}
 
+	@Nullable
+	public DataType<?> getComponentType() {
+		return componentType;
+	}
+
 	@Nullable
 	public Number toNumber(T value) {
 		return switch (value) {
@@ -491,7 +499,9 @@ public Number toNumber(T value) {
 		};
 	}
 
-	public <R> DataType<R> map(Function<T, R> mapper, Function<R, T> reverseMapper, Class<R> typeClass) {
-		return of(codec.xmap(mapper, reverseMapper), streamCodec.map(mapper, reverseMapper), typeClass);
+	@Nullable
+	public ResourceLocation getId() {
+		var t = RegisteredDataType.BY_TYPE.get(this);
+		return t == null ? null : t.id();
 	}
 }

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

@@ -1,5 +1,6 @@
 package dev.latvian.mods.klib.data;
 
+import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.arguments.FloatArgumentType;
@@ -16,6 +17,8 @@
 import dev.latvian.mods.klib.color.Gradient;
 import dev.latvian.mods.klib.easing.Easing;
 import dev.latvian.mods.klib.easing.EasingGroup;
+import dev.latvian.mods.klib.math.InterpolatedDouble;
+import dev.latvian.mods.klib.math.InterpolatedFloat;
 import dev.latvian.mods.klib.math.Line;
 import dev.latvian.mods.klib.math.MovementType;
 import dev.latvian.mods.klib.math.Range;
@@ -25,6 +28,8 @@
 import dev.latvian.mods.klib.util.IntOrUUID;
 import dev.latvian.mods.klib.util.ParsedEntitySelector;
 import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.commands.arguments.DimensionArgument;
+import net.minecraft.commands.arguments.GameProfileArgument;
 import net.minecraft.commands.arguments.ParticleArgument;
 import net.minecraft.commands.arguments.ResourceLocationArgument;
 import net.minecraft.commands.arguments.UuidArgument;
@@ -37,13 +42,17 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.state.BlockState;
@@ -81,6 +90,8 @@ public interface DataTypes {
 	DataType<Vec3> VEC3S = DataType.of(MCCodecs.VEC3S, MCStreamCodecs.VEC3S, Vec3.class);
 	DataType<BlockPos> BLOCK_POS = DataType.of(BlockPos.CODEC, BlockPos.STREAM_CODEC, BlockPos.class);
 	DataType<Integer> TICKS = DataType.of(KLibCodecs.TICKS, ByteBufCodecs.VAR_INT, Integer.class);
+	DataType<GameProfile> GAME_PROFILE = DataType.of(MCCodecs.GAME_PROFILE, MCStreamCodecs.GAME_PROFILE, GameProfile.class);
+	DataType<ResourceKey<Level>> DIMENSION = DataType.of(MCCodecs.DIMENSION, MCStreamCodecs.DIMENSION, (Class) ResourceKey.class);
 
 	static void register() {
 		DataType.register(ID.java("bool"), BOOL, BoolArgumentType::bool, BoolArgumentType::getBool);
@@ -109,6 +120,11 @@ static void register() {
 		DataType.register(ID.mc("vec3s"), VEC3S, () -> Vec3Argument.vec3(), Vec3Argument::getVec3);
 		DataType.register(ID.mc("block_pos"), BLOCK_POS, BlockPosArgument::blockPos, BlockPosArgument::getBlockPos);
 		DataType.register(ID.mc("ticks"), TICKS, () -> KLibCodecs.TIME_ARGUMENT, IntegerArgumentType::getInteger);
+		DataType.register(ID.mc("game_profile"), GAME_PROFILE, GameProfileArgument::gameProfile, (ctx, name) -> {
+			var profiles = GameProfileArgument.getGameProfiles(ctx, name);
+			return profiles.isEmpty() ? null : profiles.iterator().next();
+		});
+		DataType.register(ID.mc("dimension"), DIMENSION, DimensionArgument::dimension, (ctx, name) -> ResourceKey.create(Registries.DIMENSION, ctx.getArgument(name, ResourceLocation.class)));
 
 		DataType.register(KLibMod.id("color"), Color.DATA_TYPE);
 		DataType.register(KLibMod.id("gradient"), Gradient.DATA_TYPE);
@@ -125,5 +141,7 @@ static void register() {
 		DataType.register(KLibMod.id("easing_group"), EasingGroup.DATA_TYPE);
 		DataType.register(KLibMod.id("int_or_uuid"), IntOrUUID.DATA_TYPE);
 		DataType.register(KLibMod.id("line"), Line.DATA_TYPE);
+		DataType.register(KLibMod.id("interpolated_float"), InterpolatedFloat.DATA_TYPE);
+		DataType.register(KLibMod.id("interpolated_double"), InterpolatedDouble.DATA_TYPE);
 	}
 }

src/main/java/dev/latvian/mods/klib/math/InterpolatedDouble.java

@@ -0,0 +1,34 @@
+package dev.latvian.mods.klib.math;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import dev.latvian.mods.klib.codec.CompositeStreamCodec;
+import dev.latvian.mods.klib.data.DataType;
+import net.minecraft.network.codec.ByteBufCodecs;
+
+public record InterpolatedDouble(long start, long end, double from, double to) {
+	public static final InterpolatedDouble DEFAULT = new InterpolatedDouble(0L, 0L, 0D, 0D);
+
+	public static final DataType<InterpolatedDouble> DATA_TYPE = DataType.of(RecordCodecBuilder.create(instance -> instance.group(
+		Codec.LONG.fieldOf("start").forGetter(InterpolatedDouble::start),
+		Codec.LONG.fieldOf("end").forGetter(InterpolatedDouble::end),
+		Codec.DOUBLE.fieldOf("from").forGetter(InterpolatedDouble::from),
+		Codec.DOUBLE.fieldOf("to").forGetter(InterpolatedDouble::to)
+	).apply(instance, InterpolatedDouble::new)), CompositeStreamCodec.of(
+		ByteBufCodecs.VAR_LONG, InterpolatedDouble::start,
+		ByteBufCodecs.VAR_LONG, InterpolatedDouble::end,
+		ByteBufCodecs.DOUBLE, InterpolatedDouble::from,
+		ByteBufCodecs.DOUBLE, InterpolatedDouble::to,
+		InterpolatedDouble::new
+	), InterpolatedDouble.class);
+
+	public double get(long now, double delta) {
+		if (now > end) {
+			return to;
+		} else if (now < start) {
+			return from;
+		}
+
+		return KMath.clerp(((now - start - 1L) + delta) / (double) (end - start), from, to);
+	}
+}