Moved PositionedColor out of CompoundGradient

Author: LatvianModder

src/main/java/dev/latvian/mods/klib/color/CompoundGradient.java

@@ -8,36 +8,15 @@
 import io.netty.buffer.ByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 
-public record CompoundGradient(List<PositionedColor> colors, PositionedColor[] sorted) implements Gradient {
-	public record PositionedColor(float position, Color color, Easing easing) implements Comparable<PositionedColor> {
-		public static final Codec<PositionedColor> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-			Codec.FLOAT.fieldOf("position").forGetter(PositionedColor::position),
-			Color.CODEC.fieldOf("colors").forGetter(PositionedColor::color),
-			Easing.CODEC.optionalFieldOf("easing", Easing.LINEAR).forGetter(PositionedColor::easing)
-		).apply(instance, PositionedColor::new));
-
-		public static final StreamCodec<ByteBuf, PositionedColor> STREAM_CODEC = StreamCodec.composite(
-			ByteBufCodecs.FLOAT, PositionedColor::position,
-			Color.STREAM_CODEC, PositionedColor::color,
-			Easing.STREAM_CODEC, PositionedColor::easing,
-			PositionedColor::new
-		);
-
-		@Override
-		public int compareTo(@NotNull PositionedColor other) {
-			return Float.compare(position, other.position);
-		}
-	}
-
+public record CompoundGradient(PositionedColor[] sorted) implements Gradient {
 	public static final Codec<CompoundGradient> DIRECT_CODEC = RecordCodecBuilder.create(instance -> instance.group(
-		PositionedColor.CODEC.listOf().fieldOf("colors").forGetter(CompoundGradient::colors)
+		PositionedColor.CODEC.listOf().fieldOf("colors").forGetter(CompoundGradient::getColorList)
 	).apply(instance, CompoundGradient::new));
 
 	public static CompoundGradient ofColors(List<Color> colors) {
@@ -51,10 +30,10 @@ public static CompoundGradient ofColors(List<Color> colors) {
 	}
 
 	public static final Codec<CompoundGradient> CODEC = Codec.either(DIRECT_CODEC, Color.CODEC.listOf()).xmap(e -> e.map(Function.identity(), CompoundGradient::ofColors), g -> g.isSimple() ? Either.right(g.rawColors()) : Either.left(g));
-	public static final StreamCodec<ByteBuf, CompoundGradient> STREAM_CODEC = PositionedColor.STREAM_CODEC.apply(ByteBufCodecs.list()).map(CompoundGradient::new, CompoundGradient::colors);
+	public static final StreamCodec<ByteBuf, CompoundGradient> STREAM_CODEC = PositionedColor.STREAM_CODEC.apply(ByteBufCodecs.list()).map(CompoundGradient::new, CompoundGradient::getColorList);
 
 	public CompoundGradient(List<PositionedColor> colors) {
-		this(colors, colors.toArray(new PositionedColor[0]));
+		this(colors.toArray(new PositionedColor[0]));
 		Arrays.sort(sorted);
 	}
 
@@ -63,9 +42,9 @@ public Color get(float delta) {
 		if (sorted.length == 0) {
 			return Color.TRANSPARENT;
 		} else if (delta <= 0F || sorted.length == 1) {
-			return sorted[0].color;
+			return sorted[0].color();
 		} else if (delta >= 1F) {
-			return sorted[sorted.length - 1].color.get(1F);
+			return sorted[sorted.length - 1].color().get(1F);
 		}
 
 		var left = sorted[0];
@@ -74,24 +53,24 @@ public Color get(float delta) {
 		for (int i = sorted.length - 1; i >= 0; i--) {
 			var c = sorted[i];
 
-			if (c.position <= delta) {
+			if (c.position() <= delta) {
 				left = c;
 				right = i < sorted.length - 1 ? sorted[i + 1] : c;
 				break;
 			}
 		}
 
-		return left.color.lerp(left.easing.ease(KMath.map(delta, left.position, right.position, 0F, 1F)), right.color);
+		return left.color().lerp(left.easing().ease(KMath.map(delta, left.position(), right.position(), 0F, 1F)), right.color());
 	}
 
 	@Override
 	public Gradient resolve() {
 		if (sorted.length == 0) {
 			return Color.TRANSPARENT;
-		} else if (sorted.length == 2 && sorted[0].easing == Easing.LINEAR) {
-			return new LinearPairGradient(sorted[0].color, sorted[sorted.length - 1].color).resolve();
+		} else if (sorted.length == 2 && sorted[0].easing() == Easing.LINEAR) {
+			return new LinearPairGradient(sorted[0].color(), sorted[sorted.length - 1].color()).resolve();
 		} else if (sorted.length == 1) {
-			return sorted[0].color.resolve();
+			return sorted[0].color().resolve();
 		} else {
 			return this;
 		}
@@ -101,19 +80,23 @@ public boolean isSimple() {
 		for (int i = 0; i < sorted.length; i++) {
 			var c = sorted[i];
 
-			if (c.easing != Easing.LINEAR || Math.abs(c.position - (i / (float) (sorted.length - 1))) > 0.001F) {
+			if (c.easing() != Easing.LINEAR || Math.abs(c.position() - (i / (float) (sorted.length - 1))) > 0.001F) {
 				return false;
 			}
 		}
 
 		return true;
 	}
 
+	public List<PositionedColor> getColorList() {
+		return Arrays.asList(sorted);
+	}
+
 	public List<Color> rawColors() {
 		var list = new ArrayList<Color>(sorted.length);
 
 		for (var c : sorted) {
-			list.add(c.color);
+			list.add(c.color());
 		}
 
 		return list;

src/main/java/dev/latvian/mods/klib/color/PositionedColor.java

@@ -0,0 +1,29 @@
+package dev.latvian.mods.klib.color;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import dev.latvian.mods.klib.easing.Easing;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+import org.jetbrains.annotations.NotNull;
+
+public record PositionedColor(float position, Color color, Easing easing) implements Comparable<PositionedColor> {
+	public static final Codec<PositionedColor> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+		Codec.FLOAT.fieldOf("position").forGetter(PositionedColor::position),
+		Color.CODEC.fieldOf("colors").forGetter(PositionedColor::color),
+		Easing.CODEC.optionalFieldOf("easing", Easing.LINEAR).forGetter(PositionedColor::easing)
+	).apply(instance, PositionedColor::new));
+
+	public static final StreamCodec<ByteBuf, PositionedColor> STREAM_CODEC = StreamCodec.composite(
+		ByteBufCodecs.FLOAT, PositionedColor::position,
+		Color.STREAM_CODEC, PositionedColor::color,
+		Easing.STREAM_CODEC, PositionedColor::easing,
+		PositionedColor::new
+	);
+
+	@Override
+	public int compareTo(@NotNull PositionedColor other) {
+		return Float.compare(position, other.position);
+	}
+}