From 5b9eddaf8410a8a2e49b164143cce774e04db55c Mon Sep 17 00:00:00 2001 From: Autumn Date: Mon, 2 Dec 2024 00:39:42 -0500 Subject: [PATCH] Fix Item Tag Datagen All Datagen is completely working now! --- common/src/main/generated/data/fabric/tags/item/axes.json | 5 +++++ common/src/main/generated/data/fabric/tags/item/hoes.json | 5 +++++ .../src/main/generated/data/fabric/tags/item/pickaxes.json | 5 +++++ .../src/main/generated/data/fabric/tags/item/shovels.json | 5 +++++ .../src/main/generated/data/fabric/tags/item/swords.json | 5 +++++ .../java/com/atom596/titanium/TitaniumDataGenerator.java | 7 ++----- .../atom596/titanium/datagen/TitaniumItemTagProvider.java | 1 - 7 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 common/src/main/generated/data/fabric/tags/item/axes.json create mode 100644 common/src/main/generated/data/fabric/tags/item/hoes.json create mode 100644 common/src/main/generated/data/fabric/tags/item/pickaxes.json create mode 100644 common/src/main/generated/data/fabric/tags/item/shovels.json create mode 100644 common/src/main/generated/data/fabric/tags/item/swords.json diff --git a/common/src/main/generated/data/fabric/tags/item/axes.json b/common/src/main/generated/data/fabric/tags/item/axes.json new file mode 100644 index 0000000..657a3b5 --- /dev/null +++ b/common/src/main/generated/data/fabric/tags/item/axes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "titanium:titanium_axe" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/data/fabric/tags/item/hoes.json b/common/src/main/generated/data/fabric/tags/item/hoes.json new file mode 100644 index 0000000..1880574 --- /dev/null +++ b/common/src/main/generated/data/fabric/tags/item/hoes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "titanium:titanium_hoe" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/data/fabric/tags/item/pickaxes.json b/common/src/main/generated/data/fabric/tags/item/pickaxes.json new file mode 100644 index 0000000..2a85e39 --- /dev/null +++ b/common/src/main/generated/data/fabric/tags/item/pickaxes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "titanium:titanium_pickaxe" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/data/fabric/tags/item/shovels.json b/common/src/main/generated/data/fabric/tags/item/shovels.json new file mode 100644 index 0000000..f98c25d --- /dev/null +++ b/common/src/main/generated/data/fabric/tags/item/shovels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "titanium:titanium_shovel" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/data/fabric/tags/item/swords.json b/common/src/main/generated/data/fabric/tags/item/swords.json new file mode 100644 index 0000000..31479e5 --- /dev/null +++ b/common/src/main/generated/data/fabric/tags/item/swords.json @@ -0,0 +1,5 @@ +{ + "values": [ + "titanium:titanium_sword" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/java/com/atom596/titanium/TitaniumDataGenerator.java b/neoforge/src/main/java/com/atom596/titanium/TitaniumDataGenerator.java index 7180181..2e5c3b8 100644 --- a/neoforge/src/main/java/com/atom596/titanium/TitaniumDataGenerator.java +++ b/neoforge/src/main/java/com/atom596/titanium/TitaniumDataGenerator.java @@ -33,17 +33,14 @@ public static void gatherData(GatherDataEvent event) { new TitaniumAdvancementGenerator() ))); generator.addProvider(true, new TitaniumBlockStateProvider(output, exFileHelper)); - generator.addProvider(true, new TitaniumBlockTagProvider(output, completableFuture, exFileHelper)); + generator.addProvider(true, blockTagsProvider); generator.addProvider(true, new TitaniumItemModelProvider(output, exFileHelper)); - //generator.addProvider(true, new TitaniumItemTagProvider(output, completableFuture, blockTagsProvider.contentsGetter(), exFileHelper)); + generator.addProvider(true, new TitaniumItemTagProvider(output, completableFuture, blockTagsProvider.contentsGetter(), exFileHelper)); generator.addProvider(true, new LootTableProvider(output, Collections.emptySet(), List.of( new LootTableProvider.SubProviderEntry(TitaniumBlockLootTables::new, LootContextParamSets.BLOCK), new LootTableProvider.SubProviderEntry(TitaniumChestLootTables::new, LootContextParamSets.CHEST) ), completableFuture)); generator.addProvider(true, new TitaniumRecipeProvider(output, completableFuture)); generator.addProvider(true, new TitaniumWorldGenProvider(output, completableFuture)); - - // Not working: TitaniumItemTagProvider - // Loot Tables are not finished } } diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemTagProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemTagProvider.java index af10f52..1fe67f4 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemTagProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemTagProvider.java @@ -15,7 +15,6 @@ import java.util.concurrent.CompletableFuture; public class TitaniumItemTagProvider extends ItemTagsProvider { - public TitaniumItemTagProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> completableFuture, @Nullable ExistingFileHelper exFileHelper) { super(output, lookupProvider, completableFuture, Titanium.MOD_ID, exFileHelper); }