Merge remote-tracking branch 'origin/1.20.4' into 1.20.4

src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837

@@ -1,6 +1,10 @@
-// 1.20.4	2024-03-04T22:51:31.6144307	Block Tags
+// 1.20.4	2024-03-09T22:53:12.5570618	Block Tags
 8665de82dd3d3a1351ce58f78108214f359104b0 data/actuallyadditions/tags/blocks/mineable/aio.json
 f7dc293929a2176bc6e428c765f6bf49fbeccdb5 data/actuallyadditions/tags/blocks/mineable/drill.json
+19d96265c7adc1657153cf5faea40911854ac8ed data/forge/tags/blocks/ores.json
+2bcfae7c119b0b64170989e7d41b352a8d55ea43 data/forge/tags/blocks/ores/black_quartz.json
+2bcfae7c119b0b64170989e7d41b352a8d55ea43 data/forge/tags/blocks/ores_in_ground/stone.json
+6c9a3c952d8fad5bfd8a5ab0b76aeb0b930d1db9 data/forge/tags/blocks/storage_blocks/black_quartz.json
 8dbaf9b7bd6774bc7c01a47a72b8a7fdaee51f87 data/minecraft/tags/blocks/mineable/axe.json
 58c611cbaae2a0a5dd6f82f183b7d0f5dc2d09e6 data/minecraft/tags/blocks/mineable/pickaxe.json
 fab721a4fe7ece1d0e019ce36c4d2862f70ee53b data/minecraft/tags/blocks/needs_stone_tool.json

src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175

@@ -1,6 +1,21 @@
-// 1.20.4	2024-03-08T17:03:47.6380549	Tags for minecraft:item mod id actuallyadditions
+// 1.20.4	2024-03-09T22:54:38.6848812	Tags for minecraft:item mod id actuallyadditions
 87327118c2f16da245b76de4fdcaab149456d9b8 data/actuallyadditions/tags/items/coffee_beans.json
 f3ee78cd8c9563bd1828de2b4b336735f289f9f2 data/actuallyadditions/tags/items/crystals.json
 7e6e49c3eb5302af147a2d6ba439e83bd4831cbc data/actuallyadditions/tags/items/drills.json
 ae55da193b94fd6375c05d5aa46cafdda9d335cd data/actuallyadditions/tags/items/tiny_coals.json
+31cd008db3c44a9c3f643f296e1c7688ca45e2e5 data/forge/tags/items/crops.json
+aaf3c8c818cc015e9c693e0bbf8f86da81f78285 data/forge/tags/items/crops/canola.json
+87327118c2f16da245b76de4fdcaab149456d9b8 data/forge/tags/items/crops/coffee.json
+4be6e9ebd0f4ea040587e7ff05c78270990889b8 data/forge/tags/items/crops/flax.json
+b37abd458a4812414db5038303af41c5f2632527 data/forge/tags/items/crops/rice.json
+4a4e3f4f78d79b28ad1a47e12d2903faec63fd91 data/forge/tags/items/gems/black_quartz.json
+19d96265c7adc1657153cf5faea40911854ac8ed data/forge/tags/items/ores.json
+2bcfae7c119b0b64170989e7d41b352a8d55ea43 data/forge/tags/items/ores/black_quartz.json
+2bcfae7c119b0b64170989e7d41b352a8d55ea43 data/forge/tags/items/ores_in_ground/stone.json
+6a088986a6186d2313ea52a8379232048fa98743 data/forge/tags/items/seeds.json
+f29e7ca84f30d7b2d4b19ad10b62f56fc422378a data/forge/tags/items/seeds/canola.json
+87327118c2f16da245b76de4fdcaab149456d9b8 data/forge/tags/items/seeds/coffee.json
+4be6e9ebd0f4ea040587e7ff05c78270990889b8 data/forge/tags/items/seeds/flax.json
+27f7953be7073bc266bdf5a245658268d11a4252 data/forge/tags/items/seeds/rice.json
 da125442e98e78f6dac7e0c8f35a51503f5bb79d data/forge/tags/items/slimeballs.json
+6c9a3c952d8fad5bfd8a5ab0b76aeb0b930d1db9 data/forge/tags/items/storage_blocks/black_quartz.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,9 +1,11 @@
-// 1.20.4	2024-03-09T11:39:13.7182875	Recipes
+// 1.20.4	2024-03-09T22:59:24.7798372	Recipes
 4d3128b37a7153882a9324cda49b5069207561c5 data/actuallyadditions/recipes/atomic_reconstructor.json
 b0367f5012651764931e8b8fd0c5bcca4e8614c0 data/actuallyadditions/recipes/battery_box.json
+7e05cd54092b998dfdbd2221235dd52576ec79eb data/actuallyadditions/recipes/black_quartz_block.json
 fe704716268e01ca8aeeb92196d9f660b9e08640 data/actuallyadditions/recipes/black_quartz_brick_slab.json
 9780dfc94589fc5c804c0df86eddbb9db3f61c08 data/actuallyadditions/recipes/black_quartz_brick_stair.json
 46e271d87a58b8a987f7fe6925dbdc32488c6e5e data/actuallyadditions/recipes/black_quartz_brick_wall.json
+6f92d08292fb042bd11870b6d3aeeab93f5ce42f data/actuallyadditions/recipes/black_quartz_pillar_block.json
 9be8bfd94ecfc3d6c5736cc6c0851eb96f6882c7 data/actuallyadditions/recipes/black_quartz_pillar_slab.json
 94fbc239756c5f31bab123c4c61ef3eb71696ff5 data/actuallyadditions/recipes/black_quartz_pillar_stair.json
 74181133544cfbdbef31494f415a80b1f8fc0079 data/actuallyadditions/recipes/black_quartz_pillar_wall.json
@@ -12,6 +14,7 @@ db1978ab59369dd3c10e719073b7035acf33885c data/actuallyadditions/recipes/black_qu
 45d174f07588603735ed38fe2eb162e160f91e56 data/actuallyadditions/recipes/black_quartz_wall.json
 0049339d1c0c795190caa365564119bc0bc987e1 data/actuallyadditions/recipes/breaker.json
 81f8a64300319fc07323ab81d1cc4f66cd6c9a45 data/actuallyadditions/recipes/canola_press.json
+8802daf35cdc912a840e10081551de164f745b46 data/actuallyadditions/recipes/chiseled_black_quartz_block.json
 86b8c5e857cf1b00e154b5f798a3e837e6a05333 data/actuallyadditions/recipes/chiseled_black_quartz_slab.json
 506d2ad2f3109a6640a35ef1a2143b16793414ba data/actuallyadditions/recipes/chiseled_black_quartz_stair.json
 2e9233449531a074984b443ceef0ad782f82eaed data/actuallyadditions/recipes/chiseled_black_quartz_wall.json

src/generated/resources/data/actuallyadditions/recipes/black_quartz_block.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "B": {
+      "item": "actuallyadditions:black_quartz"
+    }
+  },
+  "pattern": [
+    "BB",
+    "BB"
+  ],
+  "result": {
+    "item": "actuallyadditions:black_quartz_block"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_block.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "B": {
+      "item": "actuallyadditions:black_quartz"
+    }
+  },
+  "pattern": [
+    "B",
+    "B"
+  ],
+  "result": {
+    "item": "actuallyadditions:black_quartz_pillar_block"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_block.json

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "B": {
+      "item": "actuallyadditions:black_quartz_block"
+    }
+  },
+  "pattern": [
+    "B",
+    "B"
+  ],
+  "result": {
+    "count": 2,
+    "item": "actuallyadditions:chiseled_black_quartz_block"
+  }
+}

src/generated/resources/data/forge/tags/blocks/ores.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#forge:ores/black_quartz"
+  ]
+}

src/generated/resources/data/forge/tags/blocks/ores/black_quartz.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:black_quartz_ore"
+  ]
+}

src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:black_quartz_ore"
+  ]
+}

src/generated/resources/data/forge/tags/blocks/storage_blocks/black_quartz.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:black_quartz_block"
+  ]
+}

src/generated/resources/data/forge/tags/items/crops.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "#forge:crops/rice",
+    "#forge:crops/coffee",
+    "#forge:crops/canola",
+    "#forge:crops/flax"
+  ]
+}

src/generated/resources/data/forge/tags/items/crops/canola.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:canola"
+  ]
+}

src/generated/resources/data/forge/tags/items/crops/coffee.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:coffee_beans"
+  ]
+}

src/generated/resources/data/forge/tags/items/crops/flax.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:flax_seeds"
+  ]
+}

src/generated/resources/data/forge/tags/items/crops/rice.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:rice"
+  ]
+}

src/generated/resources/data/forge/tags/items/gems/black_quartz.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:black_quartz"
+  ]
+}

src/generated/resources/data/forge/tags/items/ores.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#forge:ores/black_quartz"
+  ]
+}

src/generated/resources/data/forge/tags/items/ores/black_quartz.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:black_quartz_ore"
+  ]
+}

src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:black_quartz_ore"
+  ]
+}

src/generated/resources/data/forge/tags/items/seeds.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "#forge:seeds/rice",
+    "#forge:seeds/coffee",
+    "#forge:seeds/canola",
+    "#forge:seeds/flax"
+  ]
+}

src/generated/resources/data/forge/tags/items/seeds/canola.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:canola_seeds"
+  ]
+}

src/generated/resources/data/forge/tags/items/seeds/coffee.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:coffee_beans"
+  ]
+}

src/generated/resources/data/forge/tags/items/seeds/flax.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:flax_seeds"
+  ]
+}

src/generated/resources/data/forge/tags/items/seeds/rice.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:rice_seeds"
+  ]
+}

src/generated/resources/data/forge/tags/items/storage_blocks/black_quartz.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "actuallyadditions:black_quartz_block"
+  ]
+}

src/main/java/de/ellpeck/actuallyadditions/api/ActuallyTags.java

@@ -3,6 +3,7 @@ package de.ellpeck.actuallyadditions.api;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
@@ -23,6 +24,17 @@ public final class ActuallyTags {
         public static final TagKey<Item> TINY_COALS = tag("tiny_coals");
         public static final TagKey<Item> HOLDS_ITEMS = ItemTags.create(new ResourceLocation("forge", "holds_items"));
         public static final TagKey<Item> CRYSTALS = tag("crystals");
+        public static final TagKey<Item> SEEDS_RICE = ItemTags.create(new ResourceLocation("forge", "seeds/rice"));
+        public static final TagKey<Item> SEEDS_COFFEE = ItemTags.create(new ResourceLocation("forge", "seeds/coffee"));
+        public static final TagKey<Item> SEEDS_CANOLA = ItemTags.create(new ResourceLocation("forge", "seeds/canola"));
+        public static final TagKey<Item> SEEDS_FLAX = ItemTags.create(new ResourceLocation("forge", "seeds/flax"));
+        public static final TagKey<Item> CROPS_RICE = ItemTags.create(new ResourceLocation("forge", "crops/rice"));
+        public static final TagKey<Item> CROPS_COFFEE = ItemTags.create(new ResourceLocation("forge", "crops/coffee"));
+        public static final TagKey<Item> CROPS_CANOLA = ItemTags.create(new ResourceLocation("forge", "crops/canola"));
+        public static final TagKey<Item> CROPS_FLAX = ItemTags.create(new ResourceLocation("forge", "crops/flax"));
+        public static final TagKey<Item> GEMS_BLACK_QUARTZ = ItemTags.create(new ResourceLocation("forge", "gems/black_quartz"));
+        public static final TagKey<Item> ORES_BLACK_QUARTZ = ItemTags.create(new ResourceLocation("forge", "ores/black_quartz"));
+        public static final TagKey<Item> STORAGE_BLOCKS_BLACK_QUARTZ = ItemTags.create(new ResourceLocation("forge", "storage_blocks/black_quartz"));
 
         private static TagKey<Item> tag(String name) {
             return TagKey.create(Registries.ITEM, new ResourceLocation(ActuallyAdditions.MODID, name));
@@ -43,6 +55,9 @@ public final class ActuallyTags {
         public static final TagKey<Block> NEEDS_VOID_TOOL = tag("needs_void_tool");
         public static final TagKey<Block> NEEDS_EMERADIC_TOOL = tag("needs_emeradic_tool");
         public static final TagKey<Block> NEEDS_ENORI_TOOL = tag("needs_enori_tool");
+        public static final TagKey<Block> ORES_BLACK_QUARTZ = BlockTags.create(new ResourceLocation("forge", "ores/black_quartz"));
+        public static final TagKey<Block> STORAGE_BLOCKS_BLACK_QUARTZ = BlockTags.create(new ResourceLocation("forge", "storage_blocks/black_quartz"));
+
 
         private static TagKey<Block> tag(String name) {
             return TagKey.create(Registries.BLOCK, new ResourceLocation(ActuallyAdditions.MODID, name));

src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java

@@ -321,6 +321,24 @@ public class BlockRecipeGenerator extends RecipeProvider {
                 .define('S', ItemTags.SAPLINGS)
                 .define('E', ActuallyItems.EMPOWERED_PALIS_CRYSTAL)
                 .save(recipeOutput);
+
+        // Block of Black Quartz
+        Recipe.shaped(ActuallyBlocks.BLACK_QUARTZ.getItem())
+                .pattern("BB", "BB")
+                .define('B', ActuallyItems.BLACK_QUARTZ)
+                .save(recipeOutput);
+
+        // Pillar of Black Quartz
+        Recipe.shaped(ActuallyBlocks.BLACK_QUARTZ_PILLAR.getItem())
+                .pattern("B", "B")
+                .define('B', ActuallyItems.BLACK_QUARTZ)
+                .save(recipeOutput);
+
+        // Chiseled Block of Black Quartz
+        Recipe.shaped(ActuallyBlocks.CHISELED_BLACK_QUARTZ.getItem(), 2)
+                .pattern("B", "B")
+                .define('B', ActuallyBlocks.BLACK_QUARTZ.getItem())
+                .save(recipeOutput);
     }
 
     public static class Recipe {

src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java

@@ -6,6 +6,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.tags.BlockTags;
+import net.neoforged.neoforge.common.Tags;
 import net.neoforged.neoforge.common.data.BlockTagsProvider;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 
@@ -160,6 +161,11 @@ public class BlockTagsGenerator extends BlockTagsProvider {
                 BlockTags.MINEABLE_WITH_PICKAXE,
                 BlockTags.MINEABLE_WITH_SHOVEL
         );
+
+        this.tag(ActuallyTags.Blocks.ORES_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ_ORE.get());
+        this.tag(Tags.Blocks.ORES).addTags(ActuallyTags.Blocks.ORES_BLACK_QUARTZ);
+        this.tag(Tags.Blocks.ORES_IN_GROUND_STONE).add(ActuallyBlocks.BLACK_QUARTZ_ORE.get());
+        this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ.get());
     }
 
 //    /**

src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java

@@ -2,7 +2,9 @@ package de.ellpeck.actuallyadditions.data;
 
 import de.ellpeck.actuallyadditions.api.ActuallyTags;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
+import de.ellpeck.actuallyadditions.mod.items.base.ActuallyItem;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.tags.ItemTagsProvider;
@@ -41,5 +43,23 @@ public class ItemTagsGenerator extends ItemTagsProvider {
 
         tag(Tags.Items.SLIMEBALLS)
                 .add(ActuallyItems.RICE_SLIMEBALL.get());
+
+        tag(ActuallyTags.Items.CROPS_RICE).add(ActuallyItems.RICE.get());
+        tag(ActuallyTags.Items.CROPS_COFFEE).add(ActuallyItems.COFFEE_BEANS.get());
+        tag(ActuallyTags.Items.CROPS_CANOLA).add(ActuallyItems.CANOLA.get());
+        tag(ActuallyTags.Items.CROPS_FLAX).add(ActuallyItems.FLAX_SEEDS.get());
+        tag(Tags.Items.CROPS).addTags(ActuallyTags.Items.CROPS_RICE, ActuallyTags.Items.CROPS_COFFEE, ActuallyTags.Items.CROPS_CANOLA, ActuallyTags.Items.CROPS_FLAX);
+
+        tag(ActuallyTags.Items.SEEDS_RICE).add(ActuallyItems.RICE_SEEDS.get());
+        tag(ActuallyTags.Items.SEEDS_COFFEE).add(ActuallyItems.COFFEE_BEANS.get());
+        tag(ActuallyTags.Items.SEEDS_CANOLA).add(ActuallyItems.CANOLA_SEEDS.get());
+        tag(ActuallyTags.Items.SEEDS_FLAX).add(ActuallyItems.FLAX_SEEDS.get());
+        tag(Tags.Items.SEEDS).addTags(ActuallyTags.Items.SEEDS_RICE, ActuallyTags.Items.SEEDS_COFFEE, ActuallyTags.Items.SEEDS_CANOLA, ActuallyTags.Items.SEEDS_FLAX);
+
+        tag(ActuallyTags.Items.GEMS_BLACK_QUARTZ).add(ActuallyItems.BLACK_QUARTZ.get());
+        tag(ActuallyTags.Items.ORES_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ_ORE.getItem());
+        tag(Tags.Items.ORES).addTags(ActuallyTags.Items.ORES_BLACK_QUARTZ);
+        tag(Tags.Items.ORES_IN_GROUND_STONE).add(ActuallyBlocks.BLACK_QUARTZ_ORE.getItem());
+        tag(ActuallyTags.Items.STORAGE_BLOCKS_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ.getItem());
     }
 }