diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 6dfec99e..3c7d193a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -59,12 +59,14 @@ cbf1f930da06b0d1194760411a39f55b8ced1189 assets/bloodmagic/models/item/basemonst 09839c1f062c6a9ef143d81b6ad89065a9f4e39f assets/bloodmagic/models/item/basemonstersoul_destructive.json 23e9b2f79cea038b8d4c840854946ebedd444532 assets/bloodmagic/models/item/basemonstersoul_steadfast.json f5bcdfe42e526de447df29ed801798bb33a90dfa assets/bloodmagic/models/item/basemonstersoul_vengeful.json +bbe897c889c5378c523bf2459900a5a9bad8f9dc assets/bloodmagic/models/item/basiccuttingfluid.json d3c33ff908880e7abc8a2cd977304419ec48a23d assets/bloodmagic/models/item/bettercapacityrune.json 7a1c55d55fe59d8a70bc2a867d127cb303c1ba23 assets/bloodmagic/models/item/blankrune.json 3f207755d189c316cf06734a268669afc6b77766 assets/bloodmagic/models/item/blankslate.json ef26c203159e9f55672ed5ea75107d4a9d081cfe assets/bloodmagic/models/item/bloodlightsigil.json c795d1b7aa99ce27da63868f81bac615cf199c66 assets/bloodmagic/models/item/bloodstonebrick.json 7315e49149eca494e6b132d383082cb76fc9c0e4 assets/bloodmagic/models/item/chargingrune.json +738eb84b10400c04e0c7a5a253e55c109c233ec8 assets/bloodmagic/models/item/coalsand.json f404148f9df3a61da3c18175885ffa56b2a85a6a assets/bloodmagic/models/item/daggerofsacrifice.json 9671199681493a396e07d7bcab20137c22d981d5 assets/bloodmagic/models/item/demonslate.json 7af07ab578bbd20e2f834b26d9cafb5fe23bc7d4 assets/bloodmagic/models/item/dislocationrune.json @@ -74,12 +76,15 @@ f4531e22aa1db1cff324db5ccb344d3b9fa85c8d assets/bloodmagic/models/item/divinatio 4d56efd7fdbf430f49903ce201577047687c3804 assets/bloodmagic/models/item/earthritualstone.json 98ee75786f9d0ab2a8c0835896d07d18df77de0f assets/bloodmagic/models/item/earthscribetool.json 4c39378f6c14dc243a7d52564e5a21df94683415 assets/bloodmagic/models/item/etherealslate.json +6ccd9f4e27f43b7f30217e73e0cdfad3bc826b1e assets/bloodmagic/models/item/explosivepowder.json c36bde4f98c0aeb3bf0f369ad3bc067e5f0dc916 assets/bloodmagic/models/item/fireritualstone.json b5708a8cc7259fd36ffeabd155ea085b9fdef0fd assets/bloodmagic/models/item/firescribetool.json 537a52d7b59dc996ea23f24d86a4add87c61c6a0 assets/bloodmagic/models/item/furnacecell_primitive.json +ce2465efcc0c17583c8b3c7251a6cecefdce1970 assets/bloodmagic/models/item/goldsand.json 44663089f348642bcca1c5020b5081c3ab172f92 assets/bloodmagic/models/item/growthsigil.json f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil.json 109b5485c25d978af55b46682d5bfa7008909458 assets/bloodmagic/models/item/infusedslate.json +36cde62c239e351b9c32958135e893829d1d3925 assets/bloodmagic/models/item/ironsand.json 9b9fc4a11a187257d30334cd3faa949790b6ca29 assets/bloodmagic/models/item/largebloodstonebrick.json 413fa378c40dec89cb765a7d5c8bfc9cdef1d828 assets/bloodmagic/models/item/lavacrystal.json 588c5208e3f4ef941cd8375aeceeed44484d85d3 assets/bloodmagic/models/item/lavasigil.json @@ -89,6 +94,9 @@ f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil. 9e377ab2c131993f96ab6fb544bda4dbba0ab87e assets/bloodmagic/models/item/masterritualstone.json 7596826c5b40c2809eb0a42eb5f5f2089290e3e5 assets/bloodmagic/models/item/miningsigil.json ff9b802098659824626dc90dbb5a0d8960234228 assets/bloodmagic/models/item/orbcapacityrune.json +aa3947434e24f4a4c4ae43428de3f2dd2ceb31a6 assets/bloodmagic/models/item/plantoil.json +51720bf25f152c38056c81cebf79ca97b78dbb48 assets/bloodmagic/models/item/primitive_explosive_cell.json +aa8684bdce288295cfbb41248ff7f008f98b5e7b assets/bloodmagic/models/item/primitive_hydration_cell.json b4e1259784354b048cd7ec5ef888a182e3909dc6 assets/bloodmagic/models/item/reagentair.json 919b17ed4620c7b76c86494683951ab6e7fc7864 assets/bloodmagic/models/item/reagentbloodlight.json c0a7633527bdd25fc85e78fc4838733063726d88 assets/bloodmagic/models/item/reagentfastminer.json @@ -103,6 +111,7 @@ fd1447d943ddc4540a51a72dcbb245d77d45da71 assets/bloodmagic/models/item/reagentwa 2722891c9c40b124d85bf9ff8eb885e175f5e6ff assets/bloodmagic/models/item/ritualstone.json db73abb3bcb1731b6fc389e3577910b6aab87b10 assets/bloodmagic/models/item/sacrificerune.json 9403d6195d4d38d5876c2a42f4edfb9bdcd05210 assets/bloodmagic/models/item/sacrificialdagger.json +b23b701e93011247714ebdaffd6d52e918ba3d8a assets/bloodmagic/models/item/saltpeter.json b8582a5cd6ca35279e9b35931f1c5ca089b094b8 assets/bloodmagic/models/item/sanguinereverter.json cc71421e98ee7ee047a4cfbb6cb69529c2b02d4e assets/bloodmagic/models/item/selfsacrificerune.json ea5747638d0b5dcc03f008b202cc60a11e0827bb assets/bloodmagic/models/item/sigilofmagnetism.json @@ -112,6 +121,7 @@ b49e7f34913e32ccb68eeb6f6c196ff6b209f482 assets/bloodmagic/models/item/soulgempe f8db155d49b0f2c37504bac46a8974d4bf90db3e assets/bloodmagic/models/item/soulsnare.json fe2b201007c974229509f6900c6eb8b03d158b0a assets/bloodmagic/models/item/soulsword.json 52d21027ac6fed000e77b5e8ad9102319b25cb33 assets/bloodmagic/models/item/speedrune.json +26cb0aae63ea4f27efd5337c90c580ddd7481b99 assets/bloodmagic/models/item/sulfur.json e8fe01c5cddc268538681889f3161472a8f1c8ad assets/bloodmagic/models/item/variants/growthsigil_activated.json 20c802279de4df496057795c2e891fa54a21376f assets/bloodmagic/models/item/variants/growthsigil_deactivated.json 2778ea3a62ce6dd718a557beee7b5329bb185ff9 assets/bloodmagic/models/item/variants/icesigil_activated.json @@ -165,6 +175,7 @@ e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bl 4c24af93a64071aadc0308b27bcbc44572e5ccfc data/bloodmagic/advancements/recipes/bloodmagictab/largebloodstonebrick.json 344567e6f5671131addcfebbd92d18e5cbd66ef5 data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json 091fbd276c5ad173716e9e7474fa278e742a662f data/bloodmagic/advancements/recipes/bloodmagictab/primitive_furnace_cell.json +7cf09fef1a5bfc1401ecc34857bdf78c7282c12a data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json 01e90bb9c59d44a52777ecc0cf28754295fda675 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json 836e1fc171dba197e02d6a9e3e61a3718cb5a482 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json @@ -172,6 +183,8 @@ c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bl 832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json 2d29dd0c24c4c11d7438cdeeb26b9357d4359e2c data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json 7a7f9f995d2414289d07c0a145647c8e735a6b78 data/bloodmagic/advancements/recipes/bloodmagictab/soul_snare.json +1c751b044e5ce4d05746857d6cf5e812e94a4026 data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json +af036dd1bd5193c2d36e7cb96c0a2b73a37b76ab data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json 639ebb2ccabb2eaece59be96c2e6f28c31f4d2f4 data/bloodmagic/loot_tables/blocks/accelerationrune.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/airritualstone.json 1ed1f3cebe68450b6d5ca3ce69e4728a7d250b1c data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json @@ -199,7 +212,18 @@ f748a5ba8838b50de0502f132fe2a65f4726dae6 data/bloodmagic/loot_tables/blocks/soul 015e07226fd90935f7ec663f4bcf3873a57a82d1 data/bloodmagic/loot_tables/blocks/speedrune.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/waterritualstone.json 2df19ff659705a5408ce0819a947764673404388 data/bloodmagic/recipes/alchemy_table.json -3a80b920539778b3eb9eab8fdf1eb76c1ab9d8d5 data/bloodmagic/recipes/alchemytable/string.json +f86432e8fef0d6e140e27f575063704b7e843d75 data/bloodmagic/recipes/alchemytable/bread.json +e50009fa724173c2dcb4fab49b4f029039f69bf8 data/bloodmagic/recipes/alchemytable/clay_from_sand.json +96cc66cdb9c5f786eaa899e1fbdd38144e44a0fe data/bloodmagic/recipes/alchemytable/explosive_powder.json +ecd27b8222af8f0608e61cdc4278aeb6d88d14b4 data/bloodmagic/recipes/alchemytable/flint_from_gravel.json +aff95e4322f9e8daaffc2337964f95ab6f9d631c data/bloodmagic/recipes/alchemytable/grass_block.json +540edca1f507d366e55887b4429a9952c00f4060 data/bloodmagic/recipes/alchemytable/gunpowder.json +0657a60976678fdfbdf0b8ee2c178502520d194a data/bloodmagic/recipes/alchemytable/leather_from_flesh.json +0a5ce0f2d09a596fb47b27a60e66eceeb04e0b0d data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json +f1fd76dab242882e327b4677b95328cb3a52deee data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json +e9f5a06e4800cb03cc13480db9fdb7b9fa47f487 data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json +f41e9bf8376ffcad07752b5657e27e06e500be0a data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json +a91e81c79959b522bcd1bac901bca646184015de data/bloodmagic/recipes/alchemytable/string.json 3c9d829f7bff8a4d607c46fc3ff4f86dffa28fd5 data/bloodmagic/recipes/altar/air_tool.json f41b0e9dfab608c42a85c3c5c5bbc050b03f02a1 data/bloodmagic/recipes/altar/apprenticebloodorb.json 2a67e37497a571b5ee944375d315fddccea87697 data/bloodmagic/recipes/altar/daggerofsacrifice.json @@ -215,7 +239,16 @@ d79a96eb3eed597f1c18a8983764a6362a24748c data/bloodmagic/recipes/altar/dusk_tool 926d4a0e165c87a15a609744d832d2f5f04a40d0 data/bloodmagic/recipes/altar/water_tool.json 7551501cf361667ec7454c307b9d2368536fbed6 data/bloodmagic/recipes/altar/weakbloodorb.json 5807b2515f4a2dc9855327940e6055f6947f0749 data/bloodmagic/recipes/arc.json -352ba51f1c988029059e5b53a3a11432d0591b58 data/bloodmagic/recipes/arc/weakbloodshard.json +4817530f1762a71663162c3027ee0e42dda6cf73 data/bloodmagic/recipes/arc/clay_from_sand.json +dac5f561ad15c54f73ab90d860575aa2476e4b8b data/bloodmagic/recipes/arc/clay_from_terracotta.json +989d04edd3a740e8e4ddc37c233d2e0956264783 data/bloodmagic/recipes/arc/netherrack_to_sulfer.json +96d124582fab414cd075a42a706785d9ae2925b4 data/bloodmagic/recipes/arc/ore/dustgold.json +dd04af92a3f395725043829de2d46fe93a073bb8 data/bloodmagic/recipes/arc/ore/dustiron.json +de77325557a73ff844e16be948753dfa25ca7880 data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json +4f533621483d530a7b000cdb5dc5044996cd8e68 data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json +678b1286bbe454d55883455fe2922a79a212eb5e data/bloodmagic/recipes/arc/reversion/master_blood_orb.json +0cc1158b0bc9e83b81f73f7c6532c280ebbc24a6 data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json +107939af94dbcb356ea5acadf52f70c3e4d13454 data/bloodmagic/recipes/arc/weakbloodshard.json e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json 1890706e5b93cd6df764b0419483c348e0d7f277 data/bloodmagic/recipes/array/divinationsigil.json @@ -237,11 +270,14 @@ eeb5e64b8bc90adc2554dde88b8792b92ad7c8cc data/bloodmagic/recipes/bloodstonebrick 63bca28ba5eebb9c488c819bcb117595eadb877d data/bloodmagic/recipes/largebloodstonebrick.json 9dedad36e9d2ab6688e069c2e6df3851c395b583 data/bloodmagic/recipes/lava_crystal.json 0b1a11f0e1b6bc317e2dbf04560a81581623f41e data/bloodmagic/recipes/primitive_furnace_cell.json +7e1a70935e9b5ba6b345af6a7077287896ec6cfe data/bloodmagic/recipes/primitive_hydration_cell.json bfd7925ad30534463d7daf0f7dce03cf1502cbcf data/bloodmagic/recipes/ritual_diviner_0.json 2ec436681cdd169bae99d090bb889c2a45420b6c data/bloodmagic/recipes/ritual_diviner_1.json 7757e5fd52f71b0d21595e072593fc592210dd64 data/bloodmagic/recipes/ritual_stone_blank.json 8608f828f997b1a8015287bd9cd436e9d7dff2ff data/bloodmagic/recipes/ritual_stone_master.json aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dagger.json +1eab0535b38c4a8a021a72244b9e6a75353970f0 data/bloodmagic/recipes/smelting/ingot_gold.json +477f968ee84a5b9cd3e9c2a9864be32b5e7d3a32 data/bloodmagic/recipes/smelting/ingot_iron.json d699e777c72a5f61c4e6cdfea8705628e1c2b855 data/bloodmagic/recipes/soul_forge.json 2455bf8c205c7244fef2b7d7afeef060e30520b7 data/bloodmagic/recipes/soul_snare.json f4763a58a8f471ec1aaa997cbd36eac8c7d51a12 data/bloodmagic/recipes/soulforge/arcaneashes.json @@ -258,7 +294,14 @@ a222d09abf1ea61feb684f2ac23d011c2034f526 data/bloodmagic/recipes/soulforge/reage 4a4340f334c51beaacb77fd201298ad94b71e79c data/bloodmagic/recipes/soulforge/sanguine_reverter.json 7e281841a2953c1284d332c2bbf75097f8128241 data/bloodmagic/recipes/soulforge/sentientsword.json d7d993bb729284a5201c164ea81fbe1d8e4e4750 data/bloodmagic/recipes/weak_activation_crystal.json -fdead91c0aa241e991f797de38f0b56d6ef3916a data/bloodmagic/tags/items/arc_tool.json -80636d8b3770da483ba6cd41870ecb0ad042f2f0 data/bloodmagic/tags/items/arc_tool_furnace.json -65326040c8974fcfcc8711d29040b4297ff55ec1 data/bloodmagic/tags/items/arc_tool_reverter.json -14fb88c612622be110e273818eee9512cd285d56 data/bloodmagic/tags/items/arc_tool_sieve.json +54a0fcc973590c80a4d3cd6b82f5602ba7208438 data/bloodmagic/tags/items/arc/explosive.json +331b978ba851ae3c48390c5d992bcd5f28ac644d data/bloodmagic/tags/items/arc/furnace.json +a62b82e1f59284d230b4b983ffa4a4cecb288c0e data/bloodmagic/tags/items/arc/hydrate.json +65326040c8974fcfcc8711d29040b4297ff55ec1 data/bloodmagic/tags/items/arc/reverter.json +14fb88c612622be110e273818eee9512cd285d56 data/bloodmagic/tags/items/arc/sieve.json +9a3b79a6c6ac1a4277778393141567e595f43417 data/bloodmagic/tags/items/arc/tool.json +4f8f46a7e30fe81d36790d3ffed37efef7c87d06 data/forge/tags/items/dusts/coal.json +82f2679934e550a1188658350e52cfac7c450c4d data/forge/tags/items/dusts/gold.json +625a1e6a3b635b2ac5176a49afbae9b476de4f71 data/forge/tags/items/dusts/iron.json +9380fe45b06787ba776af4a7d542a047c1441031 data/forge/tags/items/dusts/saltpeter.json +5c709b6444acb94ca784c33618547ba535e15db2 data/forge/tags/items/dusts/sulfur.json diff --git a/src/generated/resources/assets/bloodmagic/models/item/basiccuttingfluid.json b/src/generated/resources/assets/bloodmagic/models/item/basiccuttingfluid.json new file mode 100644 index 00000000..319290a5 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/basiccuttingfluid.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/basiccuttingfluid" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/coalsand.json b/src/generated/resources/assets/bloodmagic/models/item/coalsand.json new file mode 100644 index 00000000..bee052e6 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/coalsand.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/coalsand" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/explosivepowder.json b/src/generated/resources/assets/bloodmagic/models/item/explosivepowder.json new file mode 100644 index 00000000..ad810423 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/explosivepowder.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/explosivepowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/goldsand.json b/src/generated/resources/assets/bloodmagic/models/item/goldsand.json new file mode 100644 index 00000000..8cd0e2d0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/goldsand.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/goldsand" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ironsand.json b/src/generated/resources/assets/bloodmagic/models/item/ironsand.json new file mode 100644 index 00000000..fb321d47 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/ironsand.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/ironsand" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/plantoil.json b/src/generated/resources/assets/bloodmagic/models/item/plantoil.json new file mode 100644 index 00000000..4760c6a0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/plantoil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/plantoil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/primitive_explosive_cell.json b/src/generated/resources/assets/bloodmagic/models/item/primitive_explosive_cell.json new file mode 100644 index 00000000..d440b7cc --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/primitive_explosive_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/primitive_explosive_cell" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/primitive_hydration_cell.json b/src/generated/resources/assets/bloodmagic/models/item/primitive_hydration_cell.json new file mode 100644 index 00000000..1ab5b2a7 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/primitive_hydration_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/primitive_hydration_cell" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/saltpeter.json b/src/generated/resources/assets/bloodmagic/models/item/saltpeter.json new file mode 100644 index 00000000..6c8a2693 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/saltpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/saltpeter" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sulfur.json b/src/generated/resources/assets/bloodmagic/models/item/sulfur.json new file mode 100644 index 00000000..33aae940 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/sulfur.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "bloodmagic:item/sulfur" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json new file mode 100644 index 00000000..69a0f6b6 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:primitive_hydration_cell" + ] + }, + "criteria": { + "has_magician_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:magicianbloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:primitive_hydration_cell" + } + } + }, + "requirements": [ + [ + "has_magician_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json b/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json new file mode 100644 index 00000000..aceef4c7 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:smelting/ingot_gold" + ] + }, + "criteria": { + "has_gold_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:goldsand" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:smelting/ingot_gold" + } + } + }, + "requirements": [ + [ + "has_gold_sand", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json b/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json new file mode 100644 index 00000000..444757df --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:smelting/ingot_iron" + ] + }, + "criteria": { + "has_iron_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:ironsand" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:smelting/ingot_iron" + } + } + }, + "requirements": [ + [ + "has_iron_sand", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json new file mode 100644 index 00000000..3fe65060 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json @@ -0,0 +1,17 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:crops/wheat" + }, + { + "item": "minecraft:sugar" + } + ], + "output": { + "item": "minecraft:bread" + }, + "syphon": 100, + "ticks": 200, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/clay_from_sand.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/clay_from_sand.json new file mode 100644 index 00000000..8cd302ff --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/clay_from_sand.json @@ -0,0 +1,21 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:sand" + }, + { + "tag": "forge:sand" + }, + { + "item": "minecraft:water_bucket" + } + ], + "output": { + "item": "minecraft:clay_ball", + "count": 2 + }, + "syphon": 50, + "ticks": 100, + "upgradeLevel": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/explosive_powder.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/explosive_powder.json new file mode 100644 index 00000000..87b3103b --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/explosive_powder.json @@ -0,0 +1,21 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:gunpowder" + }, + { + "tag": "forge:gunpowder" + }, + { + "tag": "forge:dusts/coal" + } + ], + "output": { + "item": "bloodmagic:explosivepowder", + "nbt": "{Damage:0}" + }, + "syphon": 500, + "ticks": 200, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/flint_from_gravel.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/flint_from_gravel.json new file mode 100644 index 00000000..cbbcce43 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/flint_from_gravel.json @@ -0,0 +1,17 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:flint" + } + ], + "output": { + "item": "minecraft:flint" + }, + "syphon": 50, + "ticks": 20, + "upgradeLevel": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/grass_block.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/grass_block.json new file mode 100644 index 00000000..03e6aee6 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/grass_block.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:dirt" + }, + { + "item": "minecraft:bone_meal" + }, + { + "item": "minecraft:wheat_seeds" + } + ], + "output": { + "item": "minecraft:grass_block" + }, + "syphon": 200, + "ticks": 200, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/gunpowder.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/gunpowder.json new file mode 100644 index 00000000..aec2762a --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/gunpowder.json @@ -0,0 +1,21 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:dusts/sulfur" + }, + { + "tag": "forge:dusts/saltpeter" + }, + { + "tag": "minecraft:coals" + } + ], + "output": { + "item": "minecraft:gunpowder", + "count": 3 + }, + "syphon": 0, + "ticks": 100, + "upgradeLevel": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/leather_from_flesh.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/leather_from_flesh.json new file mode 100644 index 00000000..6fd3738b --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/leather_from_flesh.json @@ -0,0 +1,30 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "item": "minecraft:rotten_flesh" + }, + { + "item": "minecraft:rotten_flesh" + }, + { + "item": "minecraft:rotten_flesh" + }, + { + "item": "minecraft:rotten_flesh" + }, + { + "item": "minecraft:flint" + }, + { + "item": "minecraft:water_bucket" + } + ], + "output": { + "item": "minecraft:leather", + "count": 4 + }, + "syphon": 100, + "ticks": 200, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json new file mode 100644 index 00000000..718a1062 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:crops/beetroot" + }, + { + "tag": "forge:crops/beetroot" + }, + { + "tag": "forge:crops/beetroot" + }, + { + "item": "minecraft:bone_meal" + } + ], + "output": { + "item": "bloodmagic:plantoil" + }, + "syphon": 100, + "ticks": 100, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json new file mode 100644 index 00000000..51ca6f26 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json @@ -0,0 +1,23 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:crops/carrot" + }, + { + "tag": "forge:crops/carrot" + }, + { + "tag": "forge:crops/carrot" + }, + { + "item": "minecraft:bone_meal" + } + ], + "output": { + "item": "bloodmagic:plantoil" + }, + "syphon": 100, + "ticks": 100, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json new file mode 100644 index 00000000..8c0f281b --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:crops/potato" + }, + { + "tag": "forge:crops/potato" + }, + { + "item": "minecraft:bone_meal" + } + ], + "output": { + "item": "bloodmagic:plantoil" + }, + "syphon": 100, + "ticks": 100, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json new file mode 100644 index 00000000..af4e9e80 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json @@ -0,0 +1,20 @@ +{ + "type": "bloodmagic:alchemytable", + "input": [ + { + "tag": "forge:crops/wheat" + }, + { + "tag": "forge:crops/wheat" + }, + { + "item": "minecraft:bone_meal" + } + ], + "output": { + "item": "bloodmagic:plantoil" + }, + "syphon": 100, + "ticks": 100, + "upgradeLevel": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/string.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/string.json index b2ae9653..0455b315 100644 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/string.json +++ b/src/generated/resources/data/bloodmagic/recipes/alchemytable/string.json @@ -12,7 +12,7 @@ "item": "minecraft:string", "count": 4 }, - "syphon": 0, + "syphon": 100, "ticks": 100, "upgradeLevel": 0 } \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_sand.json b/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_sand.json new file mode 100644 index 00000000..cae367af --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_sand.json @@ -0,0 +1,24 @@ +{ + "type": "bloodmagic:arc", + "input": { + "tag": "forge:sand" + }, + "tool": { + "tag": "bloodmagic:arc/hydrate" + }, + "inputfluid": { + "amount": 200, + "fluid": "minecraft:water" + }, + "addedoutput": [ + { + "chance": 0.5, + "type": { + "item": "minecraft:clay_ball" + } + } + ], + "output": { + "item": "minecraft:clay_ball" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_terracotta.json b/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_terracotta.json new file mode 100644 index 00000000..3dcca62b --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_terracotta.json @@ -0,0 +1,16 @@ +{ + "type": "bloodmagic:arc", + "input": { + "item": "minecraft:terracotta" + }, + "tool": { + "tag": "bloodmagic:arc/hydrate" + }, + "inputfluid": { + "amount": 200, + "fluid": "minecraft:water" + }, + "output": { + "item": "minecraft:clay" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/netherrack_to_sulfer.json b/src/generated/resources/data/bloodmagic/recipes/arc/netherrack_to_sulfer.json new file mode 100644 index 00000000..d5969a6f --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/netherrack_to_sulfer.json @@ -0,0 +1,16 @@ +{ + "type": "bloodmagic:arc", + "input": { + "tag": "forge:netherrack" + }, + "tool": { + "tag": "bloodmagic:arc/explosive" + }, + "outputfluid": { + "fluid": "minecraft:lava", + "amount": 5 + }, + "output": { + "item": "bloodmagic:sulfur" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustgold.json b/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustgold.json new file mode 100644 index 00000000..21d5f762 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustgold.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:arc", + "input": { + "item": "minecraft:gold_ore" + }, + "tool": { + "tag": "bloodmagic:arc/explosive" + }, + "output": { + "item": "bloodmagic:goldsand", + "count": 2 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustiron.json b/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustiron.json new file mode 100644 index 00000000..58a470d1 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustiron.json @@ -0,0 +1,13 @@ +{ + "type": "bloodmagic:arc", + "input": { + "item": "minecraft:iron_ore" + }, + "tool": { + "tag": "bloodmagic:arc/explosive" + }, + "output": { + "item": "bloodmagic:ironsand", + "count": 2 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json new file mode 100644 index 00000000..50196dd9 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json @@ -0,0 +1,12 @@ +{ + "type": "bloodmagic:arc", + "input": { + "item": "bloodmagic:apprenticebloodorb" + }, + "tool": { + "tag": "bloodmagic:arc/reverter" + }, + "output": { + "item": "minecraft:redstone_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json new file mode 100644 index 00000000..503d558a --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json @@ -0,0 +1,12 @@ +{ + "type": "bloodmagic:arc", + "input": { + "item": "bloodmagic:magicianbloodorb" + }, + "tool": { + "tag": "bloodmagic:arc/reverter" + }, + "output": { + "item": "minecraft:gold_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/master_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/master_blood_orb.json new file mode 100644 index 00000000..2d44f9b4 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/master_blood_orb.json @@ -0,0 +1,12 @@ +{ + "type": "bloodmagic:arc", + "input": { + "item": "bloodmagic:masterbloodorb" + }, + "tool": { + "tag": "bloodmagic:arc/reverter" + }, + "output": { + "item": "bloodmagic:weakbloodshard" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json new file mode 100644 index 00000000..62f88b09 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json @@ -0,0 +1,12 @@ +{ + "type": "bloodmagic:arc", + "input": { + "item": "bloodmagic:weakbloodorb" + }, + "tool": { + "tag": "bloodmagic:arc/reverter" + }, + "output": { + "item": "minecraft:diamond" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/weakbloodshard.json b/src/generated/resources/data/bloodmagic/recipes/arc/weakbloodshard.json index f20e8ec8..2aa1065b 100644 --- a/src/generated/resources/data/bloodmagic/recipes/arc/weakbloodshard.json +++ b/src/generated/resources/data/bloodmagic/recipes/arc/weakbloodshard.json @@ -4,7 +4,7 @@ "item": "bloodmagic:infusedslate" }, "tool": { - "tag": "bloodmagic:arc_tool_reverter" + "tag": "bloodmagic:arc/reverter" }, "addedoutput": [ { diff --git a/src/generated/resources/data/bloodmagic/recipes/primitive_hydration_cell.json b/src/generated/resources/data/bloodmagic/recipes/primitive_hydration_cell.json new file mode 100644 index 00000000..241d455f --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/primitive_hydration_cell.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "csc", + "cBc", + "coc" + ], + "key": { + "B": { + "item": "minecraft:water_bucket" + }, + "c": { + "tag": "forge:cobblestone" + }, + "o": { + "type": "bloodmagic:bloodorb", + "orb_tier": 3 + }, + "s": { + "item": "bloodmagic:blankslate" + } + }, + "result": { + "item": "bloodmagic:primitive_hydration_cell" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_gold.json b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_gold.json new file mode 100644 index 00000000..e8bbf60c --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_gold.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "tag": "forge:dusts/gold" + }, + "result": "minecraft:gold_ingot", + "experience": 0.0, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_iron.json b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_iron.json new file mode 100644 index 00000000..7ca7a664 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_iron.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "tag": "forge:dusts/iron" + }, + "result": "minecraft:iron_ingot", + "experience": 0.0, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/explosive.json b/src/generated/resources/data/bloodmagic/tags/items/arc/explosive.json new file mode 100644 index 00000000..7488cf64 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/tags/items/arc/explosive.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "bloodmagic:explosivepowder", + "bloodmagic:primitive_explosive_cell" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/furnace.json b/src/generated/resources/data/bloodmagic/tags/items/arc/furnace.json new file mode 100644 index 00000000..40b104b1 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/tags/items/arc/furnace.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "bloodmagic:furnacecell_primitive", + "bloodmagic:lavacrystal" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/hydrate.json b/src/generated/resources/data/bloodmagic/tags/items/arc/hydrate.json new file mode 100644 index 00000000..dba4afa1 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/tags/items/arc/hydrate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "bloodmagic:primitive_hydration_cell" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc_tool_reverter.json b/src/generated/resources/data/bloodmagic/tags/items/arc/reverter.json similarity index 100% rename from src/generated/resources/data/bloodmagic/tags/items/arc_tool_reverter.json rename to src/generated/resources/data/bloodmagic/tags/items/arc/reverter.json diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc_tool_sieve.json b/src/generated/resources/data/bloodmagic/tags/items/arc/sieve.json similarity index 100% rename from src/generated/resources/data/bloodmagic/tags/items/arc_tool_sieve.json rename to src/generated/resources/data/bloodmagic/tags/items/arc/sieve.json diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/tool.json b/src/generated/resources/data/bloodmagic/tags/items/arc/tool.json new file mode 100644 index 00000000..db159215 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/tags/items/arc/tool.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "#bloodmagic:arc/furnace", + "#bloodmagic:arc/reverter", + "#bloodmagic:arc/sieve", + "#bloodmagic:arc/explosive", + "#bloodmagic:arc/hydrate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc_tool.json b/src/generated/resources/data/bloodmagic/tags/items/arc_tool.json deleted file mode 100644 index eae0213d..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc_tool.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:diamond", - "bloodmagic:airscribetool", - "bloodmagic:sanguinereverter", - "bloodmagic:lavacrystal", - "bloodmagic:furnacecell_primitive" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc_tool_furnace.json b/src/generated/resources/data/bloodmagic/tags/items/arc_tool_furnace.json deleted file mode 100644 index c83e4a15..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc_tool_furnace.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:lavacrystal", - "bloodmagic:furnacecell_primitive" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/coal.json b/src/generated/resources/data/forge/tags/items/dusts/coal.json new file mode 100644 index 00000000..c9d575d6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "bloodmagic:coalsand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/gold.json b/src/generated/resources/data/forge/tags/items/dusts/gold.json new file mode 100644 index 00000000..959fcf7a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "bloodmagic:goldsand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron.json b/src/generated/resources/data/forge/tags/items/dusts/iron.json new file mode 100644 index 00000000..d3d71370 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "bloodmagic:ironsand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/saltpeter.json b/src/generated/resources/data/forge/tags/items/dusts/saltpeter.json new file mode 100644 index 00000000..5313e4e2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/saltpeter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "bloodmagic:saltpeter" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/sulfur.json b/src/generated/resources/data/forge/tags/items/dusts/sulfur.json new file mode 100644 index 00000000..092ad725 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/sulfur.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "bloodmagic:sulfur" + ] +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java index a9f2f514..4ae8d704 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java @@ -3,6 +3,7 @@ package wayoftime.bloodmagic.common.data; import java.util.function.Consumer; import net.minecraft.block.Blocks; +import net.minecraft.data.CookingRecipeBuilder; import net.minecraft.data.DataGenerator; import net.minecraft.data.IFinishedRecipe; import net.minecraft.data.ShapedRecipeBuilder; @@ -15,6 +16,7 @@ import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; import wayoftime.bloodmagic.common.data.recipe.BaseRecipeProvider; import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.common.tags.BloodMagicTags; import wayoftime.bloodmagic.core.recipe.IngredientBloodOrb; public class GeneratorBaseRecipes extends BaseRecipeProvider @@ -28,6 +30,7 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider protected void registerRecipes(Consumer consumer) { addVanillaRecipes(consumer); + addVanillaSmithingRecipes(consumer); addBloodOrbRecipes(consumer); } @@ -43,6 +46,13 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.BLOODSTONE.get(), 8).addIngredient(Tags.Items.STONE).addIngredient(BloodMagicItems.WEAK_BLOOD_SHARD.get()).addCriterion("has_weak_shard", hasItem(BloodMagicItems.WEAK_BLOOD_SHARD.get())).build(consumer, BloodMagic.rl("largebloodstonebrick")); } + private void addVanillaSmithingRecipes(Consumer consumer) + { + String basePath = "smelting/"; + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromTag(BloodMagicTags.DUST_IRON), Items.IRON_INGOT, 0, 200).addCriterion("has_iron_sand", hasItem(BloodMagicItems.IRON_SAND.get())).build(consumer, BloodMagic.rl(basePath + "ingot_iron")); + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromTag(BloodMagicTags.DUST_GOLD), Items.GOLD_INGOT, 0, 200).addCriterion("has_gold_sand", hasItem(BloodMagicItems.GOLD_SAND.get())).build(consumer, BloodMagic.rl(basePath + "ingot_gold")); + } + private void addBloodOrbRecipes(Consumer consumer) { ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RUNE.get()).key('a', Tags.Items.STONE).key('s', Ingredient.fromItems(BloodMagicItems.SLATE.get())).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("aaa").patternLine("sos").patternLine("aaa").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_blank")); @@ -60,6 +70,8 @@ public class GeneratorBaseRecipes extends BaseRecipeProvider ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.PRIMITIVE_FURNACE_CELL.get()).key('c', Tags.Items.COBBLESTONE).key('f', Tags.Items.STORAGE_BLOCKS_COAL).key('s', Ingredient.fromItems(BloodMagicItems.SLATE.get())).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("csc").patternLine("cfc").patternLine("coc").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("primitive_furnace_cell")); ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.LAVA_CRYSTAL.get()).key('a', Tags.Items.GLASS).key('b', Items.LAVA_BUCKET).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('d', Tags.Items.OBSIDIAN).key('e', Tags.Items.GEMS_DIAMOND).patternLine("aba").patternLine("bcb").patternLine("ded").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("lava_crystal")); + + ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.PRIMITIVE_HYDRATION_CELL.get()).key('B', Items.WATER_BUCKET).key('c', Tags.Items.COBBLESTONE).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).key('s', BloodMagicItems.SLATE.get()).patternLine("csc").patternLine("cBc").patternLine("coc").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("primitive_hydration_cell")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', Ingredient.fromItems(Items.DIAMOND)).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_standard")); // ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_orb")); } diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java index bc1282bc..4550529f 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java @@ -6,7 +6,6 @@ import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraft.data.ItemTagsProvider; import net.minecraft.item.Item; -import net.minecraft.item.Items; import net.minecraft.tags.ITag.INamedTag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.data.ExistingFileHelper; @@ -24,21 +23,58 @@ public class GeneratorItemTags extends ItemTagsProvider @Override public void registerTags() { - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).add(Items.DIAMOND); - this.registerTool(BloodMagicItems.AIR_INSCRIPTION_TOOL.get(), BloodMagicTags.ARC_TOOL_SIEVE); - this.registerTool(BloodMagicItems.SANGUINE_REVERTER.get(), BloodMagicTags.ARC_TOOL_REVERTER); - this.registerTool(BloodMagicItems.LAVA_CRYSTAL.get(), BloodMagicTags.ARC_TOOL_FURNACE); - this.registerTool(BloodMagicItems.PRIMITIVE_FURNACE_CELL.get(), BloodMagicTags.ARC_TOOL_FURNACE); + registerFurnaceCells(); + registerReverters(); + registerSieves(); + registerExplosives(); + registerHydration(); + + this.getOrCreateBuilder(BloodMagicTags.DUST_IRON).add(BloodMagicItems.IRON_SAND.get()); + this.getOrCreateBuilder(BloodMagicTags.DUST_GOLD).add(BloodMagicItems.GOLD_SAND.get()); + this.getOrCreateBuilder(BloodMagicTags.DUST_COAL).add(BloodMagicItems.COAL_SAND.get()); + this.getOrCreateBuilder(BloodMagicTags.DUST_SULFUR).add(BloodMagicItems.SULFUR.get()); + this.getOrCreateBuilder(BloodMagicTags.DUST_SALTPETER).add(BloodMagicItems.SALTPETER.get()); + this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_FURNACE); + this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_REVERTER); + this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_SIEVE); + this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE); + this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_HYDRATE); // this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.DOORS); // this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.BEDS); // this.getOrCreateBuilder(GOORESISTANT).add(Blocks.PISTON, Blocks.PISTON_HEAD, Blocks.STICKY_PISTON, Blocks.MOVING_PISTON); } + private void registerFurnaceCells() + { + this.registerTool(BloodMagicItems.PRIMITIVE_FURNACE_CELL.get(), BloodMagicTags.ARC_TOOL_FURNACE); + this.registerTool(BloodMagicItems.LAVA_CRYSTAL.get(), BloodMagicTags.ARC_TOOL_FURNACE); + } + + private void registerReverters() + { + this.registerTool(BloodMagicItems.SANGUINE_REVERTER.get(), BloodMagicTags.ARC_TOOL_REVERTER); + } + + private void registerSieves() + { + this.registerTool(BloodMagicItems.AIR_INSCRIPTION_TOOL.get(), BloodMagicTags.ARC_TOOL_SIEVE); + } + + private void registerExplosives() + { + this.registerTool(BloodMagicItems.EXPLOSIVE_POWDER.get(), BloodMagicTags.ARC_TOOL_EXPLOSIVE); + this.registerTool(BloodMagicItems.PRIMITIVE_EXPLOSIVE_CELL.get(), BloodMagicTags.ARC_TOOL_EXPLOSIVE); + } + + private void registerHydration() + { + this.registerTool(BloodMagicItems.PRIMITIVE_HYDRATION_CELL.get(), BloodMagicTags.ARC_TOOL_HYDRATE); + } + public void registerTool(Item item, INamedTag tag) { this.getOrCreateBuilder(tag).add(item); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).add(item); } /** diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java index 903bca84..748a5049 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -147,4 +147,18 @@ public class BloodMagicItems // ARC Tools public static final RegistryObject SANGUINE_REVERTER = BASICITEMS.register("sanguinereverter", () -> new ItemARCToolBase(32, 2)); public static final RegistryObject PRIMITIVE_FURNACE_CELL = BASICITEMS.register("furnacecell_primitive", () -> new ItemARCToolBase(128, 1.25)); + public static final RegistryObject PRIMITIVE_EXPLOSIVE_CELL = BASICITEMS.register("primitive_explosive_cell", () -> new ItemARCToolBase(256, 1.25)); + public static final RegistryObject PRIMITIVE_HYDRATION_CELL = BASICITEMS.register("primitive_hydration_cell", () -> new ItemARCToolBase(128, 1.25)); + + // Alchemy Table items + public static final RegistryObject BASIC_CUTTING_FLUID = BASICITEMS.register("basiccuttingfluid", () -> new ItemARCToolBase(16, 1)); + public static final RegistryObject EXPLOSIVE_POWDER = BASICITEMS.register("explosivepowder", () -> new ItemARCToolBase(64, 1)); + + public static final RegistryObject IRON_SAND = BASICITEMS.register("ironsand", () -> new ItemBase()); + public static final RegistryObject GOLD_SAND = BASICITEMS.register("goldsand", () -> new ItemBase()); + public static final RegistryObject COAL_SAND = BASICITEMS.register("coalsand", () -> new ItemBase()); + + public static final RegistryObject SULFUR = BASICITEMS.register("sulfur", () -> new ItemBase()); + public static final RegistryObject SALTPETER = BASICITEMS.register("saltpeter", () -> new ItemBase()); + public static final RegistryObject PLANT_OIL = BASICITEMS.register("plantoil", () -> new ItemBase()); } diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java index e4c2a632..278381e7 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java @@ -2,10 +2,16 @@ package wayoftime.bloodmagic.common.recipe; import java.util.function.Consumer; +import net.minecraft.block.Blocks; import net.minecraft.data.IFinishedRecipe; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.common.Tags; +import net.minecraftforge.fluids.FluidStack; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient; import wayoftime.bloodmagic.common.data.recipe.builder.ARCRecipeBuilder; import wayoftime.bloodmagic.common.item.BloodMagicItems; import wayoftime.bloodmagic.common.tags.BloodMagicTags; @@ -22,6 +28,33 @@ public class ARCRecipeProvider implements ISubRecipeProvider // ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.NETHERRACK), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_REVERTER), FluidStackIngredient.from(Fluids.LAVA, 1000), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), new FluidStack(Fluids.WATER, 100)).addRandomOutput(new ItemStack(BloodMagicItems.SLATE.get()), 0.2).addRandomOutput(new ItemStack(BloodMagicItems.REINFORCED_SLATE.get()), 0.1).addRandomOutput(new ItemStack(BloodMagicItems.IMBUED_SLATE.get()), 0.001).build(consumer, BloodMagic.rl(basePath + "test4")); ARCRecipeBuilder.arc(Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_REVERTER), null, new ItemStack(BloodMagicItems.WEAK_BLOOD_SHARD.get()), null).addRandomOutput(new ItemStack(BloodMagicItems.WEAK_BLOOD_SHARD.get()), 0.2).build(consumer, BloodMagic.rl(basePath + "weakbloodshard")); + ARCRecipeBuilder.arc(Ingredient.fromItems(Items.IRON_ORE), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.IRON_SAND.get(), 2), null).build(consumer, BloodMagic.rl(basePath + "ore/dustiron")); + ARCRecipeBuilder.arc(Ingredient.fromItems(Items.GOLD_ORE), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.GOLD_SAND.get(), 2), null).build(consumer, BloodMagic.rl(basePath + "ore/dustgold")); + ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.NETHERRACK), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.SULFUR.get()), new FluidStack(Fluids.LAVA, 5)).build(consumer, BloodMagic.rl(basePath + "netherrack_to_sulfer")); + ARCRecipeBuilder.arc(Ingredient.fromItems(Items.TERRACOTTA), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_HYDRATE), FluidStackIngredient.from(Fluids.WATER, 200), new ItemStack(Blocks.CLAY), null).build(consumer, BloodMagic.rl(basePath + "clay_from_terracotta")); + ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.SAND), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_HYDRATE), FluidStackIngredient.from(Fluids.WATER, 200), new ItemStack(Items.CLAY_BALL), null).addRandomOutput(new ItemStack(Items.CLAY_BALL), 0.5).build(consumer, BloodMagic.rl(basePath + "clay_from_sand")); + addReversionRecipes(consumer); + } + + private void addReversionRecipes(Consumer consumer) + { + String basePath = "arc/reversion/"; + // ONE + registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.WEAK_BLOOD_ORB.get()), new ItemStack(Items.DIAMOND), consumer, basePath + "weak_blood_orb"); + + // TWO + registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.APPRENTICE_BLOOD_ORB.get()), new ItemStack(Blocks.REDSTONE_BLOCK), consumer, basePath + "apprentice_blood_orb"); + + // THREE + registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.MAGICIAN_BLOOD_ORB.get()), new ItemStack(Blocks.GOLD_BLOCK), consumer, basePath + "magician_blood_orb"); + + // FOUR + registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.MASTER_BLOOD_ORB.get()), new ItemStack(BloodMagicItems.WEAK_BLOOD_SHARD.get()), consumer, basePath + "master_blood_orb"); + } + + private void registerReversionRecipe(Ingredient input, ItemStack outputStack, Consumer consumer, String path) + { + ARCRecipeBuilder.arc(input, Ingredient.fromTag(BloodMagicTags.ARC_TOOL_REVERTER), null, outputStack, null).build(consumer, BloodMagic.rl(path)); } } diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java index 7b05c9ca..9e3488f2 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java @@ -2,13 +2,17 @@ package wayoftime.bloodmagic.common.recipe; import java.util.function.Consumer; +import net.minecraft.block.Blocks; import net.minecraft.data.IFinishedRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ItemTags; +import net.minecraftforge.common.Tags; import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.common.data.recipe.builder.AlchemyTableRecipeBuilder; +import wayoftime.bloodmagic.common.item.BloodMagicItems; +import wayoftime.bloodmagic.common.tags.BloodMagicTags; public class AlchemyTableRecipeProvider implements ISubRecipeProvider { @@ -16,7 +20,19 @@ public class AlchemyTableRecipeProvider implements ISubRecipeProvider public void addRecipes(Consumer consumer) { String basePath = "alchemytable/"; - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.STRING, 4), 0, 100, 0).addIngredient(Ingredient.fromTag(ItemTags.WOOL)).addIngredient(Ingredient.fromItems(Items.FLINT)).build(consumer, BloodMagic.rl(basePath + "string")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.STRING, 4), 100, 100, 0).addIngredient(Ingredient.fromTag(ItemTags.WOOL)).addIngredient(Ingredient.fromItems(Items.FLINT)).build(consumer, BloodMagic.rl(basePath + "string")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.FLINT), 50, 20, 0).addIngredient(Ingredient.fromItems(Items.GRAVEL)).addIngredient(Ingredient.fromItems(Items.FLINT)).build(consumer, BloodMagic.rl(basePath + "flint_from_gravel")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.FLINT)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "leather_from_flesh")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.EXPLOSIVE_POWDER.get()), 500, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).build(consumer, BloodMagic.rl(basePath + "explosive_powder")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.BREAD), 100, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "bread")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Blocks.GRASS_BLOCK), 200, 200, 1).addIngredient(Ingredient.fromItems(Items.DIRT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).addIngredient(Ingredient.fromItems(Items.WHEAT_SEEDS)).build(consumer, BloodMagic.rl(basePath + "grass_block")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.CLAY_BALL, 2), 50, 100, 2).addIngredient(Ingredient.fromTag(Tags.Items.SAND)).addIngredient(Ingredient.fromTag(Tags.Items.SAND)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "clay_from_sand")); + + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_SULFUR)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_SALTPETER)).addIngredient(Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "gunpowder")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_carrots")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_POTATO)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_POTATO)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_taters")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_wheat")); + AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_BEETROOT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_BEETROOT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_BEETROOT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_beets")); } } diff --git a/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java b/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java index bdf5e3aa..0075ce4b 100644 --- a/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java +++ b/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java @@ -6,8 +6,22 @@ import net.minecraft.tags.ItemTags; public class BloodMagicTags { - public static final ITag.INamedTag ARC_TOOL = ItemTags.makeWrapperTag("bloodmagic:arc_tool"); - public static final ITag.INamedTag ARC_TOOL_FURNACE = ItemTags.makeWrapperTag("bloodmagic:arc_tool_furnace"); - public static final ITag.INamedTag ARC_TOOL_SIEVE = ItemTags.makeWrapperTag("bloodmagic:arc_tool_sieve"); - public static final ITag.INamedTag ARC_TOOL_REVERTER = ItemTags.makeWrapperTag("bloodmagic:arc_tool_reverter"); + public static final ITag.INamedTag ARC_TOOL = ItemTags.makeWrapperTag("bloodmagic:arc/tool"); + public static final ITag.INamedTag ARC_TOOL_FURNACE = ItemTags.makeWrapperTag("bloodmagic:arc/furnace"); + public static final ITag.INamedTag ARC_TOOL_SIEVE = ItemTags.makeWrapperTag("bloodmagic:arc/sieve"); + public static final ITag.INamedTag ARC_TOOL_REVERTER = ItemTags.makeWrapperTag("bloodmagic:arc/reverter"); + public static final ITag.INamedTag ARC_TOOL_EXPLOSIVE = ItemTags.makeWrapperTag("bloodmagic:arc/explosive"); + public static final ITag.INamedTag ARC_TOOL_HYDRATE = ItemTags.makeWrapperTag("bloodmagic:arc/hydrate"); + + // Dusts + public static final ITag.INamedTag DUST_IRON = getForgeDustTag("iron"); + public static final ITag.INamedTag DUST_GOLD = getForgeDustTag("gold"); + public static final ITag.INamedTag DUST_COAL = getForgeDustTag("coal"); + public static final ITag.INamedTag DUST_SALTPETER = getForgeDustTag("saltpeter"); + public static final ITag.INamedTag DUST_SULFUR = getForgeDustTag("sulfur"); + + public static ITag.INamedTag getForgeDustTag(String name) + { + return ItemTags.makeWrapperTag("forge:dusts/" + name); + } } diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java index 1e20c578..2b7f9900 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java @@ -131,7 +131,6 @@ public class TileAlchemyTable extends TileInventory return tag; } - @SuppressWarnings("unchecked") @Override public LazyOptional getCapability(Capability capability, Direction facing) { diff --git a/src/main/resources/assets/bloodmagic/textures/item/primitive_explosive_cell.png b/src/main/resources/assets/bloodmagic/textures/item/primitive_explosive_cell.png new file mode 100644 index 00000000..def67745 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/item/primitive_explosive_cell.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/primitive_hydration_cell.png b/src/main/resources/assets/bloodmagic/textures/item/primitive_hydration_cell.png new file mode 100644 index 00000000..5b6c29ae Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/item/primitive_hydration_cell.png differ