diff --git a/src/api/java/blusunrize/immersiveengineering/api/crafting/builders/MineralMixBuilder.java b/src/api/java/blusunrize/immersiveengineering/api/crafting/builders/MineralMixBuilder.java index c844dc1621..2bde72e969 100644 --- a/src/api/java/blusunrize/immersiveengineering/api/crafting/builders/MineralMixBuilder.java +++ b/src/api/java/blusunrize/immersiveengineering/api/crafting/builders/MineralMixBuilder.java @@ -133,7 +133,7 @@ public MineralMixBuilder addOverworldSpoils() return this; } - public MineralMixBuilder addSiltSpoils() + public MineralMixBuilder addSoilSpoils() { JsonObject coarseDirt = new JsonObject(); coarseDirt.addProperty("chance", 0.2f); @@ -143,10 +143,27 @@ public MineralMixBuilder addSiltSpoils() cobblestone.addProperty("chance", 0.5f); cobblestone.add("output", serializeItemStack(new ItemStack(Items.COBBLESTONE))); spoilsArray.add(cobblestone); - JsonObject deepslateCobblestone = new JsonObject(); - deepslateCobblestone.addProperty("chance", 0.3f); - deepslateCobblestone.add("output", serializeItemStack(new ItemStack(Items.COBBLED_DEEPSLATE))); - spoilsArray.add(deepslateCobblestone); + JsonObject gravel = new JsonObject(); + gravel.addProperty("chance", 0.3f); + gravel.add("output", serializeItemStack(new ItemStack(Items.GRAVEL))); + spoilsArray.add(gravel); + return this; + } + + public MineralMixBuilder addSeabedSpoils() + { + JsonObject sandstone = new JsonObject(); + sandstone.addProperty("chance", 0.6f); + sandstone.add("output", serializeItemStack(new ItemStack(Items.SANDSTONE))); + spoilsArray.add(sandstone); + JsonObject gravel = new JsonObject(); + gravel.addProperty("chance", 0.3f); + gravel.add("output", serializeItemStack(new ItemStack(Items.GRAVEL))); + spoilsArray.add(gravel); + JsonObject sand = new JsonObject(); + sand.addProperty("chance", 0.1f); + sand.add("output", serializeItemStack(new ItemStack(Items.SAND))); + spoilsArray.add(sand); return this; } diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java b/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java index a977d688f8..72bee56d4c 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java @@ -1162,20 +1162,13 @@ private void mineralMixes(@Nonnull Consumer out) TagKey emerald = Tags.Items.ORES_EMERALD; Block prismarine = Blocks.PRISMARINE; TagKey aquamarine = createItemWrapper(IETags.getGem("aquamarine")); - - // Common things + //Dimensions ResourceKey overworld = BuiltinDimensionTypes.OVERWORLD; ResourceKey nether = BuiltinDimensionTypes.NETHER; + + //Decorative Blocks MineralMixBuilder.builder(overworld) - .addOverworldSpoils() - .addOre(Tags.Items.ORES_COAL, .8f) - .addOre(sulfur, .2f) - .addOre(phosphorus, .2f, getTagCondition(phosphorus)) - .setWeight(25) - .setFailchance(.05f) - .build(out, toRL("mineral/bituminous_coal")); - MineralMixBuilder.builder(overworld) - .addSiltSpoils() + .addSoilSpoils() .addOre(Items.CLAY, .5f) .addOre(Items.SAND, .3f) .addOre(Items.GRAVEL, .2f) @@ -1191,6 +1184,39 @@ private void mineralMixes(@Nonnull Consumer out) .setWeight(25) .setFailchance(.05f) .build(out, toRL("mineral/igneous_rock")); + MineralMixBuilder.builder(overworld) + .addSoilSpoils() + .addOre(Items.TERRACOTTA, .6f) + .addOre(Items.RED_SANDSTONE, .3f) + .addOre(Items.RED_SAND, .1f) + .setWeight(15) + .setFailchance(.05f) + .build(out, toRL("mineral/hardened_clay_pan")); + MineralMixBuilder.builder(overworld) + .addSeabedSpoils() + .addOre(Blocks.CALCITE, .65f) + .addOre(Blocks.DRIPSTONE_BLOCK, .3f) + .addOre(Blocks.BONE_BLOCK, .05f) + .setWeight(15) + .setFailchance(.05f) + .build(out, toRL("mineral/ancient_seabed")); + MineralMixBuilder.builder(overworld) + .addOverworldSpoils() + .addOre(Blocks.AMETHYST_BLOCK, .4f) + .addOre(Blocks.CALCITE, .3f) + .addOre(Blocks.SMOOTH_BASALT, .3f) + .setWeight(10) + .setFailchance(.1f) + .build(out, toRL("mineral/amethyst_crevasse")); + // Common things + MineralMixBuilder.builder(overworld) + .addOverworldSpoils() + .addOre(Tags.Items.ORES_COAL, .8f) + .addOre(sulfur, .2f) + .addOre(phosphorus, .2f, getTagCondition(phosphorus)) + .setWeight(25) + .setFailchance(.05f) + .build(out, toRL("mineral/bituminous_coal")); // Metals MineralMixBuilder.builder(overworld) .addOverworldSpoils() diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 6bef183c8e..db6ee0b796 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.19.2 2023-05-13T08:49:52.7628343 Recipes +// 1.19.2 2023-12-01T13:51:22.007785378 Recipes 7ccf8b2f4f413f7667689450565e5430a943d23a data/immersiveengineering/advancements/recipes/decorations/crafting/torch.json b79e3d9e28de7d73e18625fac2456b738b168fc9 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/alloybrick.json d518ed26bb86cca14c1400daadb64610c935cafc data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/alloybrick_from_slab.json @@ -55,12 +55,12 @@ c791c790ed90e4c7e668a4bc5e6095a1628f9bee data/immersiveengineering/advancements/ 1729bb9edc9454e334f1160b362daa731d0bcffa data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/coil_hv.json f5502e00f5d39646ab0aef9fbe64eebd0773cd86 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/coil_lv.json 5778e0b885116ae7e02e92886a597bce9234b991 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/coil_mv.json -6cf477e348f150a67e0f4bb35858ae346f5ca3cf data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/cokebrick.json -1ca74626756f17576af5b23019532c9fdfa67b03 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/cokebrick_from_slab.json -f53d232e0d628cd8e9449e4e56bc913ee8eaeace data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/cokebrick_to_slab.json 9321c108a1a801cd3464323493a0a93477cdfedb data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/coke_from_slab.json 57221b01cdfd47454c86d1ded099c8cd4c6432bf data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/coke_to_coal_coke.json 7fdb36203ae8b57559ed3b68d45765ef5df67418 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/coke_to_slab.json +6cf477e348f150a67e0f4bb35858ae346f5ca3cf data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/cokebrick.json +1ca74626756f17576af5b23019532c9fdfa67b03 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/cokebrick_from_slab.json +f53d232e0d628cd8e9449e4e56bc913ee8eaeace data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/cokebrick_to_slab.json bd1e7ce3173585a3261a84dff35755783b62d1ce data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/component_iron.json 6b4458b26e2b4c3c813e9151676c989d968d0b45 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/component_steel.json 5d808a934528a2ec067dcd7098a7acff333a2a37 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/concrete.json @@ -131,6 +131,7 @@ a2a8bf86cbc42d0b2e0cdc7711432813682e5578 data/immersiveengineering/advancements/ 709e160ac052b7a989c74e18d2b2692a268eb0f4 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/gunpowder_barrel.json 7e90221a4dac9ad9eb5bd2288df83835155b88bf data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hammer.json 91479d54fd732de903ac32f4e32f7125093205fe data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/heavy_engineering.json +2ab880ac21a7c292279f3e42c7bbf07ccbf0cbf4 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hemp_fabric.json 10d36a8aaa88bddac61f86be808d6b2fe3f6579c data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hempcrete.json 0809a19fab3108221f5c692b5e47ee5720b0c3fe data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hempcrete_brick.json 4fee3b876d46c345cf3f22f507e953f9bb16e034 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hempcrete_brick_from_slab.json @@ -138,7 +139,6 @@ e8337d43702420eabf4b1b8c1c7687494554a7dd data/immersiveengineering/advancements/ e9b7cd7274df9e5047a767e3c0da102e64d8cbd9 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hempcrete_from_slab.json 59987a712f069fa16e2c9b2ce0198d860d99e126 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hempcrete_pillar.json 0f70f7aceda07bf3594e78d9e14b94746f96bda9 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hempcrete_to_slab.json -2ab880ac21a7c292279f3e42c7bbf07ccbf0cbf4 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hemp_fabric.json fd7a1c434b0e66cb1f259b1227a65ce98f63a8af data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/hoe_steel.json 65433fccf6a9290472ceb4213a92631d8a4bdd5a data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/ingot_aluminum_to_nugget_aluminum.json b13b687929ae26cba8d21ae1d8aac8818ec852d4 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/ingot_aluminum_to_storage_aluminum.json @@ -412,6 +412,11 @@ cc53acbd69eb7d60964b0a6ddcca5786710f71da data/immersiveengineering/advancements/ 122056f62f6bb403956d3e8fc4c7eaa43932492a data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/windmill.json 36c01128a590b7a9c7f552c54f1f220db08ce88c data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/windmill_blade.json e92966bc8c451110ab7e6188b9cdb63c976617e3 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/windmill_sail.json +e9c1d5007bdff654ca531bbaaad160bb778d9638 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_aluminum.json +db0e351ce7ed6d82e567bef8d16daf3ba38e11f5 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_copper.json +028515860d6425b916d9c333025765ed71acbc70 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_electrum.json +1d2ab5b49b0996ba5406c26c584e751ed14298b6 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_lead.json +a218063a7d14eefb4dbee2aafb946f157a0baae3 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_steel.json 926fe3f7adf7b389460aa29c4ca7beaa0191ffac data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wirecoil_copper.json 5746c317cd0f9be76236352eee5ac0bc531cc1c7 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wirecoil_copper_ins.json 06d45121682a08ea8c5b90df2da84755e7164c81 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wirecoil_electrum.json @@ -421,11 +426,6 @@ e92966bc8c451110ab7e6188b9cdb63c976617e3 data/immersiveengineering/advancements/ f1f8001f712ec23d1c4730b96b9262951726c72e data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wirecoil_structure_rope.json 711eadd0b4f0da8c513d3362a65e51d497e804c6 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wirecoil_structure_steel.json ccb0bd9fa2d4383c99362af8c3380b7192175634 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wirecutter.json -e9c1d5007bdff654ca531bbaaad160bb778d9638 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_aluminum.json -db0e351ce7ed6d82e567bef8d16daf3ba38e11f5 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_copper.json -028515860d6425b916d9c333025765ed71acbc70 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_electrum.json -1d2ab5b49b0996ba5406c26c584e751ed14298b6 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_lead.json -a218063a7d14eefb4dbee2aafb946f157a0baae3 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wire_steel.json 1cb9bccd793595e8ccfcd586ef4fd8e5ccca28de data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wooden_barrel.json f2c99c78e6c10cd5b1d5d7b654fc3f6bc1e00e59 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/wooden_grip.json 9e13e0e896f1ac791464baf48356dc267cab2468 data/immersiveengineering/advancements/recipes/immersiveengineering/crafting/workbench.json @@ -547,6 +547,7 @@ a64aa9ca8549e2ab7dddfcb71799ffeb6261f90f data/immersiveengineering/advancements/ f7de3f275221c268b7fc2a7ab2a0b686c373d613 data/immersiveengineering/recipes/alloysmelter/invar.json 14f13f8b8c9240131f97a2a919dc35317430a084 data/immersiveengineering/recipes/alloysmelter/manyullyn.json 3960b53db0c8623cd24876e6b3d0b1dcaa923602 data/immersiveengineering/recipes/alloysmelter/rose_gold.json +a853bf65ca0d1015170285f046f5d2030b89f12b data/immersiveengineering/recipes/arc_recycling_list.json af543e6e480ad7d91ca080a7ab983e7d9cefcc92 data/immersiveengineering/recipes/arcfurnace/alloy_brass.json e20135e71716ed06da2d7188a20d1cefd31541f2 data/immersiveengineering/recipes/arcfurnace/alloy_bronze.json b9455c3aa35f9d31496bfe3fa565812b848c30c2 data/immersiveengineering/recipes/arcfurnace/alloy_constantan.json @@ -625,7 +626,6 @@ a67ad7a84335ba7a5b206f70b803f645a4699e90 data/immersiveengineering/recipes/arcfu e594b858008a555e7257d49aa1505724b9cf9445 data/immersiveengineering/recipes/arcfurnace/raw_ore_uranium.json e9846bfc97d27694353b318d09a6af0a07236636 data/immersiveengineering/recipes/arcfurnace/raw_ore_zinc.json fa318281ba90831f00fd96d7a635724521c550e8 data/immersiveengineering/recipes/arcfurnace/steel.json -a853bf65ca0d1015170285f046f5d2030b89f12b data/immersiveengineering/recipes/arc_recycling_list.json 57cea40c8ea9adda84bfa3db1c41716ca306281a data/immersiveengineering/recipes/blastfurnace/fuel_charcoal.json 9f9ddefaea369df8fced209d8fc8b50b42526909 data/immersiveengineering/recipes/blastfurnace/fuel_charcoal_block.json 17bc8061148739e73c1e94d6fbfd10af552a34dc data/immersiveengineering/recipes/blastfurnace/fuel_coke.json @@ -753,12 +753,12 @@ b3f9dae2b6110e47bc291db8ee88c9205fa06fd4 data/immersiveengineering/recipes/craft d8ba0892e635c503727ac597020758acd2f0d962 data/immersiveengineering/recipes/crafting/coil_hv.json e9c43acfaac6c24a1ba7f92a19ac70d37b18f394 data/immersiveengineering/recipes/crafting/coil_lv.json 5bf38269f77b1f0a5b76b7b90a5734a369e0c2cb data/immersiveengineering/recipes/crafting/coil_mv.json -2aecdedbdcc918e92adabe223fe1c53b2b828357 data/immersiveengineering/recipes/crafting/cokebrick.json -48244c9bc3a409619cec677f5c01f575ddd6b1aa data/immersiveengineering/recipes/crafting/cokebrick_from_slab.json -b0c767604b0ae9eaa1b522155a8314992cebd42b data/immersiveengineering/recipes/crafting/cokebrick_to_slab.json 71239344b7be527ffd7f56e8907537ed1a81fe46 data/immersiveengineering/recipes/crafting/coke_from_slab.json 1e1722573b402445c080d61d6d5dcea0b41ca1ff data/immersiveengineering/recipes/crafting/coke_to_coal_coke.json 01705da617931a2b547eba060c76cbc7ce780397 data/immersiveengineering/recipes/crafting/coke_to_slab.json +2aecdedbdcc918e92adabe223fe1c53b2b828357 data/immersiveengineering/recipes/crafting/cokebrick.json +48244c9bc3a409619cec677f5c01f575ddd6b1aa data/immersiveengineering/recipes/crafting/cokebrick_from_slab.json +b0c767604b0ae9eaa1b522155a8314992cebd42b data/immersiveengineering/recipes/crafting/cokebrick_to_slab.json f649d64265418f8698a90fc114e801968f666343 data/immersiveengineering/recipes/crafting/component_iron.json 5d21c623db661a606fa117a32d1769e80ee1d786 data/immersiveengineering/recipes/crafting/component_steel.json 58366c4dd727eba8e7fd9df5ea8a504067e340b4 data/immersiveengineering/recipes/crafting/concrete.json @@ -846,6 +846,7 @@ dd41df5717e3473c7cfc5b3aa9f16d356bee015a data/immersiveengineering/recipes/craft 35b4e1a5ebe1d9ad7be8b57d4b73d60aa7ef3044 data/immersiveengineering/recipes/crafting/hammercrushing_uranium.json 4763f75ecab6fee3680e98e95c4e264637696e8c data/immersiveengineering/recipes/crafting/hammercrushing_zinc.json 2c8a714460c89ad58fd2039f2ad63e2afab4f102 data/immersiveengineering/recipes/crafting/heavy_engineering.json +77da5f974668d05652f3369a536d6d7abf686af0 data/immersiveengineering/recipes/crafting/hemp_fabric.json f6d1dec398da91550c95ccc1b06b40850595bc5e data/immersiveengineering/recipes/crafting/hempcrete.json 783b2e007eef95d446b1ef6a7c8b0075c221f3db data/immersiveengineering/recipes/crafting/hempcrete_brick.json 94284ccd89764deed710b5bde99f5f742917b287 data/immersiveengineering/recipes/crafting/hempcrete_brick_from_slab.json @@ -853,7 +854,6 @@ a4430c21efcdf6d64f98303551b96f44af62d320 data/immersiveengineering/recipes/craft 8436448af3c26f502c524b1ae009ee772675d63e data/immersiveengineering/recipes/crafting/hempcrete_from_slab.json 44f0510ec16bf78f8c023c21bb5bb5d54edb6173 data/immersiveengineering/recipes/crafting/hempcrete_pillar.json e2f10fcd5242b996b42a863a951dc85220e6269b data/immersiveengineering/recipes/crafting/hempcrete_to_slab.json -77da5f974668d05652f3369a536d6d7abf686af0 data/immersiveengineering/recipes/crafting/hemp_fabric.json d2d250913e6f81db08ddf5933da05c6ba59bb16c data/immersiveengineering/recipes/crafting/hoe_steel.json 44ae281f0a11c56f542274d7c461bb8645076368 data/immersiveengineering/recipes/crafting/ingot_aluminum_to_nugget_aluminum.json 7667194d539b85ddf7b68527beeab4b7bec18ce2 data/immersiveengineering/recipes/crafting/ingot_aluminum_to_storage_aluminum.json @@ -1146,6 +1146,11 @@ b6475cf2c741b51b1b0c932befa1131764f729a4 data/immersiveengineering/recipes/craft 9c6fbc679b7a535374fd9caf8c45e04ecff73bbc data/immersiveengineering/recipes/crafting/windmill.json ca79b47f87496725c0b8aedc524fbd688f409b57 data/immersiveengineering/recipes/crafting/windmill_blade.json 2a67def17900ec2ab7fd7a7e337d61d02c08852e data/immersiveengineering/recipes/crafting/windmill_sail.json +b1622b995947804eb43b3d8b6d3788a984357ce1 data/immersiveengineering/recipes/crafting/wire_aluminum.json +5ff13ff7da7495b2e2c23b45fe4e17193db6d45a data/immersiveengineering/recipes/crafting/wire_copper.json +c15497fec7cd2f688f29ef0168238d1d8c37f391 data/immersiveengineering/recipes/crafting/wire_electrum.json +7e2b555d5cefc823823dd375f6481d52c73b5cf2 data/immersiveengineering/recipes/crafting/wire_lead.json +7ed239d836032ac5fc5a65ad803e3c151b9bf27d data/immersiveengineering/recipes/crafting/wire_steel.json 74b7faa2e1f770ec8f5fea38dc545a77b289acfd data/immersiveengineering/recipes/crafting/wirecoil_copper.json 7090ad9596cf9feecb040b167316c522f128ea78 data/immersiveengineering/recipes/crafting/wirecoil_copper_ins.json 37dbc339af109d12fd84db2152186c82a92ec2be data/immersiveengineering/recipes/crafting/wirecoil_electrum.json @@ -1155,11 +1160,6 @@ ca79b47f87496725c0b8aedc524fbd688f409b57 data/immersiveengineering/recipes/craft 5974e3bcaf8ff0edbf28498a085ec836a433defc data/immersiveengineering/recipes/crafting/wirecoil_structure_rope.json 81d16110f165c75d044e9aa3a7f6411fd0addfcf data/immersiveengineering/recipes/crafting/wirecoil_structure_steel.json a5a6d88e12c53bc1f3c23273b445db37316f9c22 data/immersiveengineering/recipes/crafting/wirecutter.json -b1622b995947804eb43b3d8b6d3788a984357ce1 data/immersiveengineering/recipes/crafting/wire_aluminum.json -5ff13ff7da7495b2e2c23b45fe4e17193db6d45a data/immersiveengineering/recipes/crafting/wire_copper.json -c15497fec7cd2f688f29ef0168238d1d8c37f391 data/immersiveengineering/recipes/crafting/wire_electrum.json -7e2b555d5cefc823823dd375f6481d52c73b5cf2 data/immersiveengineering/recipes/crafting/wire_lead.json -7ed239d836032ac5fc5a65ad803e3c151b9bf27d data/immersiveengineering/recipes/crafting/wire_steel.json 88cc51486b9863b98b05be1ece4d70d8ee2da432 data/immersiveengineering/recipes/crafting/wooden_barrel.json 755036a592dcaec99335002ecb53929c67a0b326 data/immersiveengineering/recipes/crafting/wooden_grip.json 3c63b7ba85e6a5c4ef1c2a38e0daf9984fe04666 data/immersiveengineering/recipes/crafting/workbench.json @@ -1372,7 +1372,9 @@ d6fb65af6c9e672962b1e4d9b60f60a29b4e1423 data/immersiveengineering/recipes/metal 81c1c411e8d3d0a4f7f5089ef681eec666b8ea22 data/immersiveengineering/recipes/metalpress/wire_tungsten.json 6fc70ef15949e3f7dfd784771a631add028db317 data/immersiveengineering/recipes/metalpress/wire_uranium.json 38368a3df786fc36ba6ab67552c279a4952c6b47 data/immersiveengineering/recipes/metalpress/wire_zinc.json +ed8594b2191f5fed0e703b33be140b7960cda34a data/immersiveengineering/recipes/mineral/amethyst_crevasse.json f1a949f7d34b54dd554c92b9e3a9bdbd27c5ca80 data/immersiveengineering/recipes/mineral/ancient_debris.json +d059fd73b43d7aee2c72c73cb02400e429a6cd4d data/immersiveengineering/recipes/mineral/ancient_seabed.json 98b1175a55156afd2fcf5b98173f919dfbc947b4 data/immersiveengineering/recipes/mineral/auricupride.json da2d600b576a0886e349366c9aec0f0ac387da74 data/immersiveengineering/recipes/mineral/beryl.json a9feddf3a11ed3e46a2cc5f1045b8ab500d33bab data/immersiveengineering/recipes/mineral/bituminous_coal.json @@ -1382,12 +1384,13 @@ a9feddf3a11ed3e46a2cc5f1045b8ab500d33bab data/immersiveengineering/recipes/miner 1a9b42e2996a2ab71570dc6e1694d880deddfd92 data/immersiveengineering/recipes/mineral/cooled_lava_tube.json a2b704404b0928450205b58fbd985fd15a17b96e data/immersiveengineering/recipes/mineral/cooperite.json 37e7331f387e9b95db65ff3b75e2a466288af560 data/immersiveengineering/recipes/mineral/galena.json +ccb64f5947ceccc4a52865c4d3beae3d388f9754 data/immersiveengineering/recipes/mineral/hardened_clay_pan.json 1deb812a17a9f1e81ade28cd870b100584f9916b data/immersiveengineering/recipes/mineral/igneous_rock.json 249b05ada0fa70c2164d01dbea6d9b8e5ddd75a3 data/immersiveengineering/recipes/mineral/laterite.json 17c789147caa180597847c91c1a7e8b17bb56155 data/immersiveengineering/recipes/mineral/mephitic_quarzite.json 04b26dbc0e934db06e4bfd4433bf1511e9410fda data/immersiveengineering/recipes/mineral/nether_silt.json 01585afd51e4519647b2f6722c83a8eebe22fe85 data/immersiveengineering/recipes/mineral/pentlandite.json -64597cb854b7ccc56b56ec39cc99789a94d92526 data/immersiveengineering/recipes/mineral/silt.json +046699e98c21199abe4a3fcc753a86529e608313 data/immersiveengineering/recipes/mineral/silt.json cd25d5ea0cc55277ecd82d9191b1c68e808e1502 data/immersiveengineering/recipes/mineral/uraninite.json 45b31f063c456bf39a06e3939febf72f678299b3 data/immersiveengineering/recipes/mineral/wolframite.json 98221fb6e8e51b0d2852a191548bdaa465287e65 data/immersiveengineering/recipes/mixer/concrete.json diff --git a/src/generated/resources/data/immersiveengineering/recipes/mineral/amethyst_crevasse.json b/src/generated/resources/data/immersiveengineering/recipes/mineral/amethyst_crevasse.json new file mode 100644 index 0000000000..2f7783f620 --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/recipes/mineral/amethyst_crevasse.json @@ -0,0 +1,48 @@ +{ + "type": "immersiveengineering:mineral_mix", + "dimensions": [ + "minecraft:overworld" + ], + "fail_chance": 0.1, + "ores": [ + { + "chance": 0.4, + "output": { + "item": "minecraft:amethyst_block" + } + }, + { + "chance": 0.3, + "output": { + "item": "minecraft:calcite" + } + }, + { + "chance": 0.3, + "output": { + "item": "minecraft:smooth_basalt" + } + } + ], + "spoils": [ + { + "chance": 0.2, + "output": { + "item": "minecraft:gravel" + } + }, + { + "chance": 0.5, + "output": { + "item": "minecraft:cobblestone" + } + }, + { + "chance": 0.3, + "output": { + "item": "minecraft:cobbled_deepslate" + } + } + ], + "weight": 10 +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/recipes/mineral/ancient_seabed.json b/src/generated/resources/data/immersiveengineering/recipes/mineral/ancient_seabed.json new file mode 100644 index 0000000000..fef9256161 --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/recipes/mineral/ancient_seabed.json @@ -0,0 +1,48 @@ +{ + "type": "immersiveengineering:mineral_mix", + "dimensions": [ + "minecraft:overworld" + ], + "fail_chance": 0.05, + "ores": [ + { + "chance": 0.65, + "output": { + "item": "minecraft:calcite" + } + }, + { + "chance": 0.3, + "output": { + "item": "minecraft:dripstone_block" + } + }, + { + "chance": 0.05, + "output": { + "item": "minecraft:bone_block" + } + } + ], + "spoils": [ + { + "chance": 0.6, + "output": { + "item": "minecraft:sandstone" + } + }, + { + "chance": 0.3, + "output": { + "item": "minecraft:gravel" + } + }, + { + "chance": 0.1, + "output": { + "item": "minecraft:sand" + } + } + ], + "weight": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/recipes/mineral/hardened_clay_pan.json b/src/generated/resources/data/immersiveengineering/recipes/mineral/hardened_clay_pan.json new file mode 100644 index 0000000000..23a431504d --- /dev/null +++ b/src/generated/resources/data/immersiveengineering/recipes/mineral/hardened_clay_pan.json @@ -0,0 +1,48 @@ +{ + "type": "immersiveengineering:mineral_mix", + "dimensions": [ + "minecraft:overworld" + ], + "fail_chance": 0.05, + "ores": [ + { + "chance": 0.6, + "output": { + "item": "minecraft:terracotta" + } + }, + { + "chance": 0.3, + "output": { + "item": "minecraft:red_sandstone" + } + }, + { + "chance": 0.1, + "output": { + "item": "minecraft:red_sand" + } + } + ], + "spoils": [ + { + "chance": 0.2, + "output": { + "item": "minecraft:coarse_dirt" + } + }, + { + "chance": 0.5, + "output": { + "item": "minecraft:cobblestone" + } + }, + { + "chance": 0.3, + "output": { + "item": "minecraft:gravel" + } + } + ], + "weight": 15 +} \ No newline at end of file diff --git a/src/generated/resources/data/immersiveengineering/recipes/mineral/silt.json b/src/generated/resources/data/immersiveengineering/recipes/mineral/silt.json index 9932d3a622..b8df2f3ddd 100644 --- a/src/generated/resources/data/immersiveengineering/recipes/mineral/silt.json +++ b/src/generated/resources/data/immersiveengineering/recipes/mineral/silt.json @@ -40,7 +40,7 @@ { "chance": 0.3, "output": { - "item": "minecraft:cobbled_deepslate" + "item": "minecraft:gravel" } } ], diff --git a/src/main/resources/assets/immersiveengineering/lang/en_us.json b/src/main/resources/assets/immersiveengineering/lang/en_us.json index 4d3ad454d4..e90593bf0b 100644 --- a/src/main/resources/assets/immersiveengineering/lang/en_us.json +++ b/src/main/resources/assets/immersiveengineering/lang/en_us.json @@ -235,6 +235,9 @@ "desc.immersiveengineering.info.mineral.bituminous_coal": "Bituminous Coal", "desc.immersiveengineering.info.mineral.silt": "Silt", "desc.immersiveengineering.info.mineral.igneous_rock": "Igneous Rock", + "desc.immersiveengineering.info.mineral.amethyst_crevasse": "Amethyst Crevasse", + "desc.immersiveengineering.info.mineral.hardened_clay_pan": "Hardened Claypan", + "desc.immersiveengineering.info.mineral.ancient_seabed": "Ancient Seabed", "desc.immersiveengineering.info.mineral.pentlandite": "Pentlandite", "desc.immersiveengineering.info.mineral.chalcopyrite": "Chalcopyrite", "desc.immersiveengineering.info.mineral.laterite": "Laterite",