From baf1d9818ffa1d4e555e0ba771618c24d5133c35 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Sat, 31 Aug 2024 20:27:47 +0200 Subject: [PATCH] Add bacon to meat tag --- .../.cache/4c771f18963704254e4ac70d3c4a47862c033e90 | 3 ++- src/generated/resources/data/minecraft/tags/item/meat.json | 6 ++++++ .../forcecraft/datagen/data/tags/ForceItemTagProvider.java | 7 +++++++ .../java/com/mrbysco/forcecraft/registry/ForceFoods.java | 1 - 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/item/meat.json diff --git a/src/generated/resources/.cache/4c771f18963704254e4ac70d3c4a47862c033e90 b/src/generated/resources/.cache/4c771f18963704254e4ac70d3c4a47862c033e90 index c79039b0..3d8d436e 100644 --- a/src/generated/resources/.cache/4c771f18963704254e4ac70d3c4a47862c033e90 +++ b/src/generated/resources/.cache/4c771f18963704254e4ac70d3c4a47862c033e90 @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-25T23:46:34.845110648 Tags for minecraft:item mod id forcecraft +// 1.21.1 2024-08-31T20:26:51.604925 Tags for minecraft:item mod id forcecraft d964b17dbbb1870466808060f50c0991f7cfaf65 data/c/tags/item/ores.json f002772c304bb8350635523d7d3bb1c4fdb5796a data/c/tags/item/ores/power.json b73848b6920747aedc21ffb8aed7e3aa8d325f04 data/c/tags/item/ores_in_ground/deepslate.json @@ -10,3 +10,4 @@ ca0dfb4cd17d1a8bebda73a2ba9587fde8c1486d data/forcecraft/tags/item/ender.json ba8baa1de0654d18f27068517c95b5fb869c254a data/forcecraft/tags/item/force_furnace.json eff2e9b711edce9a5ae1875f820c2b5272b0779f data/forcecraft/tags/item/force_logs.json f6578c63f571b1fa389775ac66b9218c094d5150 data/forcecraft/tags/item/fortune.json +d1415442d2f9003a49daa7a187adfa9f33413cf4 data/minecraft/tags/item/meat.json diff --git a/src/generated/resources/data/minecraft/tags/item/meat.json b/src/generated/resources/data/minecraft/tags/item/meat.json new file mode 100644 index 00000000..84bb7d68 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/meat.json @@ -0,0 +1,6 @@ +{ + "values": [ + "forcecraft:raw_bacon", + "forcecraft:cooked_bacon" + ] +} \ No newline at end of file diff --git a/src/main/java/com/mrbysco/forcecraft/datagen/data/tags/ForceItemTagProvider.java b/src/main/java/com/mrbysco/forcecraft/datagen/data/tags/ForceItemTagProvider.java index 4c547f4c..61d92a87 100644 --- a/src/main/java/com/mrbysco/forcecraft/datagen/data/tags/ForceItemTagProvider.java +++ b/src/main/java/com/mrbysco/forcecraft/datagen/data/tags/ForceItemTagProvider.java @@ -30,11 +30,16 @@ public ForceItemTagProvider(PackOutput output, CompletableFuture ORES_IN_GROUND_STONE = commonTag("ores_in_ground/stone"); public static final TagKey ORES = commonTag("ores"); public static final TagKey ORES_POWER = commonTag("ores/power"); + public static final TagKey MEAT = mcTag("meat"); private static TagKey commonTag(String name) { return ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", name)); } + private static TagKey mcTag(String name) { + return ItemTags.create(ResourceLocation.withDefaultNamespace(name)); + } + @Override protected void addTags(HolderLookup.Provider provider) { this.tag(ORES_IN_GROUND_DEEPSLATE).add(DEEPSLATE_POWER_ORE_ITEM.get()); @@ -76,5 +81,7 @@ protected void addTags(HolderLookup.Provider provider) { ForceRegistry.MAGENTA_FORCE_FURNACE.asItem(), ForceRegistry.ORANGE_FORCE_FURNACE.asItem(), ForceRegistry.PINK_FORCE_FURNACE.asItem(), ForceRegistry.PURPLE_FORCE_FURNACE.asItem(), ForceRegistry.RED_FORCE_FURNACE.asItem(), ForceRegistry.WHITE_FORCE_FURNACE.asItem()); + + this.tag(MEAT).add(ForceRegistry.RAW_BACON.get(), ForceRegistry.COOKED_BACON.get()); } } \ No newline at end of file diff --git a/src/main/java/com/mrbysco/forcecraft/registry/ForceFoods.java b/src/main/java/com/mrbysco/forcecraft/registry/ForceFoods.java index 427c9d57..2a63b8f7 100644 --- a/src/main/java/com/mrbysco/forcecraft/registry/ForceFoods.java +++ b/src/main/java/com/mrbysco/forcecraft/registry/ForceFoods.java @@ -7,5 +7,4 @@ public class ForceFoods { public static final FoodProperties SOUL_WAFER = (new FoodProperties.Builder()).nutrition(2).saturationModifier(1.0F).build(); public static final FoodProperties BACON = (new FoodProperties.Builder()).nutrition(2).saturationModifier(0.4F).build(); public static final FoodProperties COOKED_BACON = (new FoodProperties.Builder()).nutrition(4).saturationModifier(0.8F).build(); - //TODO: Add bacon and cooked bacon to minecraft:meat }