diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java
index 4cad7a112..52cf7e97b 100644
--- a/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java
+++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java
@@ -3,8 +3,8 @@ package org.allaymc.terra.allay;
 import com.dfsek.tectonic.api.TypeRegistry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
-import org.allaymc.api.data.VanillaBiomeId;
 import org.allaymc.api.server.Server;
+import org.allaymc.api.world.biome.BiomeId;
 import org.allaymc.terra.allay.delegate.AllayBiome;
 import org.allaymc.terra.allay.handle.AllayItemHandle;
 import org.allaymc.terra.allay.handle.AllayWorldHandle;
@@ -73,6 +73,6 @@ public class AllayPlatform extends AbstractPlatform {
 
     protected AllayBiome parseBiome(String id, DepthTracker depthTracker) throws LoadException {
         if(!id.startsWith("minecraft:")) throw new LoadException("Invalid biome identifier " + id, depthTracker);
-        return new AllayBiome(VanillaBiomeId.fromId(Mapping.biomeIdJeToBe(id)));
+        return new AllayBiome(BiomeId.fromId(Mapping.biomeIdJeToBe(id)));
     }
 }
diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java
index 0d02e593e..d11b19919 100644
--- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java
+++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java
@@ -1,7 +1,7 @@
 package org.allaymc.terra.allay.delegate;
 
+import org.allaymc.api.block.property.type.BlockPropertyTypes;
 import org.allaymc.api.block.type.BlockTypes;
-import org.allaymc.api.data.VanillaBlockPropertyTypes;
 import org.allaymc.api.world.chunk.Chunk;
 import org.allaymc.terra.allay.Mapping;
 import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@ import com.dfsek.terra.api.world.ServerWorld;
  */
 public record AllayChunk(ServerWorld world, Chunk allayChunk) implements com.dfsek.terra.api.world.chunk.Chunk {
 
-    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15));
+    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
 
     @Override
     public void setBlock(int x, int y, int z, BlockState data, boolean physics) {
diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java
index 169937f8d..88bb91689 100644
--- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java
+++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java
@@ -1,7 +1,7 @@
 package org.allaymc.terra.allay.delegate;
 
+import org.allaymc.api.block.property.type.BlockPropertyTypes;
 import org.allaymc.api.block.type.BlockTypes;
-import org.allaymc.api.data.VanillaBlockPropertyTypes;
 import org.allaymc.api.world.chunk.UnsafeChunk;
 import org.allaymc.terra.allay.Mapping;
 import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@ import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
  */
 public record AllayProtoChunk(UnsafeChunk allayChunk) implements ProtoChunk {
 
-    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15));
+    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
 
     @Override
     public int getMaxHeight() {
diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java
index a69742b69..f41ae5592 100644
--- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java
+++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java
@@ -2,8 +2,8 @@ package org.allaymc.terra.allay.delegate;
 
 import com.dfsek.terra.api.util.vector.Vector3;
 
+import org.allaymc.api.block.property.type.BlockPropertyTypes;
 import org.allaymc.api.block.type.BlockTypes;
-import org.allaymc.api.data.VanillaBlockPropertyTypes;
 import org.allaymc.api.world.generator.context.OtherChunkAccessibleContext;
 import org.allaymc.terra.allay.Mapping;
 
@@ -24,7 +24,7 @@ import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
  */
 public record AllayProtoWorld(AllayServerWorld allayServerWorld, OtherChunkAccessibleContext context) implements ProtoWorld {
 
-    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15));
+    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
 
     @Override
     public int centerChunkX() {
diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java
index 2608debf7..c5e5bc5a6 100644
--- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java
+++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java
@@ -2,8 +2,8 @@ package org.allaymc.terra.allay.delegate;
 
 import com.dfsek.terra.api.util.vector.Vector3;
 
+import org.allaymc.api.block.property.type.BlockPropertyTypes;
 import org.allaymc.api.block.type.BlockTypes;
-import org.allaymc.api.data.VanillaBlockPropertyTypes;
 import org.allaymc.api.world.Dimension;
 import org.allaymc.terra.allay.Mapping;
 import org.allaymc.terra.allay.generator.AllayGeneratorWrapper;
@@ -26,7 +26,7 @@ import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
  */
 public record AllayServerWorld(AllayGeneratorWrapper allayGeneratorWrapper, Dimension allayDimension) implements ServerWorld {
 
-    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(VanillaBlockPropertyTypes.LIQUID_DEPTH.createValue(15));
+    private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(15));
 
     @Override
     public Chunk getChunkAt(int x, int z) {