Adding (varying degrees of) conventional tags for Create mod.

- Improve Create mod compatibility.
TerraformersMC · Jun 10, 2023 · 120e446 · 120e446
1 parent bb90910
commit 120e446
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/common/src/main/java/com/terraformersmc/traverse/data/TraverseBlockTagProvider.java b/common/src/main/java/com/terraformersmc/traverse/data/TraverseBlockTagProvider.java
@@ -86,10 +86,20 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
 		getOrCreateTagBuilder(BlockTags.WOODEN_TRAPDOORS)
 			.add(TraverseBlocks.FIR_TRAPDOOR);
 
+
 		getOrCreateTagBuilder(TraverseBlockTags.FIR_LOGS)
 			.add(TraverseBlocks.FIR_LOG)
 			.add(TraverseBlocks.FIR_WOOD)
 			.add(TraverseBlocks.STRIPPED_FIR_LOG)
 			.add(TraverseBlocks.STRIPPED_FIR_WOOD);
+
+		getOrCreateTagBuilder(TraverseBlockTags.PLANKS_THAT_BURN)
+			.add(TraverseBlocks.FIR_PLANKS);
+
+		getOrCreateTagBuilder(TraverseBlockTags.STRIPPED_LOGS)
+			.add(TraverseBlocks.STRIPPED_FIR_LOG);
+
+		getOrCreateTagBuilder(TraverseBlockTags.STRIPPED_WOOD)
+			.add(TraverseBlocks.STRIPPED_FIR_WOOD);
 	}
 }
diff --git a/common/src/main/java/com/terraformersmc/traverse/data/TraverseItemTagProvider.java b/common/src/main/java/com/terraformersmc/traverse/data/TraverseItemTagProvider.java
@@ -1,7 +1,7 @@
 package com.terraformersmc.traverse.data;
 
-import com.terraformersmc.traverse.block.TraverseBlocks;
 import com.terraformersmc.traverse.item.TraverseBoatTypes;
+import com.terraformersmc.traverse.tag.TraverseBlockTags;
 import com.terraformersmc.traverse.tag.TraverseItemTags;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
@@ -51,13 +51,12 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
 		copy(BlockTags.WOODEN_TRAPDOORS, ItemTags.WOODEN_TRAPDOORS);
 
 
-		getOrCreateTagBuilder(TraverseItemTags.FIR_LOGS)
-			.add(TraverseBlocks.FIR_LOG.asItem())
-			.add(TraverseBlocks.FIR_WOOD.asItem())
-			.add(TraverseBlocks.STRIPPED_FIR_LOG.asItem())
-			.add(TraverseBlocks.STRIPPED_FIR_WOOD.asItem());
+		copy(TraverseBlockTags.FIR_LOGS, TraverseItemTags.FIR_LOGS);
 
-		getOrCreateTagBuilder(TraverseItemTags.PLANKS_THAT_BURN)
-			.add(TraverseBlocks.FIR_PLANKS.asItem());
+		copy(TraverseBlockTags.PLANKS_THAT_BURN, TraverseItemTags.PLANKS_THAT_BURN);
+
+		copy(TraverseBlockTags.STRIPPED_LOGS, TraverseItemTags.STRIPPED_LOGS);
+
+		copy(TraverseBlockTags.STRIPPED_WOOD, TraverseItemTags.STRIPPED_WOOD);
 	}
 }
diff --git a/common/src/main/java/com/terraformersmc/traverse/tag/TraverseBlockTags.java b/common/src/main/java/com/terraformersmc/traverse/tag/TraverseBlockTags.java
@@ -9,6 +9,9 @@
 
 public final class TraverseBlockTags {
 	public static final TagKey<Block> FIR_LOGS = TraverseBlockTags.of("fir_logs");
+	public static final TagKey<Block> PLANKS_THAT_BURN = TraverseBlockTags.of(new Identifier("c", "planks_that_burn"));
+	public static final TagKey<Block> STRIPPED_LOGS = TraverseBlockTags.of(new Identifier("c", "stripped_logs"));
+	public static final TagKey<Block> STRIPPED_WOOD = TraverseBlockTags.of(new Identifier("c", "stripped_wood"));
 
 	private TraverseBlockTags() {
 		return;

diff --git a/common/src/main/java/com/terraformersmc/traverse/tag/TraverseItemTags.java b/common/src/main/java/com/terraformersmc/traverse/tag/TraverseItemTags.java
@@ -9,6 +9,8 @@
 public final class TraverseItemTags {
 	public static final TagKey<Item> FIR_LOGS = TraverseItemTags.of("fir_logs");
 	public static final TagKey<Item> PLANKS_THAT_BURN = TraverseItemTags.of(new Identifier("c", "planks_that_burn"));
+	public static final TagKey<Item> STRIPPED_LOGS = TraverseItemTags.of(new Identifier("c", "stripped_logs"));
+	public static final TagKey<Item> STRIPPED_WOOD = TraverseItemTags.of(new Identifier("c", "stripped_wood"));
 
 	private TraverseItemTags() {
 		return;