Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4

src/generated/resources/.cache/fa43e5ef6ac83dd009de17d3b434e29660c4c3fc

@@ -1,6 +1,8 @@
-// 1.20.4	2024-03-12T20:08:36.1633314	Mining Lens Recipes
+// 1.20.4	2024-03-12T14:20:16.9017388	Mining Lens Recipes
 411b455c637359f1f46df6fced8cd7558436e938 data/actuallyadditions/recipes/mininglens/nether_nether_gold_ore.json
 7227ee2a53f520facb7fe8f7b34a1a74c9a49e85 data/actuallyadditions/recipes/mininglens/nether_nether_quartz_ore.json
+842372f2415c0beefbb116d7064cf2fbab8459c1 data/actuallyadditions/recipes/mininglens/stone_ancient_debris.json
+de47fcc5b2acc4f0511e95de63b9b084a2dfbaad data/actuallyadditions/recipes/mininglens/stone_black_quartz_ore.json
 550a0fe3577fcdaf0e1af1b2e3a518256992e00b data/actuallyadditions/recipes/mininglens/stone_coal_ore.json
 869a51e0fc919b7a4577bb7c466ca07a6ae0370b data/actuallyadditions/recipes/mininglens/stone_diamond_ore.json
 f74f71eb82bc63538662217d9b0eb136bd262618 data/actuallyadditions/recipes/mininglens/stone_emerald_ore.json

src/generated/resources/data/actuallyadditions/recipes/mininglens/stone_black_quartz_ore.json

@@ -0,0 +1,10 @@
+{
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "actuallyadditions:black_quartz_ore"
+  },
+  "weight": 3000
+}

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

@@ -1,6 +1,7 @@
 package de.ellpeck.actuallyadditions.data;
 
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.crafting.MiningLensRecipe;
 import de.ellpeck.actuallyadditions.mod.util.NoAdvRecipeOutput;
 import net.minecraft.data.PackOutput;
@@ -64,5 +65,6 @@ public class MiningLensGenerator extends RecipeProvider {
         buildStoneOre(consumer, 200, Items.REDSTONE_ORE);
         buildStoneOre(consumer, 30, Items.EMERALD_ORE);
         buildNetherOre(consumer, 3000, Items.NETHER_QUARTZ_ORE);
+        buildStoneOre(consumer, 3000, ActuallyBlocks.BLACK_QUARTZ_ORE.getItem());
     }
 }

src/main/resources/data/actuallyadditions/recipes/mininglens/elementalcraft/inert_crystal_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "elementalcraft"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "elementalcraft:inert_crystal_ore"
+  },
+  "weight": 500
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/elementsofpower/agate_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "elementsofpower"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "elementsofpower:agate_ore"
+  },
+  "weight": 25
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/elementsofpower/citrine_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "elementsofpower"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "elementsofpower:citrine_ore"
+  },
+  "weight": 25
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/elementsofpower/onyx_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "elementsofpower"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "elementsofpower:onyx_ore"
+  },
+  "weight": 25
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/elementsofpower/rubellite_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "elementsofpower"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "elementsofpower:rubellite_ore"
+  },
+  "weight": 25
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/elementsofpower/ruby_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "elementsofpower"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "elementsofpower:ruby_ore"
+  },
+  "weight": 25
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/elementsofpower/sapphire_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "elementsofpower"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "elementsofpower:sapphire_ore"
+  },
+  "weight": 25
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/immersiveengineering/silver_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "immersiveengineering"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "immersiveengineering:ore_silver"
+  },
+  "weight": 1000
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/mekanism/florite_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "mekanism:florite_ore"
+  },
+  "weight": 1000
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/mekanism/lead_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "mekanism:lead_ore"
+  },
+  "weight": 2000
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/mekanism/osmium_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "mekanism:osmium_ore"
+  },
+  "weight": 3000
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/mekanism/tin_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "mekanism:tin_ore"
+  },
+  "weight": 2000
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/mekanism/uranium_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "mekanism:uranium_ore"
+  },
+  "weight": 500
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/modern_industrialization/antimony_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "modern_industrialization"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "modern_industrialization:antimony_ore"
+  },
+  "weight": 1000
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/modern_industrialization/lignite_coal_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "modern_industrialization"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "modern_industrialization:lignite_coal_ore"
+  },
+  "weight": 1500
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/modern_industrialization/monazite_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "modern_industrialization"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "modern_industrialization:monazite_ore"
+  },
+  "weight": 100
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/modern_industrialization/nickel_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "modern_industrialization"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "modern_industrialization:nickel_ore"
+  },
+  "weight": 2000
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/modern_industrialization/salt_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "modern_industrialization"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "modern_industrialization:salt_ore"
+  },
+  "weight": 500
+}

src/main/resources/data/actuallyadditions/recipes/mininglens/powah/uraninite_ore.json

@@ -0,0 +1,16 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "powah"
+    }
+  ],
+  "type": "actuallyadditions:mining_lens",
+  "ingredient": {
+    "tag": "forge:stone"
+  },
+  "result": {
+    "item": "powah:uraninite_ore"
+  },
+  "weight": 200
+}