diff --git a/src/datagen/java/xyz/nucleoid/extras/data/NEDatagen.java b/src/datagen/java/xyz/nucleoid/extras/data/NEDatagen.java index f1513b7..a93011e 100644 --- a/src/datagen/java/xyz/nucleoid/extras/data/NEDatagen.java +++ b/src/datagen/java/xyz/nucleoid/extras/data/NEDatagen.java @@ -3,12 +3,14 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import xyz.nucleoid.extras.data.provider.NEBlockTagProvider; +import xyz.nucleoid.extras.data.provider.NEItemTagProvider; public class NEDatagen implements DataGeneratorEntrypoint { @Override public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { - FabricDataGenerator.Pack pack = dataGenerator.createPack(); + var pack = dataGenerator.createPack(); - pack.addProvider(NEBlockTagProvider::new); + var blockTags = pack.addProvider(NEBlockTagProvider::new); + pack.addProvider((dataOutput, registries) -> new NEItemTagProvider(dataOutput, registries, blockTags)); } } diff --git a/src/datagen/java/xyz/nucleoid/extras/data/provider/NEItemTagProvider.java b/src/datagen/java/xyz/nucleoid/extras/data/provider/NEItemTagProvider.java new file mode 100644 index 0000000..f6a8086 --- /dev/null +++ b/src/datagen/java/xyz/nucleoid/extras/data/provider/NEItemTagProvider.java @@ -0,0 +1,22 @@ +package xyz.nucleoid.extras.data.provider; + +import java.util.concurrent.CompletableFuture; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryWrapper.WrapperLookup; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.ItemTags; + +public class NEItemTagProvider extends FabricTagProvider.ItemTagProvider { + public NEItemTagProvider(FabricDataOutput dataOutput, CompletableFuture registries, FabricTagProvider.BlockTagProvider blockTags) { + super(dataOutput, registries, blockTags); + } + + @Override + protected void configure(WrapperLookup lookup) { + this.copy(BlockTags.DOORS, ItemTags.DOORS); + this.copy(BlockTags.WOODEN_DOORS, ItemTags.WOODEN_DOORS); + } +} diff --git a/src/main/resources/data/minecraft/tags/items/doors.json b/src/main/resources/data/minecraft/tags/items/doors.json deleted file mode 100644 index e4f9eb0..0000000 --- a/src/main/resources/data/minecraft/tags/items/doors.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "nucleoid_extras:transient_iron_door" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/src/main/resources/data/minecraft/tags/items/wooden_doors.json deleted file mode 100644 index 9e3a725..0000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_doors.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "values": [ - "nucleoid_extras:transient_oak_door", - "nucleoid_extras:transient_spruce_door", - "nucleoid_extras:transient_birch_door", - "nucleoid_extras:transient_jungle_door", - "nucleoid_extras:transient_acacia_door", - "nucleoid_extras:transient_cherry_door", - "nucleoid_extras:transient_dark_oak_door", - "nucleoid_extras:transient_mangrove_door", - "nucleoid_extras:transient_bamboo_door", - "nucleoid_extras:transient_crimson_door", - "nucleoid_extras:transient_warped_door" - ] -}