Fixed mining lens doubling up on deepslate ore chances.

This commit is contained in:
Flanks255 2024-12-18 16:55:47 -06:00
parent 8977b3ba22
commit af8f1f18b6
52 changed files with 100 additions and 74 deletions

View file

@ -1,8 +1,10 @@
// 1.21.1 2024-11-16T23:02:28.9307514 Tags for minecraft:item mod id actuallyadditions
// 1.21.1 2024-12-18T16:51:19.0936783 Tags for minecraft:item mod id actuallyadditions
87327118c2f16da245b76de4fdcaab149456d9b8 data/actuallyadditions/tags/item/coffee_beans.json
f3ee78cd8c9563bd1828de2b4b336735f289f9f2 data/actuallyadditions/tags/item/crystals.json
441008b49b4bab00125100fc969cb6582eff7271 data/actuallyadditions/tags/item/crystal_blocks.json
5b64c6e3c9cd3170bab9758491e742e0307d6617 data/actuallyadditions/tags/item/deepslate_ore_replaceables.json
7e6e49c3eb5302af147a2d6ba439e83bd4831cbc data/actuallyadditions/tags/item/drills.json
84150f9be2fa26f9202962b031c722718dd23ca0 data/actuallyadditions/tags/item/stone_ore_replaceables.json
ae55da193b94fd6375c05d5aa46cafdda9d335cd data/actuallyadditions/tags/item/tiny_coals.json
d0115caba2ef0aae6d1c07068d2b30819dfad612 data/curios/tags/item/charm.json
dc377437805c7c5696b88c17454da7b856b9055e data/c/tags/item/buckets.json

View file

@ -1,21 +1,21 @@
// 1.21.1 2024-08-11T19:30:01.8128194 Mining Lens Recipes
76b4696fe505efc1325dd19471ca99b3eb2a77e7 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_coal_ore.json
9169fbe968ece83ac7ed122572bca5e5b263aeb3 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_copper_ore.json
8b5e29cb33c8ec3c384889de6a24504d5929e968 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_diamond_ore.json
9a8aa89ee87138e35339c3a2edbee972710cc45d data/actuallyadditions/recipe/mininglens/deepslate_deepslate_emerald_ore.json
e2a2cd41a3943b1d1be6d22ba85b66432209edf1 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_gold_ore.json
e28b7bda72d8b915819bbe596a8cbd0ad49e2894 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_iron_ore.json
9d718933743435a906b85a8b5cc939844b689982 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_lapis_ore.json
18e638979991a636aff441721b64ca3817c31a9a data/actuallyadditions/recipe/mininglens/deepslate_deepslate_redstone_ore.json
ba880580d5a4c052f2f87b53a70b3879f89e564c data/actuallyadditions/recipe/mininglens/nether_ancient_debris.json
191e3aaa6d7f90e0cf38296163c45f06c00d482d data/actuallyadditions/recipe/mininglens/nether_nether_gold_ore.json
155d0827c6cfc7bedbbb336e7e098ef8c89e61ba data/actuallyadditions/recipe/mininglens/nether_nether_quartz_ore.json
589741018e31cf4cd944272666cbf97915379569 data/actuallyadditions/recipe/mininglens/stone_black_quartz_ore.json
c5782acaa85a20c0fbfd648303a740daf0960ac5 data/actuallyadditions/recipe/mininglens/stone_coal_ore.json
02a74a5c1ebe330bc1e11f7353409d1d020955f1 data/actuallyadditions/recipe/mininglens/stone_copper_ore.json
81b73207b5c1c56237c303f562948a82ed96c237 data/actuallyadditions/recipe/mininglens/stone_diamond_ore.json
8a25b78945df526ac661d898d9e9cf37e9c0aa03 data/actuallyadditions/recipe/mininglens/stone_emerald_ore.json
6a1c7b15b59e81004d89f00fce73b327bbd22f0f data/actuallyadditions/recipe/mininglens/stone_gold_ore.json
4d180516ebb88c2ff859c2287fe3fb838dfeff98 data/actuallyadditions/recipe/mininglens/stone_iron_ore.json
556a12d70e0279d2d7b5eddb812f1b0527082681 data/actuallyadditions/recipe/mininglens/stone_lapis_ore.json
be02249a9b09eeb006e1eb9679221f4c96df3ade data/actuallyadditions/recipe/mininglens/stone_redstone_ore.json
// 1.21.1 2024-12-18T16:51:19.0926725 Mining Lens Recipes
f4541d43062807cf79c944ad991a50c284af8c19 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_coal_ore.json
500843058b079c812901bfc86fdd12f9ac22b3c9 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_copper_ore.json
b5ecd4285df0cb79ce5b14b61c67c7d0cc0d467d data/actuallyadditions/recipe/mininglens/deepslate_deepslate_diamond_ore.json
8b04f2f54e67fb0bde777bb7b5640eee141b52bf data/actuallyadditions/recipe/mininglens/deepslate_deepslate_emerald_ore.json
57986ebcb545acbeb211ce90eee9a00d09492979 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_gold_ore.json
e024e7850bdfa048cff9866b9d30694328c07782 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_iron_ore.json
6ae8c6f5f68802910a730f1c97e3ac720a4b2372 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_lapis_ore.json
f5a83498d41ecae7c5c09f576437e0a230668b22 data/actuallyadditions/recipe/mininglens/deepslate_deepslate_redstone_ore.json
a7483378cff5c73f84befcd588deec8a66f65973 data/actuallyadditions/recipe/mininglens/nether_ancient_debris.json
207ea95cf3bd0b56754df7534a00730761780a6f data/actuallyadditions/recipe/mininglens/nether_nether_gold_ore.json
6538ec473da5c3bdc60d44d98eb8945167797b2d data/actuallyadditions/recipe/mininglens/nether_nether_quartz_ore.json
d0a1204a87d3c8b637d40c06d007c7d55722775a data/actuallyadditions/recipe/mininglens/stone_black_quartz_ore.json
77e3914315743d27ee3c9d9424f404012ab27e09 data/actuallyadditions/recipe/mininglens/stone_coal_ore.json
80170911e71093fbf72b434092b4d7cda8f3118f data/actuallyadditions/recipe/mininglens/stone_copper_ore.json
a1264324a990a820a638ad06cbe4b6a55df01ab2 data/actuallyadditions/recipe/mininglens/stone_diamond_ore.json
ae373c902beb309e1a46f3ea1c952a687e5996cd data/actuallyadditions/recipe/mininglens/stone_emerald_ore.json
0deabbb5ec31b7397b75d623fe79b53ce69bde13 data/actuallyadditions/recipe/mininglens/stone_gold_ore.json
4ef58f3e3bc631213ee002f98721a8198965c4a3 data/actuallyadditions/recipe/mininglens/stone_iron_ore.json
4a0b6d3858180f5aea815ba27ced4002bcf76397 data/actuallyadditions/recipe/mininglens/stone_lapis_ore.json
0205d8ffe980a74016cbaa49ba0e2795fd26a7ad data/actuallyadditions/recipe/mininglens/stone_redstone_ore.json

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"item": "minecraft:deepslate"
"tag": "actuallyadditions:deepslate_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:netherracks"
"tag": "c:ore_bearing_ground/netherrack"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:netherracks"
"tag": "c:ore_bearing_ground/netherrack"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:netherracks"
"tag": "c:ore_bearing_ground/netherrack"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -1,7 +1,7 @@
{
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -0,0 +1,6 @@
{
"values": [
"minecraft:deepslate",
"minecraft:tuff"
]
}

View file

@ -0,0 +1,8 @@
{
"values": [
"minecraft:stone",
"minecraft:granite",
"minecraft:diorite",
"minecraft:andesite"
]
}

View file

@ -54,6 +54,8 @@ public final class ActuallyTags {
public static final TagKey<Item> BUCKET_REFINED_CANOLA_OIL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "bucket/refined_canola_oil"));
public static final TagKey<Item> BUCKET_CRYSTALLIZED_OIL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "bucket/crystallized_oil"));
public static final TagKey<Item> BUCKET_EMPOWERED_OIL = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "bucket/empowered_oil"));
public static final TagKey<Item> STONE_ORE_REPLACEABLES = ItemTags.create(ActuallyAdditions.modLoc("stone_ore_replaceables"));
public static final TagKey<Item> DEEPSLATE_ORE_REPLACEABLES = ItemTags.create(ActuallyAdditions.modLoc("deepslate_ore_replaceables"));
//curios:bracelet
public static final TagKey<Item> CURIOS_CHARM = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("curios", "charm"));

View file

@ -10,6 +10,7 @@ import net.minecraft.data.PackOutput;
import net.minecraft.data.tags.ItemTagsProvider;
import net.minecraft.data.tags.TagsProvider;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block;
import net.neoforged.neoforge.common.Tags;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
@ -161,5 +162,15 @@ public class ItemTagsGenerator extends ItemTagsProvider {
ActuallyItems.DIAMOND_AIOT.get(),
ActuallyItems.NETHERITE_AIOT.get()
);
tag(ActuallyTags.Items.STONE_ORE_REPLACEABLES)
.add(Items.STONE)
.add(Items.GRANITE)
.add(Items.DIORITE)
.add(Items.ANDESITE);
tag(ActuallyTags.Items.DEEPSLATE_ORE_REPLACEABLES)
.add(Items.DEEPSLATE)
.add(Items.TUFF);
}
}

View file

@ -1,5 +1,6 @@
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.crafting.MiningLensRecipe;
@ -43,18 +44,14 @@ public class MiningLensGenerator extends RecipeProvider {
}
private void buildStoneOre(RecipeOutput consumer, int weight, ItemLike output) {
buildTagOre(consumer, Tags.Items.STONES, "stone", weight, output);
buildTagOre(consumer, ActuallyTags.Items.STONE_ORE_REPLACEABLES, "stone", weight, output);
}
private void buildNetherOre(RecipeOutput consumer, int weight, ItemLike output) {
buildTagOre(consumer, Tags.Items.NETHERRACKS, "nether", weight, output);
buildTagOre(consumer, Tags.Items.ORE_BEARING_GROUND_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);
buildTagOre(consumer, ActuallyTags.Items.DEEPSLATE_ORE_REPLACEABLES, "deepslate", weight, output);
}
private void buildTagOre(RecipeOutput consumer, TagKey<Item> tag, String prefix, int weight, ItemLike output) {

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,

View file

@ -7,7 +7,7 @@
],
"type": "actuallyadditions:mining_lens",
"ingredient": {
"tag": "c:stones"
"tag": "actuallyadditions:stone_ore_replaceables"
},
"result": {
"count": 1,