From f67aaacd0c818bcce4fc8afc463b8cfff722670b Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Tue, 1 Nov 2022 01:07:19 -0400 Subject: [PATCH] Correctly datagen the milk containers tag and remove two non-genned ones --- src/generated/resources/.cache/cache | 1 + .../tags/items/milk_containers.json | 16 +++++++++++++++ .../datagen/InspirationsItemTagsProvider.java | 5 ++++- .../tags/items/cauldron_recipes.json | 20 ------------------- .../tags/items/fluid_containers.json | 13 ------------ .../tags/items/milk_containers.json | 11 ---------- 6 files changed, 21 insertions(+), 45 deletions(-) create mode 100644 src/generated/resources/data/inspirations/tags/items/milk_containers.json delete mode 100644 src/main/resources/data/inspirations/tags/items/cauldron_recipes.json delete mode 100644 src/main/resources/data/inspirations/tags/items/fluid_containers.json delete mode 100644 src/main/resources/data/inspirations/tags/items/milk_containers.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index faa8ec8a..a9f674ed 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -565,6 +565,7 @@ a0b3fd5ce7eaf9e816a1a2752a10f2179cc22170 data/inspirations/tags/items/bookshelve 85c18a3259a3290405d1f9b53f263fa73d5016f3 data/inspirations/tags/items/carpeted_trapdoors.json 13952d80b58aeec6e0eedccd3ddf31a863df7945 data/inspirations/tags/items/carpets.json 0192fa2d894825841d880ef4815ae28280435b7c data/inspirations/tags/items/enlightened_bushes.json +e3438a67527372b0f84aa67d4e161158b3838cca data/inspirations/tags/items/milk_containers.json 150684de449bf92f1ee6c2b1edfcfbc9b73e31fe data/inspirations/tags/items/mulch.json 9a9d02d5e16350805e1cf2738adad58822b695a3 data/inspirations/tags/items/shulker_boxes.json 6a070b00a6a93fa6077bad494c8ddc4ab303c4b8 data/inspirations/tags/items/terracotta.json diff --git a/src/generated/resources/data/inspirations/tags/items/milk_containers.json b/src/generated/resources/data/inspirations/tags/items/milk_containers.json new file mode 100644 index 00000000..74629e01 --- /dev/null +++ b/src/generated/resources/data/inspirations/tags/items/milk_containers.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "minecraft:bucket", + "minecraft:glass_bottle", + "minecraft:bowl", + { + "id": "ceramics:clay_bucket", + "required": false + }, + { + "id": "simplytea:teapot", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/java/knightminer/inspirations/common/datagen/InspirationsItemTagsProvider.java b/src/main/java/knightminer/inspirations/common/datagen/InspirationsItemTagsProvider.java index 44a3c44c..171e4b82 100644 --- a/src/main/java/knightminer/inspirations/common/datagen/InspirationsItemTagsProvider.java +++ b/src/main/java/knightminer/inspirations/common/datagen/InspirationsItemTagsProvider.java @@ -11,6 +11,7 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Item; @@ -66,7 +67,9 @@ private void registerInspTags() { terracottaBuilder.add(Items.TERRACOTTA); VanillaEnum.TERRACOTTA.forEach(block -> terracottaBuilder.add(block.asItem())); - this.tag(InspirationsTags.Items.MILK_CONTAINERS).add(Items.BUCKET, Items.GLASS_BOTTLE); + this.tag(InspirationsTags.Items.MILK_CONTAINERS).add(Items.BUCKET, Items.GLASS_BOTTLE, Items.BOWL) + .addOptional(new ResourceLocation("ceramics:clay_bucket")) + .addOptional(new ResourceLocation("simplytea:teapot")); } private void registerForgeTags() { diff --git a/src/main/resources/data/inspirations/tags/items/cauldron_recipes.json b/src/main/resources/data/inspirations/tags/items/cauldron_recipes.json deleted file mode 100644 index e8bb3fe6..00000000 --- a/src/main/resources/data/inspirations/tags/items/cauldron_recipes.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "_comment": "Items with this tag can be used to perform cauldron recipes in a dispenser", - "values": [ - "minecraft:beetroot_soup", - "minecraft:bowl", - "minecraft:glass_bottle", - "minecraft:lingering_potion", - "minecraft:mushroom_stew", - "minecraft:potion", - "minecraft:rabbit_stew", - "minecraft:splash_potion" - ], - "optional": [ - "#inspirations:dyed_bottles", - "inspirations:splash_bottle", - "inspirations:lingering_bottle", - "toughasnails:fruit_juice", - "toughasnails:purified_water_bottle" - ] -} diff --git a/src/main/resources/data/inspirations/tags/items/fluid_containers.json b/src/main/resources/data/inspirations/tags/items/fluid_containers.json deleted file mode 100644 index 097f1bae..00000000 --- a/src/main/resources/data/inspirations/tags/items/fluid_containers.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "_comment": "Items with this tag can be used as fluid containers in dispensers to fill/empty cauldrons.", - "values": [ - "minecraft:bucket", - "minecraft:water_bucket", - "minecraft:milk_bucket", - "minecraft:lava_bucket" - ], - "optional": [ - "ceramics:clay_bucket", - "forge:bucket_filled" - ] -} diff --git a/src/main/resources/data/inspirations/tags/items/milk_containers.json b/src/main/resources/data/inspirations/tags/items/milk_containers.json deleted file mode 100644 index 3198d038..00000000 --- a/src/main/resources/data/inspirations/tags/items/milk_containers.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "_comment": "All items that can milk a cow when interacting should have this tag. Used to prevent milking and to apply the milked tag", - "values": [ - "minecraft:bowl", - "minecraft:bucket" - ], - "optional": [ - "ceramics:clay_bucket", - "simplytea:teapot" - ] -}