Move untreated wooden tags over to item tags only

Author: voidsong-dragonfly

src/api/java/blusunrize/immersiveengineering/api/IETags.java

@@ -70,12 +70,6 @@ public class IETags
 
 	public static final TagKey<Block> cutCopperStairs = createBlockTag(ieLoc("cut_stairs/copper"));
 	public static final TagKey<Block> cutCopperSlabs = createBlockTag(ieLoc("cut_slabs/copper"));
-	// IE Untreated Woods
-	public static final TagKey<Block> untreatedWoodenPlanks = createBlockTag(ieLoc("untreated_wooden_planks"));
-	public static final TagKey<Block> untreatedWoodenSlabs = createBlockTag(ieLoc("untreated_wooden_slabs"));
-	public static final TagKey<Block> untreatedWoodenStairs = createBlockTag(ieLoc("untreated_wooden_stairs"));
-	public static final TagKey<Block> untreatedWoodenFences = createBlockTag(ieLoc("untreated_wooden_fences"));
-	public static final TagKey<Block> untreatedWoodenGates = createBlockTag(ieLoc("untreated_wooden_gates"));
 	//IE Blocks
 	public static final TagKey<Block> treatedWood = createBlockTag(ieLoc("treated_wood"));
 	public static final TagKey<Block> treatedWoodSlab = createBlockTag(ieLoc("treated_wood_slab"));
@@ -122,6 +116,12 @@ public class IETags
 	public static final TagKey<Item> plasticPlate = createItemWrapper(getPlate("plastic"));
 	public static final TagKey<Item> sawblades = createItemWrapper(cLoc("sawblades"));
 	//Utility tags
+	// IE Untreated Woods
+	public static final TagKey<Item> untreatedWoodenPlanks = createItemWrapper(ieLoc("untreated_wooden_planks"));
+	public static final TagKey<Item> untreatedWoodenSlabs = createItemWrapper(ieLoc("untreated_wooden_slabs"));
+	public static final TagKey<Item> untreatedWoodenStairs = createItemWrapper(ieLoc("untreated_wooden_stairs"));
+	public static final TagKey<Item> untreatedWoodenFences = createItemWrapper(ieLoc("untreated_wooden_fences"));
+	public static final TagKey<Item> untreatedWoodenGates = createItemWrapper(ieLoc("untreated_wooden_gates"));
 	public static final TagKey<Item> forbiddenInCrates = createItemWrapper(ieLoc("forbidden_in_crates"));
 	public static final TagKey<Item> circuitPCB = createItemWrapper(ieLoc("circuits/pcb"));
 	public static final TagKey<Item> circuitLogic = createItemWrapper(ieLoc("circuits/logic"));

src/datagen/java/blusunrize/immersiveengineering/data/recipes/DecorationRecipes.java

@@ -92,7 +92,7 @@ private void woodenDecoration(RecipeOutput out)
 				.pattern("www")
 				.pattern("wbw")
 				.pattern("www")
-				.define('w', IETags.getItemTag(IETags.untreatedWoodenPlanks))
+				.define('w', IETags.untreatedWoodenPlanks)
 				.define('b', new Ingredient(new IngredientFluidStack(IETags.fluidCreosote, FluidType.BUCKET_VOLUME)))
 				.unlockedBy("has_creosote", has(IEFluids.CREOSOTE.getBucket()))
 				.save(
@@ -103,7 +103,7 @@ private void woodenDecoration(RecipeOutput out)
 				.pattern("www")
 				.pattern("wbw")
 				.pattern("www")
-				.define('w', IETags.getItemTag(IETags.untreatedWoodenSlabs))
+				.define('w', IETags.untreatedWoodenSlabs)
 				.define('b', new Ingredient(new IngredientFluidStack(IETags.fluidCreosote, FluidType.BUCKET_VOLUME)))
 				.unlockedBy("has_creosote", has(IEFluids.CREOSOTE.getBucket()))
 				.save(
@@ -114,7 +114,7 @@ private void woodenDecoration(RecipeOutput out)
 				.pattern("www")
 				.pattern("wbw")
 				.pattern("www")
-				.define('w', IETags.getItemTag(IETags.untreatedWoodenStairs))
+				.define('w', IETags.untreatedWoodenStairs)
 				.define('b', new Ingredient(new IngredientFluidStack(IETags.fluidCreosote, FluidType.BUCKET_VOLUME)))
 				.unlockedBy("has_creosote", has(IEFluids.CREOSOTE.getBucket()))
 				.save(
@@ -124,7 +124,7 @@ private void woodenDecoration(RecipeOutput out)
 		shapedMisc(WoodenDecoration.TREATED_FENCE, 5)
 				.pattern("wbw")
 				.pattern("www")
-				.define('w', IETags.getItemTag(IETags.untreatedWoodenFences))
+				.define('w', IETags.untreatedWoodenFences)
 				.define('b', new Ingredient(new IngredientFluidStack(IETags.fluidCreosote, FluidType.BUCKET_VOLUME)))
 				.unlockedBy("has_creosote", has(IEFluids.CREOSOTE.getBucket()))
 				.save(
@@ -133,7 +133,7 @@ private void woodenDecoration(RecipeOutput out)
 				);
 		shapedMisc(WoodenDecoration.TREATED_FENCE_GATE, 2)
 				.pattern("wbw")
-				.define('w', IETags.getItemTag(IETags.untreatedWoodenGates))
+				.define('w', IETags.untreatedWoodenGates)
 				.define('b', new Ingredient(new IngredientFluidStack(IETags.fluidCreosote, FluidType.BUCKET_VOLUME)))
 				.unlockedBy("has_creosote", has(IEFluids.CREOSOTE.getBucket()))
 				.save(

src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java

@@ -93,23 +93,6 @@ protected void addTags(Provider p_256380_)
 				.add(MetalDecoration.STEEL_FENCE.get());
 		tag(IETags.fencesAlu)
 				.add(MetalDecoration.ALU_FENCE.get());
-		// untreated tags
-		tag(IETags.untreatedWoodenPlanks)
-				.addTag(BlockTags.PLANKS)
-				.remove(IETags.treatedWood);
-		tag(IETags.untreatedWoodenSlabs)
-				.addTag(BlockTags.WOODEN_SLABS)
-				.remove(IETags.treatedWoodSlab);
-		tag(IETags.untreatedWoodenStairs)
-				.addTag(BlockTags.WOODEN_STAIRS)
-				.remove(IETags.treatedWoodStair);
-		tag(IETags.untreatedWoodenFences)
-				.addTag(BlockTags.WOODEN_FENCES)
-				.addTag(Tags.Blocks.FENCES_WOODEN)
-				.remove(WoodenDecoration.TREATED_FENCE.get());
-		tag(IETags.untreatedWoodenGates)
-				.addTag(Tags.Blocks.FENCE_GATES_WOODEN)
-				.remove(WoodenDecoration.TREATED_FENCE_GATE.get());
 		tag(IETags.clayBlock)
 				.add(Blocks.CLAY);
 		tag(IETags.glowstoneBlock)

src/datagen/java/blusunrize/immersiveengineering/data/tags/IEItemTags.java

@@ -16,11 +16,10 @@
 import blusunrize.immersiveengineering.common.blocks.metal.BasicConnectorBlock;
 import blusunrize.immersiveengineering.common.items.WireCoilItem;
 import blusunrize.immersiveengineering.common.register.IEBlocks;
-import blusunrize.immersiveengineering.common.register.IEBlocks.BlockEntry;
-import blusunrize.immersiveengineering.common.register.IEBlocks.Cloth;
-import blusunrize.immersiveengineering.common.register.IEBlocks.Connectors;
-import blusunrize.immersiveengineering.common.register.IEBlocks.MetalDevices;
+import blusunrize.immersiveengineering.common.register.IEBlocks.*;
 import blusunrize.immersiveengineering.common.register.IEItems.*;
+import blusunrize.immersiveengineering.common.register.IEItems.Metals;
+import blusunrize.immersiveengineering.common.register.IEItems.Misc;
 import com.google.common.base.Preconditions;
 import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.data.PackOutput;
@@ -34,6 +33,7 @@
 import net.neoforged.neoforge.common.Tags;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 
+import javax.annotation.Nonnull;
 import java.util.concurrent.CompletableFuture;
 
 public class IEItemTags extends ItemTagsProvider
@@ -50,9 +50,27 @@ public IEItemTags(
 	}
 
 	@Override
-	protected void addTags(Provider p_256380_)
+	protected void addTags(@Nonnull Provider holderLookupProvider)
 	{
 		IETags.forAllBlocktags(this::copy);
+		// untreated tags
+		tag(IETags.untreatedWoodenPlanks)
+				.addTag(ItemTags.PLANKS)
+				.remove(IETags.getItemTag(IETags.treatedWood));
+		tag(IETags.untreatedWoodenSlabs)
+				.addTag(ItemTags.WOODEN_SLABS)
+				.remove(IETags.getItemTag(IETags.treatedWoodSlab));
+		tag(IETags.untreatedWoodenStairs)
+				.addTag(ItemTags.WOODEN_STAIRS)
+				.remove(IETags.getItemTag(IETags.treatedWoodStair));
+		tag(IETags.untreatedWoodenFences)
+				.addTag(ItemTags.WOODEN_FENCES)
+				.addTag(Tags.Items.FENCES_WOODEN)
+				.remove(WoodenDecoration.TREATED_FENCE.get().asItem());
+		tag(IETags.untreatedWoodenGates)
+				.addTag(Tags.Items.FENCE_GATES_WOODEN)
+				.remove(WoodenDecoration.TREATED_FENCE_GATE.get().asItem());
+		// metals tags
 		for(EnumMetals metal : EnumMetals.values())
 		{
 			MetalTags tags = IETags.getTagsFor(metal);