From 6f9ea6a51aa709e8b89498c28a696a3d21484495 Mon Sep 17 00:00:00 2001
From: gniftygnome <minecraft@gnifty.net>
Date: Wed, 27 Mar 2024 16:16:07 -0700
Subject: [PATCH] Update to 24w13a.

- Update to 24w13a
- Upgrade to Biolith 2
---
 .../structure/arch/CanyonArchStructure.java   |  4 ++--
 .../structure/volcano/VolcanoStructure.java   |  3 ++-
 .../foliageplacers/CanopyFoliagePlacer.java   |  5 ++--
 .../foliageplacers/CypressFoliagePlacer.java  |  4 ++--
 .../tree/foliageplacers/DotShrubPlacer.java   |  5 ++--
 .../JapaneseCanopyFoliagePlacer.java          |  5 ++--
 .../foliageplacers/NoneFoliagePlacer.java     |  4 ++--
 .../foliageplacers/PalmFanFoliagePlacer.java  |  5 ++--
 .../PredictiveSpruceFoliagePlacer.java        |  4 ++--
 .../SmallCanopyFoliagePlacer.java             |  5 ++--
 .../SmallLogSphereFoliagePlacer.java          |  5 ++--
 .../foliageplacers/SphereFoliagePlacer.java   |  5 ++--
 .../DanglingLeavesTreeDecorator.java          |  4 ++--
 .../treedecorators/SakuraTreeDecorator.java   |  4 ++--
 .../tree/trunkplacers/BentTrunkPlacer.java    |  5 ++--
 .../CanopyTree4BranchTrunkPlacer.java         |  5 ++--
 .../tree/trunkplacers/DirectionHelper.java    |  1 -
 .../FallenStraightTrunkPlacer.java            |  4 ++--
 .../tree/trunkplacers/MegaTrunkPlacer.java    |  4 ++--
 .../QuarteredMegaCanopyTrunkPlacer.java       |  5 ++--
 .../trunkplacers/RubberTreeTrunkPlacer.java   |  5 ++--
 .../SaguaroCactusTrunkPlacer.java             |  5 ++--
 .../SmallBranchingTrunkPlacer.java            |  5 ++--
 .../SmallCanopyTree4BranchTrunkPlacer.java    |  5 ++--
 .../tree/trunkplacers/SpindlyTrunkPlacer.java |  5 ++--
 .../init/TerrestriaFoliagePlacerTypes.java    |  6 ++---
 .../terrestria/init/TerrestriaStructures.java |  4 ++--
 .../init/TerrestriaTreeDecorators.java        |  4 ++--
 .../init/TerrestriaTrunkPlacerTypes.java      |  6 ++---
 .../SurfaceLevelFilterPlacementModifier.java  |  5 ++--
 .../TerrestriaPlacementModifierType.java      |  6 ++---
 .../mixin/TreeDecoratorTypeAccessor.java      |  4 ++--
 .../worldgen/structure/ocean_volcano.json     |  6 ++---
 .../worldgen/structure/shore_volcano.json     |  6 ++---
 .../worldgen/structure/volcano.json           |  6 ++---
 gradle.properties                             | 24 +++++++++----------
 .../surfacerules/TerrestriaSurfaceRules.java  | 10 --------
 37 files changed, 82 insertions(+), 116 deletions(-)

diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/structure/arch/CanyonArchStructure.java b/common/src/main/java/com/terraformersmc/terrestria/feature/structure/arch/CanyonArchStructure.java
index 136f3580..e2244c52 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/structure/arch/CanyonArchStructure.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/structure/arch/CanyonArchStructure.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.structure.arch;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.terraformersmc.terrestria.feature.helpers.placement.StructureCanGenerate;
 import com.terraformersmc.terrestria.init.TerrestriaStructures;
 import net.minecraft.structure.*;
@@ -11,7 +11,7 @@
 import java.util.Optional;
 
 public class CanyonArchStructure extends Structure {
-	public static final Codec<CanyonArchStructure> CODEC = CanyonArchStructure.createCodec(CanyonArchStructure::new);
+	public static final MapCodec<CanyonArchStructure> CODEC = CanyonArchStructure.createCodec(CanyonArchStructure::new);
 
 	public CanyonArchStructure(Structure.Config config) {
 		super(config);
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/structure/volcano/VolcanoStructure.java b/common/src/main/java/com/terraformersmc/terrestria/feature/structure/volcano/VolcanoStructure.java
index 1d1fbf68..b541cca5 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/structure/volcano/VolcanoStructure.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/structure/volcano/VolcanoStructure.java
@@ -1,6 +1,7 @@
 package com.terraformersmc.terrestria.feature.structure.volcano;
 
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.Terrestria;
 import com.terraformersmc.terrestria.init.TerrestriaBiomes;
@@ -17,7 +18,7 @@
 import java.util.Optional;
 
 public class VolcanoStructure extends Structure {
-    public static final Codec<VolcanoStructure> CODEC = RecordCodecBuilder.create(instance -> instance.group(VolcanoStructure.configCodecBuilder(instance),
+    public static final MapCodec<VolcanoStructure> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(VolcanoStructure.configCodecBuilder(instance),
 			IntProvider.NON_NEGATIVE_CODEC.fieldOf("height").forGetter(arg -> arg.height),
 			Codec.INT.fieldOf("base_y").forGetter(arg -> arg.baseY),
 			Codec.BOOL.fieldOf("thin_if_tall").forGetter(arg -> arg.thinIfTall)
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CanopyFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CanopyFoliagePlacer.java
index 144fdf42..bdaf9ec7 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CanopyFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CanopyFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.shapes.api.Position;
 import com.terraformersmc.terraform.shapes.impl.Shapes;
@@ -18,8 +18,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class CanopyFoliagePlacer extends FoliagePlacer {
-
-	public static final Codec<CanopyFoliagePlacer> CODEC = RecordCodecBuilder.create(instance ->
+	public static final MapCodec<CanopyFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec(instance ->
 			fillFoliagePlacerFields(instance).apply(instance, CanopyFoliagePlacer::new));
 
 	public CanopyFoliagePlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CypressFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CypressFoliagePlacer.java
index 714dc0cf..8bd92f92 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CypressFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/CypressFoliagePlacer.java
@@ -2,7 +2,7 @@
 
 import java.util.function.Consumer;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaFoliagePlacerTypes;
 
@@ -16,7 +16,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class CypressFoliagePlacer extends FoliagePlacer {
-	public static final Codec<CypressFoliagePlacer> CODEC = RecordCodecBuilder.create(instance ->
+	public static final MapCodec<CypressFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec(instance ->
 			fillFoliagePlacerFields(instance).apply(instance, CypressFoliagePlacer::new));
 
 	public CypressFoliagePlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/DotShrubPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/DotShrubPlacer.java
index 8b9b2539..7ab7eeb2 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/DotShrubPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/DotShrubPlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaFoliagePlacerTypes;
 
@@ -15,8 +15,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class DotShrubPlacer extends FoliagePlacer {
-
-	public static final Codec<DotShrubPlacer> CODEC = RecordCodecBuilder.create(dotShrubPlacerInstance ->
+	public static final MapCodec<DotShrubPlacer> CODEC = RecordCodecBuilder.mapCodec(dotShrubPlacerInstance ->
 			fillFoliagePlacerFields(dotShrubPlacerInstance).apply(dotShrubPlacerInstance, DotShrubPlacer::new));
 
 	public DotShrubPlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/JapaneseCanopyFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/JapaneseCanopyFoliagePlacer.java
index bf0c3151..eced6952 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/JapaneseCanopyFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/JapaneseCanopyFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.shapes.api.Position;
 import com.terraformersmc.terraform.shapes.impl.Shapes;
@@ -18,8 +18,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class JapaneseCanopyFoliagePlacer extends FoliagePlacer {
-
-	public static final Codec<JapaneseCanopyFoliagePlacer> CODEC = RecordCodecBuilder.create(instance ->
+	public static final MapCodec<JapaneseCanopyFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec(instance ->
 			fillFoliagePlacerFields(instance).apply(instance, JapaneseCanopyFoliagePlacer::new));
 
 	public JapaneseCanopyFoliagePlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/NoneFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/NoneFoliagePlacer.java
index 29644763..f023f7c4 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/NoneFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/NoneFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.terraformersmc.terrestria.init.TerrestriaFoliagePlacerTypes;
 
 import net.minecraft.util.math.intprovider.ConstantIntProvider;
@@ -14,7 +14,7 @@
 public class NoneFoliagePlacer extends FoliagePlacer {
 	private static final IntProvider ZERO = ConstantIntProvider.create(0);
 	// This has to come last, because static initialization order is important!
-	public static final Codec<NoneFoliagePlacer> CODEC = Codec.unit(new NoneFoliagePlacer());
+	public static final MapCodec<NoneFoliagePlacer> CODEC = MapCodec.unit(new NoneFoliagePlacer());
 
 	public NoneFoliagePlacer() {
 		super(ZERO, ZERO);
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PalmFanFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PalmFanFoliagePlacer.java
index de709789..5106f9c1 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PalmFanFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PalmFanFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaFoliagePlacerTypes;
 
@@ -15,8 +15,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class PalmFanFoliagePlacer extends FoliagePlacer {
-
-	public static final Codec<PalmFanFoliagePlacer> CODEC = RecordCodecBuilder.create((instance) ->
+	public static final MapCodec<PalmFanFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec((instance) ->
 			fillFoliagePlacerFields(instance).apply(instance, PalmFanFoliagePlacer::new));
 
 	public PalmFanFoliagePlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PredictiveSpruceFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PredictiveSpruceFoliagePlacer.java
index 23a6c038..b73c51fd 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PredictiveSpruceFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/PredictiveSpruceFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.leaves.block.ExtendedLeavesBlock;
 import com.terraformersmc.terrestria.init.TerrestriaFoliagePlacerTypes;
@@ -19,7 +19,7 @@
 public class PredictiveSpruceFoliagePlacer extends SpruceFoliagePlacer {
 	// Copied from SpruceFoliagePlacer. There doesn't appear to be a convenient way to turn a SpruceFoliagePlacer into a
 	// PredictiveSpruceFoliagePlacer.
-	public static final Codec<PredictiveSpruceFoliagePlacer> CODEC = RecordCodecBuilder.create(instance ->
+	public static final MapCodec<PredictiveSpruceFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec(instance ->
 		fillFoliagePlacerFields(instance).and(
 				IntProvider.createValidatingCodec(0, 28)
 						.fieldOf("trunk_height")
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallCanopyFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallCanopyFoliagePlacer.java
index 964beb24..80112abb 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallCanopyFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallCanopyFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.shapes.api.Position;
 import com.terraformersmc.terraform.shapes.impl.Shapes;
@@ -18,8 +18,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class SmallCanopyFoliagePlacer extends SmallFoliagePlacer {
-
-	public static final Codec<SmallCanopyFoliagePlacer> CODEC = RecordCodecBuilder.create(smallCanopyFoliagePlacerInstance ->
+	public static final MapCodec<SmallCanopyFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec(smallCanopyFoliagePlacerInstance ->
 			fillFoliagePlacerFields(smallCanopyFoliagePlacerInstance).apply(smallCanopyFoliagePlacerInstance, SmallCanopyFoliagePlacer::new));
 
 	public SmallCanopyFoliagePlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallLogSphereFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallLogSphereFoliagePlacer.java
index d37bbee8..db3e74ce 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallLogSphereFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SmallLogSphereFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.shapes.api.Position;
 import com.terraformersmc.terraform.shapes.impl.Shapes;
@@ -16,8 +16,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class SmallLogSphereFoliagePlacer extends SmallFoliagePlacer {
-
-	public static final Codec<SmallLogSphereFoliagePlacer> CODEC = RecordCodecBuilder.create(smallLogSphereFoliagePlacerInstance ->
+	public static final MapCodec<SmallLogSphereFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec(smallLogSphereFoliagePlacerInstance ->
 			fillFoliagePlacerFields(smallLogSphereFoliagePlacerInstance).apply(smallLogSphereFoliagePlacerInstance, SmallLogSphereFoliagePlacer::new));
 
 	public SmallLogSphereFoliagePlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SphereFoliagePlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SphereFoliagePlacer.java
index c92b4239..4418420d 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SphereFoliagePlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/foliageplacers/SphereFoliagePlacer.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.foliageplacers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.shapes.api.Position;
 import com.terraformersmc.terraform.shapes.impl.Shapes;
@@ -17,8 +17,7 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class SphereFoliagePlacer extends FoliagePlacer {
-
-	public static final Codec<SphereFoliagePlacer> CODEC = RecordCodecBuilder.create(instance ->
+	public static final MapCodec<SphereFoliagePlacer> CODEC = RecordCodecBuilder.mapCodec(instance ->
 			fillFoliagePlacerFields(instance).apply(instance, SphereFoliagePlacer::new));
 
 	public SphereFoliagePlacer(IntProvider radius, IntProvider offset) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/DanglingLeavesTreeDecorator.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/DanglingLeavesTreeDecorator.java
index 6a40e925..a765750d 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/DanglingLeavesTreeDecorator.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/DanglingLeavesTreeDecorator.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.treedecorators;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaTreeDecorators;
 import net.minecraft.block.AbstractBlock;
@@ -13,7 +13,7 @@
 import net.minecraft.world.gen.treedecorator.TreeDecoratorType;
 
 public class DanglingLeavesTreeDecorator extends TreeDecorator {
-	public static final Codec<DanglingLeavesTreeDecorator> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+	public static final MapCodec<DanglingLeavesTreeDecorator> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
 			BlockState.CODEC.fieldOf("state").forGetter(decorator -> decorator.state))
 			.apply(instance, DanglingLeavesTreeDecorator::new));
 	private final BlockState state;
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/SakuraTreeDecorator.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/SakuraTreeDecorator.java
index 9cb7008c..23435f4b 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/SakuraTreeDecorator.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/treedecorators/SakuraTreeDecorator.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.feature.tree.treedecorators;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.terraformersmc.terraform.wood.block.SmallLogBlock;
 import com.terraformersmc.terrestria.init.TerrestriaBlocks;
 import com.terraformersmc.terrestria.init.TerrestriaTreeDecorators;
@@ -16,7 +16,7 @@
 import net.minecraft.world.gen.treedecorator.TreeDecoratorType;
 
 public class SakuraTreeDecorator extends TreeDecorator {
-	public static Codec<SakuraTreeDecorator> CODEC = Codec.unit(new SakuraTreeDecorator());
+	public static MapCodec<SakuraTreeDecorator> CODEC = MapCodec.unit(new SakuraTreeDecorator());
 
 	@Override
 	protected TreeDecoratorType<?> getType() {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/BentTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/BentTrunkPlacer.java
index c232d8cf..9a008084 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/BentTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/BentTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
 
@@ -19,8 +19,7 @@
 import java.util.function.BiConsumer;
 
 public class BentTrunkPlacer extends TrunkPlacer {
-
-	public static final Codec<BentTrunkPlacer> CODEC = RecordCodecBuilder.create((bentTrunkPlacerInstance) ->
+	public static final MapCodec<BentTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec((bentTrunkPlacerInstance) ->
 			fillTrunkPlacerFields(bentTrunkPlacerInstance).apply(bentTrunkPlacerInstance, BentTrunkPlacer::new));
 
 	public BentTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/CanopyTree4BranchTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/CanopyTree4BranchTrunkPlacer.java
index c58cdc7c..6be736fb 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/CanopyTree4BranchTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/CanopyTree4BranchTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
 import net.minecraft.block.BlockState;
@@ -20,8 +20,7 @@
 import java.util.function.BiConsumer;
 
 public class CanopyTree4BranchTrunkPlacer extends TrunkPlacer {
-
-	public static final Codec<CanopyTree4BranchTrunkPlacer> CODEC = RecordCodecBuilder.create((straightTrunkWith4BranchesPlacerInstance ->
+	public static final MapCodec<CanopyTree4BranchTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec((straightTrunkWith4BranchesPlacerInstance ->
 			fillTrunkPlacerFields(straightTrunkWith4BranchesPlacerInstance).apply(straightTrunkWith4BranchesPlacerInstance, CanopyTree4BranchTrunkPlacer::new)));
 
 	public CanopyTree4BranchTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/DirectionHelper.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/DirectionHelper.java
index 574934eb..f706fadb 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/DirectionHelper.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/DirectionHelper.java
@@ -4,7 +4,6 @@
 import net.minecraft.util.math.random.Random;
 
 public class DirectionHelper {
-
 	/**
 	 * A utility method for getting a direction not the same as the one specified in the horizontal direction
 	 * Often used in tree generation for creating unique branches
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/FallenStraightTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/FallenStraightTrunkPlacer.java
index a0f8eeff..eafd517a 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/FallenStraightTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/FallenStraightTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
 
@@ -22,7 +22,7 @@
 import java.util.function.BiConsumer;
 
 public class FallenStraightTrunkPlacer extends StraightTrunkPlacer {
-	public static final Codec<FallenStraightTrunkPlacer> CODEC = RecordCodecBuilder.create((instance) ->
+	public static final MapCodec<FallenStraightTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec((instance) ->
 		fillTrunkPlacerFields(instance).apply(instance, FallenStraightTrunkPlacer::new));
 
 	public FallenStraightTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/MegaTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/MegaTrunkPlacer.java
index 534b69db..0b76cae7 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/MegaTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/MegaTrunkPlacer.java
@@ -4,7 +4,7 @@
 import java.util.function.BiConsumer;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.wood.block.QuarterLogBlock;
 import com.terraformersmc.terrestria.Terrestria;
@@ -25,7 +25,7 @@
 import net.minecraft.world.gen.trunk.TrunkPlacerType;
 
 public class MegaTrunkPlacer extends TrunkPlacer {
-	public static final Codec<MegaTrunkPlacer> CODEC = RecordCodecBuilder.create((instance) ->
+	public static final MapCodec<MegaTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec((instance) ->
 		fillTrunkPlacerFields(instance).apply(instance, MegaTrunkPlacer::new)
 	);
 
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/QuarteredMegaCanopyTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/QuarteredMegaCanopyTrunkPlacer.java
index 0dd6ada1..4f9a039c 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/QuarteredMegaCanopyTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/QuarteredMegaCanopyTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
 
@@ -19,8 +19,7 @@
 import java.util.function.BiConsumer;
 
 public class QuarteredMegaCanopyTrunkPlacer extends MegaTrunkPlacer {
-
-	public static final Codec<QuarteredMegaCanopyTrunkPlacer> CODEC = RecordCodecBuilder.create(quarteredMegaCanopyTrunkPlacerInstance ->
+	public static final MapCodec<QuarteredMegaCanopyTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec(quarteredMegaCanopyTrunkPlacerInstance ->
 			fillTrunkPlacerFields(quarteredMegaCanopyTrunkPlacerInstance).apply(quarteredMegaCanopyTrunkPlacerInstance, QuarteredMegaCanopyTrunkPlacer::new));
 
 	public QuarteredMegaCanopyTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/RubberTreeTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/RubberTreeTrunkPlacer.java
index faad07bd..fb6c789e 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/RubberTreeTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/RubberTreeTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
 
@@ -20,8 +20,7 @@
 import java.util.function.BiConsumer;
 
 public class RubberTreeTrunkPlacer extends TrunkPlacer {
-
-	public static final Codec<RubberTreeTrunkPlacer> CODEC = RecordCodecBuilder.create(rubberTreeTrunkPlacerInstance ->
+	public static final MapCodec<RubberTreeTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec(rubberTreeTrunkPlacerInstance ->
 			fillTrunkPlacerFields(rubberTreeTrunkPlacerInstance).apply(rubberTreeTrunkPlacerInstance, RubberTreeTrunkPlacer::new));
 
 	public RubberTreeTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SaguaroCactusTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SaguaroCactusTrunkPlacer.java
index 2e86f260..a29ae6c9 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SaguaroCactusTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SaguaroCactusTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terraform.wood.block.BareSmallLogBlock;
 import com.terraformersmc.terrestria.feature.tree.trunkplacers.templates.SmallTrunkPlacer;
@@ -20,8 +20,7 @@
 import java.util.function.BiConsumer;
 
 public class SaguaroCactusTrunkPlacer extends SmallTrunkPlacer {
-
-	public static final Codec<SaguaroCactusTrunkPlacer> CODEC = RecordCodecBuilder.create(saguaroCactusTrunkPlacerInstance ->
+	public static final MapCodec<SaguaroCactusTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec(saguaroCactusTrunkPlacerInstance ->
 			fillTrunkPlacerFields(saguaroCactusTrunkPlacerInstance).apply(saguaroCactusTrunkPlacerInstance, SaguaroCactusTrunkPlacer::new));
 
 	public SaguaroCactusTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallBranchingTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallBranchingTrunkPlacer.java
index 12f5664b..39bf97c2 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallBranchingTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallBranchingTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.feature.tree.trunkplacers.templates.SmallTrunkPlacer;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
@@ -20,8 +20,7 @@
 import java.util.function.BiConsumer;
 
 public class SmallBranchingTrunkPlacer extends SmallTrunkPlacer {
-
-	public static final Codec<SmallBranchingTrunkPlacer> CODEC = RecordCodecBuilder.create(smallBranchingTrunkPlacerInstance ->
+	public static final MapCodec<SmallBranchingTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec(smallBranchingTrunkPlacerInstance ->
 			fillTrunkPlacerFields(smallBranchingTrunkPlacerInstance).apply(smallBranchingTrunkPlacerInstance, SmallBranchingTrunkPlacer::new));
 
 	public SmallBranchingTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallCanopyTree4BranchTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallCanopyTree4BranchTrunkPlacer.java
index ed170112..4e471f55 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallCanopyTree4BranchTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SmallCanopyTree4BranchTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.feature.tree.trunkplacers.templates.SmallTrunkPlacer;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
@@ -19,8 +19,7 @@
 import java.util.function.BiConsumer;
 
 public class SmallCanopyTree4BranchTrunkPlacer extends SmallTrunkPlacer {
-
-	public static final Codec<SmallCanopyTree4BranchTrunkPlacer> CODEC = RecordCodecBuilder.create(smallCanopyTree4BranchTrunkPlacerInstance ->
+	public static final MapCodec<SmallCanopyTree4BranchTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec(smallCanopyTree4BranchTrunkPlacerInstance ->
 			fillTrunkPlacerFields(smallCanopyTree4BranchTrunkPlacerInstance).apply(smallCanopyTree4BranchTrunkPlacerInstance, SmallCanopyTree4BranchTrunkPlacer::new));
 
 	public SmallCanopyTree4BranchTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SpindlyTrunkPlacer.java b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SpindlyTrunkPlacer.java
index c095a15f..da66bff8 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SpindlyTrunkPlacer.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/feature/tree/trunkplacers/SpindlyTrunkPlacer.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.terrestria.feature.tree.trunkplacers;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.terrestria.feature.tree.trunkplacers.templates.SmallTrunkPlacer;
 import com.terraformersmc.terrestria.init.TerrestriaTrunkPlacerTypes;
@@ -21,8 +21,7 @@
 import java.util.function.BiConsumer;
 
 public class SpindlyTrunkPlacer extends SmallTrunkPlacer {
-
-	public static final Codec<SpindlyTrunkPlacer> CODEC = RecordCodecBuilder.create(spindlyTrunkPlacerInstance ->
+	public static final MapCodec<SpindlyTrunkPlacer> CODEC = RecordCodecBuilder.mapCodec(spindlyTrunkPlacerInstance ->
 			fillTrunkPlacerFields(spindlyTrunkPlacerInstance).apply(spindlyTrunkPlacerInstance, SpindlyTrunkPlacer::new));
 
 	public SpindlyTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandomHeight) {
diff --git a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaFoliagePlacerTypes.java b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaFoliagePlacerTypes.java
index 3ca5c645..f21b9f16 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaFoliagePlacerTypes.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaFoliagePlacerTypes.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.init;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.terraformersmc.terraform.tree.placer.PlacerTypes;
 import com.terraformersmc.terrestria.Terrestria;
 import com.terraformersmc.terrestria.feature.tree.foliageplacers.*;
@@ -9,7 +9,6 @@
 import net.minecraft.world.gen.foliage.FoliagePlacerType;
 
 public class TerrestriaFoliagePlacerTypes {
-
 	public static FoliagePlacerType<CanopyFoliagePlacer> CANOPY;
 	public static FoliagePlacerType<DotShrubPlacer> DOT_SHRUB;
 	public static FoliagePlacerType<PredictiveSpruceFoliagePlacer> PREDICTIVE_SPRUCE;
@@ -34,8 +33,7 @@ public static void init() {
 		CYPRESS = register("cypress_foliage_placer", CypressFoliagePlacer.CODEC);
 	}
 
-	private static <P extends FoliagePlacer> FoliagePlacerType<P> register(String name, Codec<P> codec) {
+	private static <P extends FoliagePlacer> FoliagePlacerType<P> register(String name, MapCodec<P> codec) {
 		return PlacerTypes.registerFoliagePlacer(new Identifier(Terrestria.MOD_ID, name), codec);
 	}
-
 }
diff --git a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaStructures.java b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaStructures.java
index 2051cd8b..c396e389 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaStructures.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaStructures.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.init;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.terraformersmc.terrestria.Terrestria;
 import com.terraformersmc.terrestria.feature.structure.arch.CanyonArchGenerator;
 import com.terraformersmc.terrestria.feature.structure.arch.CanyonArchStructure;
@@ -29,7 +29,7 @@ public class TerrestriaStructures {
 	public static void init() {
 	}
 
-	private static <S extends Structure> StructureType<S> registerStructureType(String id, Codec<S> codec) {
+	private static <S extends Structure> StructureType<S> registerStructureType(String id, MapCodec<S> codec) {
 		return Registry.register(Registries.STRUCTURE_TYPE, new Identifier(Terrestria.MOD_ID, id), () -> codec);
 	}
 
diff --git a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTreeDecorators.java b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTreeDecorators.java
index f99ad3e5..8e0267ed 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTreeDecorators.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTreeDecorators.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.init;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.terraformersmc.terrestria.Terrestria;
 import com.terraformersmc.terrestria.feature.tree.treedecorators.DanglingLeavesTreeDecorator;
 import com.terraformersmc.terrestria.feature.tree.treedecorators.SakuraTreeDecorator;
@@ -21,7 +21,7 @@ public static void init() {
 		SAKURA = register("sakura_tree_decorator", SakuraTreeDecorator.CODEC);
 	}
 
-	private static <P extends TreeDecorator> TreeDecoratorType<P> register(String name, Codec<P> codec) {
+	private static <P extends TreeDecorator> TreeDecoratorType<P> register(String name, MapCodec<P> codec) {
 		return Registry.register(Registries.TREE_DECORATOR_TYPE, new Identifier(Terrestria.MOD_ID, name), TreeDecoratorTypeAccessor.createTreeDecoratorType(codec));
 	}
 }
diff --git a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTrunkPlacerTypes.java b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTrunkPlacerTypes.java
index b865848f..52673ef3 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTrunkPlacerTypes.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/init/TerrestriaTrunkPlacerTypes.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.init;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.terraformersmc.terraform.tree.placer.PlacerTypes;
 import com.terraformersmc.terrestria.Terrestria;
 import com.terraformersmc.terrestria.feature.tree.trunkplacers.*;
@@ -9,7 +9,6 @@
 import net.minecraft.world.gen.trunk.TrunkPlacerType;
 
 public class TerrestriaTrunkPlacerTypes {
-
 	public static TrunkPlacerType<BentTrunkPlacer> BENT;
 	public static TrunkPlacerType<CanopyTree4BranchTrunkPlacer> CANOPY_4_BRANCHES;
 	public static TrunkPlacerType<QuarteredMegaCanopyTrunkPlacer> QUARTERED_MEGA_CANOPY;
@@ -36,8 +35,7 @@ public static void init() {
 		FALLEN_STRAIGHT = register("fallen_straight_trunk_placer", FallenStraightTrunkPlacer.CODEC);
 	}
 
-	private static <P extends TrunkPlacer> TrunkPlacerType<P> register(String name, Codec<P> codec) {
+	private static <P extends TrunkPlacer> TrunkPlacerType<P> register(String name, MapCodec<P> codec) {
 		return PlacerTypes.registerTrunkPlacer(new Identifier(Terrestria.MOD_ID, name), codec);
 	}
-
 }
diff --git a/common/src/main/java/com/terraformersmc/terrestria/init/helpers/SurfaceLevelFilterPlacementModifier.java b/common/src/main/java/com/terraformersmc/terrestria/init/helpers/SurfaceLevelFilterPlacementModifier.java
index be38ec73..81ad8215 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/init/helpers/SurfaceLevelFilterPlacementModifier.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/init/helpers/SurfaceLevelFilterPlacementModifier.java
@@ -1,6 +1,7 @@
 package com.terraformersmc.terrestria.init.helpers;
 
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.random.Random;
@@ -10,8 +11,8 @@
 import net.minecraft.world.gen.placementmodifier.PlacementModifierType;
 
 public class SurfaceLevelFilterPlacementModifier extends AbstractConditionalPlacementModifier {
-	public static final Codec<SurfaceLevelFilterPlacementModifier> MODIFIER_CODEC =
-			RecordCodecBuilder.create(instance -> instance.group(
+	public static final MapCodec<SurfaceLevelFilterPlacementModifier> MODIFIER_CODEC =
+			RecordCodecBuilder.mapCodec(instance -> instance.group(
 					Heightmap.Type.CODEC.fieldOf("heightmap").forGetter(arg -> arg.heightmap),
 					Codec.INT.optionalFieldOf("min_inclusive", Integer.MIN_VALUE).forGetter(arg -> arg.min),
 					Codec.INT.optionalFieldOf("max_inclusive", Integer.MAX_VALUE).forGetter(arg -> arg.max))
diff --git a/common/src/main/java/com/terraformersmc/terrestria/init/helpers/TerrestriaPlacementModifierType.java b/common/src/main/java/com/terraformersmc/terrestria/init/helpers/TerrestriaPlacementModifierType.java
index 91dde030..0aa58036 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/init/helpers/TerrestriaPlacementModifierType.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/init/helpers/TerrestriaPlacementModifierType.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.init.helpers;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.world.gen.placementmodifier.PlacementModifier;
@@ -13,11 +13,11 @@ public static void init() {
 	}
 
 	@Override
-	public Codec<SurfaceLevelFilterPlacementModifier> codec() {
+	public MapCodec<SurfaceLevelFilterPlacementModifier> codec() {
 		return null;
 	}
 
-	private static <P extends PlacementModifier> PlacementModifierType<P> register(String id, Codec<P> codec) {
+	private static <P extends PlacementModifier> PlacementModifierType<P> register(String id, MapCodec<P> codec) {
 		return Registry.register(Registries.PLACEMENT_MODIFIER_TYPE, id, () -> codec);
 	}
 }
diff --git a/common/src/main/java/com/terraformersmc/terrestria/mixin/TreeDecoratorTypeAccessor.java b/common/src/main/java/com/terraformersmc/terrestria/mixin/TreeDecoratorTypeAccessor.java
index bf6b7bc2..b934448b 100644
--- a/common/src/main/java/com/terraformersmc/terrestria/mixin/TreeDecoratorTypeAccessor.java
+++ b/common/src/main/java/com/terraformersmc/terrestria/mixin/TreeDecoratorTypeAccessor.java
@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.mixin;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import net.minecraft.world.gen.treedecorator.TreeDecorator;
 import net.minecraft.world.gen.treedecorator.TreeDecoratorType;
 import org.spongepowered.asm.mixin.Mixin;
@@ -9,7 +9,7 @@
 @Mixin(TreeDecoratorType.class)
 public interface TreeDecoratorTypeAccessor {
 	@Invoker(value = "<init>")
-	static <P extends TreeDecorator> TreeDecoratorType<P> createTreeDecoratorType(Codec<P> codec) {
+	static <P extends TreeDecorator> TreeDecoratorType<P> createTreeDecoratorType(MapCodec<P> codec) {
 		throw new UnsupportedOperationException();
 	}
 }
diff --git a/common/src/main/resources/data/terrestria/worldgen/structure/ocean_volcano.json b/common/src/main/resources/data/terrestria/worldgen/structure/ocean_volcano.json
index 7126f6ab..ace20104 100644
--- a/common/src/main/resources/data/terrestria/worldgen/structure/ocean_volcano.json
+++ b/common/src/main/resources/data/terrestria/worldgen/structure/ocean_volcano.json
@@ -7,10 +7,8 @@
   "config": {},
   "height": {
     "type": "uniform",
-    "value": {
-      "min_inclusive": 19,
-      "max_inclusive": 20
-    }
+    "min_inclusive": 19,
+    "max_inclusive": 20
   },
   "base_y": 30,
   "thin_if_tall": false
diff --git a/common/src/main/resources/data/terrestria/worldgen/structure/shore_volcano.json b/common/src/main/resources/data/terrestria/worldgen/structure/shore_volcano.json
index a7dd8319..7d7e61b4 100644
--- a/common/src/main/resources/data/terrestria/worldgen/structure/shore_volcano.json
+++ b/common/src/main/resources/data/terrestria/worldgen/structure/shore_volcano.json
@@ -7,10 +7,8 @@
   "config": {},
   "height": {
     "type": "uniform",
-    "value": {
-      "min_inclusive": 31,
-      "max_inclusive": 48
-    }
+    "min_inclusive": 31,
+    "max_inclusive": 48
   },
   "base_y": 45,
   "thin_if_tall": true
diff --git a/common/src/main/resources/data/terrestria/worldgen/structure/volcano.json b/common/src/main/resources/data/terrestria/worldgen/structure/volcano.json
index a9b60bde..6d5e9f8b 100644
--- a/common/src/main/resources/data/terrestria/worldgen/structure/volcano.json
+++ b/common/src/main/resources/data/terrestria/worldgen/structure/volcano.json
@@ -7,10 +7,8 @@
   "config": {},
   "height": {
     "type": "uniform",
-    "value": {
-      "min_inclusive": 32,
-      "max_inclusive": 63
-    }
+    "min_inclusive": 32,
+    "max_inclusive": 63
   },
   "base_y": 60,
   "thin_if_tall": false
diff --git a/gradle.properties b/gradle.properties
index ace556a9..4ce44232 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,22 +4,22 @@ fabric.loom.multiProjectOptimisation=true
 maven_group=com.terraformersmc
 archive_name=terrestria
 
-minecraft_version=24w11a
-yarn_mappings=24w11a+build.2
+minecraft_version=24w13a
+yarn_mappings=24w13a+build.2
 loader_version=0.15.7
-fabric_version=0.96.10+1.20.5
+fabric_version=0.96.13+1.20.5
 
 # Terraform modules
-terraform_biome_remapper_api_version=10.0.0-alpha.7
-terraform_config_api_version=10.0.0-alpha.7
-terraform_dirt_version=10.0.0-alpha.7
-terraform_shapes_api_version=10.0.0-alpha.7
-terraform_surfaces_api_version=10.0.0-alpha.7
-terraform_tree_api_version=10.0.0-alpha.7
-terraform_wood_api_version=10.0.0-alpha.7
+terraform_biome_remapper_api_version=10.0.0-alpha.8
+terraform_config_api_version=10.0.0-alpha.8
+terraform_dirt_version=10.0.0-alpha.8
+terraform_shapes_api_version=10.0.0-alpha.8
+terraform_surfaces_api_version=10.0.0-alpha.8
+terraform_tree_api_version=10.0.0-alpha.8
+terraform_wood_api_version=10.0.0-alpha.8
 
 # Biolith for worldgen module and testing
-biolith_version=1.3.0-alpha.2
+biolith_version=2.1.0-alpha.1
 
 # TerraBlender for worldgen module and testing
 terrablender_version=1.20.4-3.3.0.12
@@ -43,7 +43,7 @@ curseforge_optional_dependencies=
 # Modrinth Metadata
 modrinth_slug=terrestria
 modrinth_id=lsUDPMOT
-modrinth_game_versions=24w11a
+modrinth_game_versions=24w13a
 modrinth_mod_loaders=fabric, quilt
 modrinth_required_dependencies=fabric-api
 #modrinth_embedded_dependencies=biolith
diff --git a/worldgen/src/main/java/com/terraformersmc/terrestria/surfacerules/TerrestriaSurfaceRules.java b/worldgen/src/main/java/com/terraformersmc/terrestria/surfacerules/TerrestriaSurfaceRules.java
index 9bc63b89..1bffb7cb 100644
--- a/worldgen/src/main/java/com/terraformersmc/terrestria/surfacerules/TerrestriaSurfaceRules.java
+++ b/worldgen/src/main/java/com/terraformersmc/terrestria/surfacerules/TerrestriaSurfaceRules.java
@@ -1,13 +1,8 @@
 package com.terraformersmc.terrestria.surfacerules;
 
-import com.mojang.serialization.Codec;
-import com.terraformersmc.terrestria.Terrestria;
 import com.terraformersmc.terrestria.init.TerrestriaBiomes;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.util.Identifier;
 import net.minecraft.world.gen.YOffset;
 import net.minecraft.world.gen.noise.NoiseParametersKeys;
 import net.minecraft.world.gen.surfacebuilder.MaterialRules;
@@ -17,7 +12,6 @@
 
 public class TerrestriaSurfaceRules {
 	public static MaterialRule createRules() {
-
 		// Sandy surface rules
 		MaterialRule sandAndSandstone = sequence(condition(STONE_DEPTH_FLOOR_WITH_SURFACE_DEPTH,
 			block(Blocks.SAND)), block(Blocks.SANDSTONE));
@@ -59,8 +53,4 @@ private static MaterialRules.MaterialCondition surfaceNoiseThreshold(double min)
 
 	public static void init() {
 	}
-
-	public static <T extends MaterialRule> Codec<T> register(String id, Codec<T> ruleCodec) {
-		return Registry.register(Registries.MATERIAL_RULE, new Identifier(Terrestria.MOD_ID, id), ruleCodec);
-	}
 }