Add dirt and sand common tags for Spatial Harvesters.

- Dirt and Sand should now generate in Soil Spatial Harvesters
TerraformersMC · Nov 1, 2023 · 4d7d898 · 4d7d898
1 parent 5b4ffc2
commit 4d7d898
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockTagProvider.java b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockTagProvider.java
@@ -159,6 +159,9 @@ private void addDirt(DirtBlocks dirtBlock) {
 			.add(dirtBlock.getPodzol());
 
 
+		getOrCreateTagBuilder(TerrestriaBlockTags.DIRT)
+			.add(dirtBlock.getDirt());
+
 		getOrCreateTagBuilder(TerrestriaBlockTags.FARMLAND)
 			.add(dirtBlock.getFarmland());
 
@@ -178,6 +181,8 @@ private void addSand(SandBlock sandBlock) {
 		getOrCreateTagBuilder(BlockTags.ENDERMAN_HOLDABLE).add(sandBlock);
 		getOrCreateTagBuilder(BlockTags.SAND).add(sandBlock);
 		getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE).add(sandBlock);
+
+		getOrCreateTagBuilder(TerrestriaBlockTags.SAND).add(sandBlock);
 	}
 
 	@SuppressWarnings("SameParameterValue")

diff --git a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaItemTagProvider.java b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaItemTagProvider.java
@@ -84,6 +84,12 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
 		copy(TerrestriaBlockTags.STRIPPED_WOOD, TerrestriaItemTags.STRIPPED_WOOD);
 
 
+		// dirt type tags
+		copy(TerrestriaBlockTags.DIRT, TerrestriaItemTags.DIRT);
+
+		// sand type tags
+		copy(TerrestriaBlockTags.SAND, TerrestriaItemTags.SAND);
+
 		// stone type tags
 		copy(TerrestriaBlockTags.BASALT, TerrestriaItemTags.BASALT);
 

diff --git a/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaBlockTags.java b/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaBlockTags.java
@@ -10,7 +10,10 @@ public final class TerrestriaBlockTags {
 	public static final TagKey<Block> BASALT = TerrestriaBlockTags.of(Identifier.of("c", "basalt"));
 	public static final TagKey<Block> BLACK_SAND = TerrestriaBlockTags.of(Identifier.of("c", "black_sand"));
 	public static final TagKey<Block> COBBLESTONE = TerrestriaBlockTags.of(Identifier.of("c", "cobblestone"));
+	public static final TagKey<Block> DIRT = TerrestriaBlockTags.of(Identifier.of("c", "dirt"));
+	public static final TagKey<Block> GRAVEL = TerrestriaBlockTags.of(Identifier.of("c", "gravel"));
 	public static final TagKey<Block> PLANKS_THAT_BURN = TerrestriaBlockTags.of(Identifier.of("c", "planks_that_burn"));
+	public static final TagKey<Block> SAND = TerrestriaBlockTags.of(Identifier.of("c", "sand"));
 	public static final TagKey<Block> STONE = TerrestriaBlockTags.of(Identifier.of("c", "stone"));
 	public static final TagKey<Block> STRIPPED_LOGS = TerrestriaBlockTags.of(Identifier.of("c", "stripped_logs"));
 	public static final TagKey<Block> STRIPPED_WOOD = TerrestriaBlockTags.of(Identifier.of("c", "stripped_wood"));

diff --git a/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaItemTags.java b/common/src/main/java/com/terraformersmc/terrestria/tag/TerrestriaItemTags.java
@@ -10,7 +10,10 @@ public final class TerrestriaItemTags {
 	public static final TagKey<Item> BASALT = TerrestriaItemTags.of(Identifier.of("c", "basalt"));
 	public static final TagKey<Item> BLACK_SAND = TerrestriaItemTags.of(Identifier.of("c", "black_sand"));
 	public static final TagKey<Item> COBBLESTONE = TerrestriaItemTags.of(Identifier.of("c", "cobblestone"));
+	public static final TagKey<Item> DIRT = TerrestriaItemTags.of(Identifier.of("c", "dirt"));
+	public static final TagKey<Item> GRAVEL = TerrestriaItemTags.of(Identifier.of("c", "gravel"));
 	public static final TagKey<Item> PLANKS_THAT_BURN = TerrestriaItemTags.of(Identifier.of("c", "planks_that_burn"));
+	public static final TagKey<Item> SAND = TerrestriaItemTags.of(Identifier.of("c", "sand"));
 	public static final TagKey<Item> STONE = TerrestriaItemTags.of(Identifier.of("c", "stone"));
 	public static final TagKey<Item> STRIPPED_LOGS = TerrestriaItemTags.of(Identifier.of("c", "stripped_logs"));
 	public static final TagKey<Item> STRIPPED_WOOD = TerrestriaItemTags.of(Identifier.of("c", "stripped_wood"));