use either codec to make single-generator shading require less input

Pixaurora · Oct 16, 2023 · 6a28d9a · 6a28d9a
1 parent 8629480
commit 6a28d9a
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/main/java/net/pixaurora/janerator/shade/method/ShadingMethod.java b/src/main/java/net/pixaurora/janerator/shade/method/ShadingMethod.java
@@ -2,7 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
+import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
 
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -12,7 +14,20 @@
 
 public interface ShadingMethod extends SpecifiesType<ShadingMethod> {
     public static final List<SerialType<ShadingMethod>> TYPES = new ArrayList<>(List.of(NormalShading.TYPE));
-    public static final Codec<ShadingMethod> CODEC = new SerialType.Group<>("Shading method", TYPES).dispatchCodec();
+    public static final Codec<ShadingMethod> BASE_CODEC = new SerialType.Group<>("Shading method", TYPES).dispatchCodec();
+    public static final Codec<ShadingMethod> CODEC = Codec.either(
+        ChunkGenerator.CODEC,
+        ShadingMethod.BASE_CODEC
+    ).xmap(
+        either -> either.map(NormalShading::new, Function.identity()),
+        shading -> {
+            if (shading instanceof NormalShading basicShading) {
+                return Either.left(basicShading.generator());
+            } else {
+                return Either.right(shading);
+            }
+        }
+    );
 
     public List<ShadeData> shadeIn(List<Coordinate> points);