From 482fc7acf6734d5188bac3098a642dbde1bfe855 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:41:45 -0500 Subject: [PATCH] Added some deepslate ores to the lens. --- .../fa43e5ef6ac83dd009de17d3b434e29660c4c3fc | 9 ++++++++- .../mininglens/deepslate_deepslate_coal_ore.json | 10 ++++++++++ .../deepslate_deepslate_diamond_ore.json | 10 ++++++++++ .../deepslate_deepslate_emerald_ore.json | 10 ++++++++++ .../mininglens/deepslate_deepslate_gold_ore.json | 10 ++++++++++ .../mininglens/deepslate_deepslate_iron_ore.json | 10 ++++++++++ .../deepslate_deepslate_lapis_ore.json | 10 ++++++++++ .../deepslate_deepslate_redstone_ore.json | 10 ++++++++++ .../data/MiningLensGenerator.java | 16 ++++++++++++++++ 9 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_coal_ore.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_diamond_ore.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_emerald_ore.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_gold_ore.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_iron_ore.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_lapis_ore.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_redstone_ore.json diff --git a/src/generated/resources/.cache/fa43e5ef6ac83dd009de17d3b434e29660c4c3fc b/src/generated/resources/.cache/fa43e5ef6ac83dd009de17d3b434e29660c4c3fc index 045b73786..9d2cd8e47 100644 --- a/src/generated/resources/.cache/fa43e5ef6ac83dd009de17d3b434e29660c4c3fc +++ b/src/generated/resources/.cache/fa43e5ef6ac83dd009de17d3b434e29660c4c3fc @@ -1,4 +1,11 @@ -// 1.20.4 2024-03-12T17:06:32.3158961 Mining Lens Recipes +// 1.20.4 2024-03-14T16:41:17.9423551 Mining Lens Recipes +2e77c114530406cd2b3c59a921817803bb718b68 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_coal_ore.json +e791752df12b4dd6c337e160857117f298bbe52b data/actuallyadditions/recipes/mininglens/deepslate_deepslate_diamond_ore.json +00cb1642560fbd392263735bc697e5a24417b612 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_emerald_ore.json +b9e872f89dc2c45d54ee0215a4a335949baee42a data/actuallyadditions/recipes/mininglens/deepslate_deepslate_gold_ore.json +39ef8ef0bddee11a9e0d3a5e436cd1f5a787659d data/actuallyadditions/recipes/mininglens/deepslate_deepslate_iron_ore.json +1cddaac7b3a3310dc2398f1be3cd100758fb1f38 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_lapis_ore.json +f1c2091a2c4bbb81e1908bb9c4ebbcc0bae492b2 data/actuallyadditions/recipes/mininglens/deepslate_deepslate_redstone_ore.json 7341f498818439ac0a9272a1beaa8f19389012ef data/actuallyadditions/recipes/mininglens/nether_ancient_debris.json 411b455c637359f1f46df6fced8cd7558436e938 data/actuallyadditions/recipes/mininglens/nether_nether_gold_ore.json 7227ee2a53f520facb7fe8f7b34a1a74c9a49e85 data/actuallyadditions/recipes/mininglens/nether_nether_quartz_ore.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_coal_ore.json b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_coal_ore.json new file mode 100644 index 000000000..00a039e8e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_coal_ore.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:mining_lens", + "ingredient": { + "item": "minecraft:deepslate" + }, + "result": { + "item": "minecraft:deepslate_coal_ore" + }, + "weight": 2000 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_diamond_ore.json b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_diamond_ore.json new file mode 100644 index 000000000..06e094f1e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_diamond_ore.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:mining_lens", + "ingredient": { + "item": "minecraft:deepslate" + }, + "result": { + "item": "minecraft:deepslate_diamond_ore" + }, + "weight": 50 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_emerald_ore.json b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_emerald_ore.json new file mode 100644 index 000000000..fc771271c --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_emerald_ore.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:mining_lens", + "ingredient": { + "item": "minecraft:deepslate" + }, + "result": { + "item": "minecraft:deepslate_emerald_ore" + }, + "weight": 30 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_gold_ore.json b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_gold_ore.json new file mode 100644 index 000000000..132f69b2b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_gold_ore.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:mining_lens", + "ingredient": { + "item": "minecraft:deepslate" + }, + "result": { + "item": "minecraft:deepslate_gold_ore" + }, + "weight": 500 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_iron_ore.json b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_iron_ore.json new file mode 100644 index 000000000..fbe20b6c5 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_iron_ore.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:mining_lens", + "ingredient": { + "item": "minecraft:deepslate" + }, + "result": { + "item": "minecraft:deepslate_iron_ore" + }, + "weight": 3000 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_lapis_ore.json b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_lapis_ore.json new file mode 100644 index 000000000..bbc292318 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_lapis_ore.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:mining_lens", + "ingredient": { + "item": "minecraft:deepslate" + }, + "result": { + "item": "minecraft:deepslate_lapis_ore" + }, + "weight": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_redstone_ore.json b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_redstone_ore.json new file mode 100644 index 000000000..bcdc6ab64 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/mininglens/deepslate_deepslate_redstone_ore.json @@ -0,0 +1,10 @@ +{ + "type": "actuallyadditions:mining_lens", + "ingredient": { + "item": "minecraft:deepslate" + }, + "result": { + "item": "minecraft:deepslate_redstone_ore" + }, + "weight": 200 +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/MiningLensGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/MiningLensGenerator.java index ebf0d7fb8..49f9df0ee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/MiningLensGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/MiningLensGenerator.java @@ -47,6 +47,14 @@ public class MiningLensGenerator extends RecipeProvider { buildTagOre(consumer, Tags.Items.NETHERRACK, "nether", weight, output); } + private void buildDeepSlateOre(RecipeOutput consumer, int weight, ItemLike output) { + consumer.accept(folderRecipe("mininglens", "deepslate_" + getItemName(output)), new MiningLensRecipe( + Ingredient.of(Items.DEEPSLATE), + weight, + output.asItem().getDefaultInstance() + ), null); + } + private void buildTagOre(RecipeOutput consumer, TagKey tag, String prefix, int weight, ItemLike output) { consumer.accept(folderRecipe("mininglens", prefix + "_" + getItemName(output)), new MiningLensRecipe( Ingredient.of(tag), @@ -67,5 +75,13 @@ public class MiningLensGenerator extends RecipeProvider { buildNetherOre(consumer, 3000, Items.NETHER_QUARTZ_ORE); buildStoneOre(consumer, 3000, ActuallyBlocks.BLACK_QUARTZ_ORE.getItem()); buildNetherOre(consumer, 1, Items.ANCIENT_DEBRIS); + + buildDeepSlateOre(consumer, 2000, Items.DEEPSLATE_COAL_ORE); + buildDeepSlateOre(consumer, 3000, Items.DEEPSLATE_IRON_ORE); + buildDeepSlateOre(consumer, 500, Items.DEEPSLATE_GOLD_ORE); + buildDeepSlateOre(consumer, 50, Items.DEEPSLATE_DIAMOND_ORE); + buildDeepSlateOre(consumer, 250, Items.DEEPSLATE_LAPIS_ORE); + buildDeepSlateOre(consumer, 200, Items.DEEPSLATE_REDSTONE_ORE); + buildDeepSlateOre(consumer, 30, Items.DEEPSLATE_EMERALD_ORE); } }