diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/recipes/MiscRecipes.java b/src/datagen/java/blusunrize/immersiveengineering/data/recipes/MiscRecipes.java index 7beb77437c..8ba4ef9a81 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/recipes/MiscRecipes.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/recipes/MiscRecipes.java @@ -424,11 +424,20 @@ private void mineralMixes(RecipeOutput out) MineralMixBuilder.builder() .dimensionOverworld() .addOverworldSpoils() + .ore(copper, .7f) + .ore(gold, .3f) + .weight(20) + .failchance(.1f) + .build(out, toRL("mineral/auricupride")); + MineralMixBuilder.builder() + .dimensionOverworld() + .biomeCondition(BiomeTags.IS_BADLANDS) + .addOverworldSpoils() .ore(gold, .6f) .ore(copper, .4f) .weight(20) .failchance(.1f) - .build(out, toRL("mineral/auricupride")); + .build(out, toRL("mineral/rich_auricupride")); MineralMixBuilder.builder() .dimensionOverworld() .addOverworldSpoils() diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 5c2af25074..965a6994da 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-31T13:39:54.2349201 Recipes +// 1.20.4 2024-03-31T13:50:29.69247 Recipes d26086952b40806bc38c90c09b98813f12205a0d data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick.json b9b65ae84fb439073534ac46e2e74644d1239f0a data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick_from_slab.json 5dd470beb97dbd63fc44761ae16283bf3e542d5b data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick_to_slab.json @@ -1408,7 +1408,7 @@ ae47c1cba794eb985b7d11810acbcfad7fe594ef data/immersiveengineering/recipes/miner e0964ea0049199c73ca3091443adfe6147a8d5e9 data/immersiveengineering/recipes/mineral/amethyst_crevasse.json e4c235d2fbbfd137ba187e9d0dd5c023470c593c data/immersiveengineering/recipes/mineral/ancient_debris.json 0d12de50910586f58bd932569ff35ec62fb3fc09 data/immersiveengineering/recipes/mineral/ancient_seabed.json -be93f90ef6a0d1c4747ff3c0609cfa2f9d358833 data/immersiveengineering/recipes/mineral/auricupride.json +2fc85132d541135f9650806615cc87f37f81ef11 data/immersiveengineering/recipes/mineral/auricupride.json 769a0f57b52e52daf4250975f79d36f0c0b6bd26 data/immersiveengineering/recipes/mineral/banded_iron.json ab7db906b54f740468bc92e601a8d4919d5bef8b data/immersiveengineering/recipes/mineral/beryl.json fc0393d3cae80c2916d641b1f246ad16e5bdce83 data/immersiveengineering/recipes/mineral/bituminous_coal.json @@ -1423,6 +1423,7 @@ c62ff0905e49bf7435354c99364e42dc3786d230 data/immersiveengineering/recipes/miner 5c7136d546630f9ed87eb408141f38573e873c4c data/immersiveengineering/recipes/mineral/mephitic_quarzite.json 6e94253f875893a021d13944c9a26ac90a04a316 data/immersiveengineering/recipes/mineral/nether_silt.json 6b0503f7830a9b804f2d3bc51c1fa70019f53e61 data/immersiveengineering/recipes/mineral/pentlandite.json +84ec716ae3e4be2b08c07fee9a6f586f4968f852 data/immersiveengineering/recipes/mineral/rich_auricupride.json 042d15fda3ce9dbc51c130f0dd3654479c9028f2 data/immersiveengineering/recipes/mineral/silt.json 5588a4da17d6fe91d6bdd0f0197a8917b9477c21 data/immersiveengineering/recipes/mineral/uraninite.json 063fb4a978684f34bbaa9afb477daf5f778521c6 data/immersiveengineering/recipes/mineral/wolframite.json diff --git a/src/generated/resources/data/immersiveengineering/recipes/mineral/auricupride.json b/src/generated/resources/data/immersiveengineering/recipes/mineral/auricupride.json index e6b5387b99..183d5d7ea4 100644 --- a/src/generated/resources/data/immersiveengineering/recipes/mineral/auricupride.json +++ b/src/generated/resources/data/immersiveengineering/recipes/mineral/auricupride.json @@ -8,17 +8,17 @@ "fail_chance": 0.1, "ores": [ { - "chance": 0.6, + "chance": 0.7, "conditions": [], "output": { - "tag": "forge:ores/gold" + "tag": "forge:ores/copper" } }, { - "chance": 0.4, + "chance": 0.3, "conditions": [], "output": { - "tag": "forge:ores/copper" + "tag": "forge:ores/gold" } } ], diff --git a/src/generated/resources/data/immersiveengineering/recipes/mineral/rich_auricupride.json b/src/generated/resources/data/immersiveengineering/recipes/mineral/rich_auricupride.json new file mode 100644 index 0000000000..7585e10b2d --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/recipes/mineral/rich_auricupride.json @@ -0,0 +1,55 @@ +{ + "type": "immersiveengineering:mineral_mix", + "biome_predicates": [ + [ + "minecraft:is_overworld" + ], + [ + "minecraft:is_badlands" + ] + ], + "fail_chance": 0.1, + "ores": [ + { + "chance": 0.6, + "conditions": [], + "output": { + "tag": "forge:ores/gold" + } + }, + { + "chance": 0.4, + "conditions": [], + "output": { + "tag": "forge:ores/copper" + } + } + ], + "spoils": [ + { + "chance": 0.2, + "conditions": [], + "output": { + "Count": 1, + "id": "minecraft:gravel" + } + }, + { + "chance": 0.5, + "conditions": [], + "output": { + "Count": 1, + "id": "minecraft:cobblestone" + } + }, + { + "chance": 0.3, + "conditions": [], + "output": { + "Count": 1, + "id": "minecraft:cobbled_deepslate" + } + } + ], + "weight": 20 +} \ No newline at end of file diff --git a/src/main/resources/assets/immersiveengineering/lang/en_us.json b/src/main/resources/assets/immersiveengineering/lang/en_us.json index d250b99ed2..eaad5cd545 100644 --- a/src/main/resources/assets/immersiveengineering/lang/en_us.json +++ b/src/main/resources/assets/immersiveengineering/lang/en_us.json @@ -253,6 +253,7 @@ "desc.immersiveengineering.info.mineral.chalcopyrite": "Chalcopyrite", "desc.immersiveengineering.info.mineral.laterite": "Laterite", "desc.immersiveengineering.info.mineral.auricupride": "Auricupride", + "desc.immersiveengineering.info.mineral.rich_auricupride": "Rich Auricupride", "desc.immersiveengineering.info.mineral.galena": "Galena", "desc.immersiveengineering.info.mineral.cinnabar": "Cinnabar", "desc.immersiveengineering.info.mineral.uraninite": "Uraninite",