Update to 1.21-pre2/3.

I don't love the registry access in the datagen block loot table provider; hopefully there's a better way.  In the meantime this hacky way seems to work.

- Update to 1.21-pre2/3

client/src/main/java/com/terraformersmc/terrestria/TerrestriaClient.java

@@ -14,11 +14,11 @@
 import net.minecraft.client.color.block.BlockColorProvider;
 import net.minecraft.client.color.item.ItemColorProvider;
 import net.minecraft.client.color.world.BiomeColors;
-import net.minecraft.client.color.world.FoliageColors;
-import net.minecraft.client.color.world.GrassColors;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.TexturedRenderLayers;
 import net.minecraft.util.Identifier;
+import net.minecraft.world.biome.FoliageColors;
+import net.minecraft.world.biome.GrassColors;
 
 // This class is an entrypoint
 @Environment(EnvType.CLIENT)
@@ -153,15 +153,15 @@ public void onInitializeClient() {
 	}
 
 	private void registerEntityRenderers() {
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "redwood"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "hemlock"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "rubber"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "cypress"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "willow"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "japanese_maple"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "rainbow_eucalyptus"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "sakura"), false);
-		TerraformBoatClientHelper.registerModelLayers(new Identifier(Terrestria.MOD_ID, "yucca_palm"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "redwood"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "hemlock"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "rubber"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "cypress"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "willow"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "japanese_maple"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "rainbow_eucalyptus"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "sakura"), false);
+		TerraformBoatClientHelper.registerModelLayers(Identifier.of(Terrestria.MOD_ID, "yucca_palm"), false);
 	}
 
 	private void addColoredGrass(Block grass) {

client/src/main/resources/assets/terrestria/lang/en_us.json

@@ -1,23 +1,4 @@
 {
-  "itemGroup.terrestria.items": "Terrestria",
-  "item.terrestria.cypress_boat": "Cypress Boat",
-  "item.terrestria.cypress_chest_boat": "Cypress Boat with Chest",
-  "item.terrestria.hemlock_boat": "Hemlock Boat",
-  "item.terrestria.hemlock_chest_boat": "Hemlock Boat with Chest",
-  "item.terrestria.japanese_maple_boat": "Japanese Maple Boat",
-  "item.terrestria.japanese_maple_chest_boat": "Japanese Maple Boat with Chest",
-  "item.terrestria.rainbow_eucalyptus_boat": "Rainbow Eucalyptus Boat",
-  "item.terrestria.rainbow_eucalyptus_chest_boat": "Rainbow Eucalyptus Boat with Chest",
-  "item.terrestria.redwood_boat": "Redwood Boat",
-  "item.terrestria.redwood_chest_boat": "Redwood Boat with Chest",
-  "item.terrestria.rubber_boat": "Rubber Wood Boat",
-  "item.terrestria.rubber_chest_boat": "Rubber Wood Boat with Chest",
-  "item.terrestria.sakura_boat": "Sakura Boat",
-  "item.terrestria.sakura_chest_boat": "Sakura Boat with Chest",
-  "item.terrestria.willow_boat": "Willow Boat",
-  "item.terrestria.willow_chest_boat": "Willow Boat with Chest",
-  "item.terrestria.yucca_palm_boat": "Yucca Palm Boat",
-  "item.terrestria.yucca_palm_chest_boat": "Yucca Palm Boat with Chest",
   "block.terrestria.redwood_log": "Redwood Log",
   "block.terrestria.redwood_wood": "Redwood Wood",
   "block.terrestria.redwood_quarter_log": "Redwood Quarter Log",
@@ -249,8 +230,7 @@
   "block.terrestria.bryce_sapling": "Bryce Tree Sapling",
   "block.terrestria.saguaro_cactus_sapling": "Saguaro Cactus Sapling",
   "block.terrestria.yucca_palm_sapling": "Yucca Palm Sapling",
-  "item.terrestria.log_turner": "Log Turner",
-  "item.terrestria.log_turner.tooltip": "Use on a log to set axis and rotation",
+
   "biome.terrestria.caldera": "Caldera",
   "biome.terrestria.canyon": "Canyon",
   "biome.terrestria.cypress_forest": "Cypress Forest",
@@ -270,5 +250,56 @@
   "biome.terrestria.snowy_hemlock_forest": "Snowy Hemlock Forest",
   "biome.terrestria.snowy_hemlock_treeline": "Snowy Hemlock Treeline",
   "biome.terrestria.volcanic_island": "Volcanic Island",
-  "biome.terrestria.windswept_redwood_forest": "Windswept Redwood Forest"
+  "biome.terrestria.windswept_redwood_forest": "Windswept Redwood Forest",
+
+  "itemGroup.terrestria.items": "Terrestria",
+
+  "item.terrestria.log_turner": "Log Turner",
+  "item.terrestria.log_turner.tooltip": "Use on a log to set axis and rotation",
+
+  "item.terrestria.cypress_boat": "Cypress Boat",
+  "item.terrestria.cypress_chest_boat": "Cypress Boat with Chest",
+  "item.terrestria.hemlock_boat": "Hemlock Boat",
+  "item.terrestria.hemlock_chest_boat": "Hemlock Boat with Chest",
+  "item.terrestria.japanese_maple_boat": "Japanese Maple Boat",
+  "item.terrestria.japanese_maple_chest_boat": "Japanese Maple Boat with Chest",
+  "item.terrestria.rainbow_eucalyptus_boat": "Rainbow Eucalyptus Boat",
+  "item.terrestria.rainbow_eucalyptus_chest_boat": "Rainbow Eucalyptus Boat with Chest",
+  "item.terrestria.redwood_boat": "Redwood Boat",
+  "item.terrestria.redwood_chest_boat": "Redwood Boat with Chest",
+  "item.terrestria.rubber_boat": "Rubber Wood Boat",
+  "item.terrestria.rubber_chest_boat": "Rubber Wood Boat with Chest",
+  "item.terrestria.sakura_boat": "Sakura Boat",
+  "item.terrestria.sakura_chest_boat": "Sakura Boat with Chest",
+  "item.terrestria.willow_boat": "Willow Boat",
+  "item.terrestria.willow_chest_boat": "Willow Boat with Chest",
+  "item.terrestria.yucca_palm_boat": "Yucca Palm Boat",
+  "item.terrestria.yucca_palm_chest_boat": "Yucca Palm Boat with Chest",
+
+  "tag.item.c.basalt": "Basalt",
+  "tag.item.c.basalts": "Basalts",
+  "tag.item.c.black_sand": "Black Sand",
+  "tag.item.c.black_sands": "Black Sands",
+  "tag.item.c.cobblestone": "Cobblestone",
+  "tag.item.c.dirt": "Dirt",
+  "tag.item.c.dirts": "Dirts",
+  "tag.item.c.planks_that_burn": "Planks That Burn",
+  "tag.item.c.podzols": "Podzols",
+  "tag.item.c.sand": "Sand",
+  "tag.item.c.sands": "Sands",
+  "tag.item.c.stone": "Stone",
+  "tag.item.c.stripped_logs": "Stripped Logs",
+  "tag.item.c.stripped_wood": "Stripped Wood",
+
+  "tag.item.terrestria.cypress_logs": "Cypress Logs",
+  "tag.item.terrestria.hemlock_logs": "Hemlock Logs",
+  "tag.item.terrestria.japanese_maple_logs": "Japanese Maple Logs",
+  "tag.item.terrestria.mossy_ingredients": "Mossy Ingredients",
+  "tag.item.terrestria.rainbow_eucalyptus_logs": "Rainbow Eucalyptus Logs",
+  "tag.item.terrestria.redwood_logs": "Redwood Logs",
+  "tag.item.terrestria.rubber_logs": "Rubber Logs",
+  "tag.item.terrestria.sakura_logs": "Sakura Logs",
+  "tag.item.terrestria.small_oak_logs": "Small Oak Logs",
+  "tag.item.terrestria.willow_logs": "Willow Logs",
+  "tag.item.terrestria.yucca_palm_logs": "Yucca Palm Logs"
 }

common/src/main/java/com/terraformersmc/terrestria/block/BasaltGrassBlock.java

@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.block;
 
-import com.terraformersmc.terraform.dirt.block.TerraformGrassBlock;
+import com.terraformersmc.terraform.dirt.api.block.TerraformGrassBlock;
 import com.terraformersmc.terrestria.init.TerrestriaBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -52,7 +52,7 @@ public void grow(ServerWorld world, Random random, BlockPos centerPos, BlockStat
 			BlockState state = world.getBlockState(pos);
 
 			// NB: this just converts short grass to tall grass, this isn't specific to GRASS_BLOCK
-			if (state.getBlock() == Blocks.SHORT_GRASS && random.nextInt(10) == 0) {
+			if (state.isOf(Blocks.SHORT_GRASS) && random.nextInt(10) == 0) {
 				((Fertilizable) state.getBlock()).grow(world, random, pos, state);
 			}
 

common/src/main/java/com/terraformersmc/terrestria/block/CattailBlock.java

@@ -3,7 +3,6 @@
 import com.terraformersmc.terrestria.init.TerrestriaBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
 import net.minecraft.block.SeagrassBlock;
 import net.minecraft.block.TallSeagrassBlock;
 import net.minecraft.block.enums.DoubleBlockHalf;
@@ -25,7 +24,7 @@ public void grow(ServerWorld world, Random random, BlockPos pos, BlockState stat
 		BlockState tallTop = tallBottom.with(TallSeagrassBlock.HALF, DoubleBlockHalf.UPPER);
 		BlockPos upper = pos.up();
 
-		if (world.getBlockState(upper).getBlock() == Blocks.AIR) {
+		if (world.getBlockState(upper).isAir()) {
 			world.setBlockState(pos, tallBottom, 2);
 			world.setBlockState(upper, tallTop, 2);
 		}

common/src/main/java/com/terraformersmc/terrestria/block/SaguaroCactusBlock.java

@@ -1,9 +1,8 @@
 package com.terraformersmc.terrestria.block;
 
-import com.terraformersmc.terraform.wood.block.BareSmallLogBlock;
+import com.terraformersmc.terraform.wood.api.block.BareSmallLogBlock;
 import com.terraformersmc.terrestria.init.TerrestriaBlocks;
 import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.MapColor;
 import net.minecraft.block.piston.PistonBehavior;
@@ -68,47 +67,50 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction facing,
 		return super.getStateForNeighborUpdate(state, facing, neighborState, world, pos, neighborPos);
 	}
 
-	public boolean isSupportedBlock(Block block) {
-		return block == TerrestriaBlocks.SAGUARO_CACTUS || block.getDefaultState().isIn(BlockTags.SAND);
+	private boolean isSupportedBlock(BlockState state) {
+		return state.isOf(TerrestriaBlocks.SAGUARO_CACTUS) || state.isIn(BlockTags.SAND);
 	}
 
 	private boolean isSupported(BlockState state, WorldView world, BlockPos pos) {
 		BlockState blockState;
-		if (isSupportedBlock(world.getBlockState(pos.down()).getBlock())) {
+
+		if (isSupportedBlock(world.getBlockState(pos.down()))) {
 			return true;
 		}
+
 		if (state.get(BareSmallLogBlock.DOWN)) {
 			blockState = world.getBlockState(pos.down());
-			return (blockState.getBlock() == TerrestriaBlocks.SAGUARO_CACTUS && blockState.get(BareSmallLogBlock.UP));
+			return (blockState.isOf(TerrestriaBlocks.SAGUARO_CACTUS) && blockState.get(BareSmallLogBlock.UP));
 		}
 		if (state.get(BareSmallLogBlock.SOUTH)) {
 			blockState = world.getBlockState(pos.south());
-			return (blockState.getBlock() == TerrestriaBlocks.SAGUARO_CACTUS && blockState.get(BareSmallLogBlock.NORTH));
+			return (blockState.isOf(TerrestriaBlocks.SAGUARO_CACTUS) && blockState.get(BareSmallLogBlock.NORTH));
 		}
 		if (state.get(BareSmallLogBlock.NORTH)) {
 			blockState = world.getBlockState(pos.north());
-			return (blockState.getBlock() == TerrestriaBlocks.SAGUARO_CACTUS && blockState.get(BareSmallLogBlock.SOUTH));
+			return (blockState.isOf(TerrestriaBlocks.SAGUARO_CACTUS) && blockState.get(BareSmallLogBlock.SOUTH));
 		}
 		if (state.get(BareSmallLogBlock.WEST)) {
 			blockState = world.getBlockState(pos.west());
-			return (blockState.getBlock() == TerrestriaBlocks.SAGUARO_CACTUS && blockState.get(BareSmallLogBlock.EAST));
+			return (blockState.isOf(TerrestriaBlocks.SAGUARO_CACTUS) && blockState.get(BareSmallLogBlock.EAST));
 		}
 		if (state.get(BareSmallLogBlock.EAST)) {
 			blockState = world.getBlockState(pos.east());
-			return (blockState.getBlock() == TerrestriaBlocks.SAGUARO_CACTUS && blockState.get(BareSmallLogBlock.WEST));
+			return (blockState.isOf(TerrestriaBlocks.SAGUARO_CACTUS) && blockState.get(BareSmallLogBlock.WEST));
 		}
+
 		return false;
 	}
 
 	private boolean canBeSupported(WorldView world, BlockPos pos) {
-		return world.getBlockState(pos.north()).getBlock() == TerrestriaBlocks.SAGUARO_CACTUS ||
-				world.getBlockState(pos.south()).getBlock() == TerrestriaBlocks.SAGUARO_CACTUS ||
-				world.getBlockState(pos.east()).getBlock() == TerrestriaBlocks.SAGUARO_CACTUS ||
-				world.getBlockState(pos.west()).getBlock() == TerrestriaBlocks.SAGUARO_CACTUS;
+		return world.getBlockState(pos.north()).isOf(TerrestriaBlocks.SAGUARO_CACTUS) ||
+				world.getBlockState(pos.south()).isOf(TerrestriaBlocks.SAGUARO_CACTUS) ||
+				world.getBlockState(pos.east()).isOf(TerrestriaBlocks.SAGUARO_CACTUS) ||
+				world.getBlockState(pos.west()).isOf(TerrestriaBlocks.SAGUARO_CACTUS);
 	}
 
 	@Override
 	public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
-		return isSupportedBlock(world.getBlockState(pos.down()).getBlock()) || canBeSupported(world, pos);
+		return isSupportedBlock(world.getBlockState(pos.down())) || canBeSupported(world, pos);
 	}
 }

common/src/main/java/com/terraformersmc/terrestria/block/TerrestriaOptiLeavesBlock.java

@@ -1,6 +1,6 @@
 package com.terraformersmc.terrestria.block;
 
-import com.terraformersmc.terraform.leaves.block.ExtendedLeavesBlock;
+import com.terraformersmc.terraform.leaves.api.block.ExtendedLeavesBlock;
 import com.terraformersmc.terrestria.Terrestria;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.Direction;

common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java

@@ -4,7 +4,7 @@
 import com.terraformersmc.terrestria.tag.TerrestriaBiomeTags;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
-import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.tag.BiomeTags;
@@ -75,29 +75,42 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
 		/*
 		 * Common biome categories
 		 */
-		getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_TEMPERATE)
-			.addOptional(TerrestriaBiomes.CYPRESS_FOREST)
-			.addOptional(TerrestriaBiomes.CYPRESS_SWAMP)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_BADLANDS)
+			.addOptional(TerrestriaBiomes.CANYON);
+
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD)
+			.addOptional(TerrestriaBiomes.CALDERA)
+			.addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST)
+			.addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE);
+
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE)
+			.addOptional(TerrestriaBiomes.CALDERA)
+			.addOptional(TerrestriaBiomes.CYPRESS_FOREST);
+
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_DEAD)
+			.addOptional(TerrestriaBiomes.DUNES);
+
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE)
 			.addOptional(TerrestriaBiomes.DENSE_WOODLANDS)
-			.addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST)
 			.addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST)
-			.addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST)
-			.addOptional(TerrestriaBiomes.REDWOOD_FOREST)
+			.addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST)
 			.addOptional(TerrestriaBiomes.SAKURA_FOREST);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.DEAD)
-			.addOptional(TerrestriaBiomes.DUNES);
-
-		getOrCreateTagBuilder(ConventionalBiomeTags.DESERT)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_DESERT)
 			.addOptional(TerrestriaBiomes.CANYON)
 			.addOptional(TerrestriaBiomes.DUNES)
 			.addOptional(TerrestriaBiomes.LUSH_DESERT)
 			.addOptional(TerrestriaBiomes.OASIS);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.EXTREME_HILLS)
-			.addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST);
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD)
+			.addOptional(TerrestriaBiomes.CANYON)
+			.addOptional(TerrestriaBiomes.LUSH_DESERT)
+			.addOptional(TerrestriaBiomes.OASIS)
+			.addOptional(TerrestriaBiomes.OUTBACK)
+			.addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST)
+			.addOptional(TerrestriaBiomes.VOLCANIC_ISLAND);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.IN_OVERWORLD)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD)
 			.addOptional(TerrestriaBiomes.CALDERA)
 			.addOptional(TerrestriaBiomes.CANYON)
 			.addOptional(TerrestriaBiomes.CYPRESS_FOREST)
@@ -119,30 +132,30 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
 			.addOptional(TerrestriaBiomes.VOLCANIC_ISLAND)
 			.addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.MESA)
-			.addOptional(TerrestriaBiomes.CANYON);
-
-		getOrCreateTagBuilder(ConventionalBiomeTags.SAVANNA)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA)
 			.addOptional(TerrestriaBiomes.OUTBACK);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.SNOWY)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY)
 			.addOptional(TerrestriaBiomes.CALDERA)
 			.addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST)
 			.addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_TREELINE);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.SWAMP)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_SWAMP)
 			.addOptional(TerrestriaBiomes.CYPRESS_SWAMP);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.TREE_CONIFEROUS)
-			.addOptional(TerrestriaBiomes.CALDERA)
-			.addOptional(TerrestriaBiomes.CYPRESS_FOREST);
-
-		getOrCreateTagBuilder(ConventionalBiomeTags.TREE_DECIDUOUS)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD)
+			.addOptional(TerrestriaBiomes.CYPRESS_FOREST)
+			.addOptional(TerrestriaBiomes.CYPRESS_SWAMP)
 			.addOptional(TerrestriaBiomes.DENSE_WOODLANDS)
+			.addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST)
 			.addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST)
-			.addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST)
+			.addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST)
+			.addOptional(TerrestriaBiomes.REDWOOD_FOREST)
 			.addOptional(TerrestriaBiomes.SAKURA_FOREST);
 
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_WINDSWEPT)
+			.addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST);
+
 
 		/*
 		 * Biome structure generation tags
@@ -230,6 +243,30 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
 			.addOptional(TerrestriaBiomes.VOLCANIC_ISLAND)
 			.addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST);
 
+		getOrCreateTagBuilder(BiomeTags.TRAIL_RUINS_HAS_STRUCTURE)
+			.addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST)
+			.addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST)
+			.addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST)
+			.addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST)
+			.addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST);
+
+		getOrCreateTagBuilder(BiomeTags.TRIAL_CHAMBERS_HAS_STRUCTURE)
+			.addOptional(TerrestriaBiomes.CANYON)
+			.addOptional(TerrestriaBiomes.CYPRESS_FOREST)
+			.addOptional(TerrestriaBiomes.CYPRESS_SWAMP)
+			.addOptional(TerrestriaBiomes.DENSE_WOODLANDS)
+			.addOptional(TerrestriaBiomes.DUNES)
+			.addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST)
+			.addOptional(TerrestriaBiomes.JAPANESE_MAPLE_FOREST)
+			.addOptional(TerrestriaBiomes.LUSH_DESERT)
+			.addOptional(TerrestriaBiomes.LUSH_REDWOOD_FOREST)
+			.addOptional(TerrestriaBiomes.OASIS)
+			.addOptional(TerrestriaBiomes.OUTBACK)
+			.addOptional(TerrestriaBiomes.RAINBOW_RAINFOREST)
+			.addOptional(TerrestriaBiomes.REDWOOD_FOREST)
+			.addOptional(TerrestriaBiomes.VOLCANIC_ISLAND)
+			.addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST);
+
 		getOrCreateTagBuilder(BiomeTags.VILLAGE_DESERT_HAS_STRUCTURE)
 			.addOptional(TerrestriaBiomes.LUSH_DESERT)
 			.addOptional(TerrestriaBiomes.OASIS)