diff --git a/enderio-conduits/src/generated/resources/.cache/374ea09bacfd9990d354c87c776e153586f6906e b/enderio-conduits/src/generated/resources/.cache/374ea09bacfd9990d354c87c776e153586f6906e index f876be77f5..eaa380e191 100644 --- a/enderio-conduits/src/generated/resources/.cache/374ea09bacfd9990d354c87c776e153586f6906e +++ b/enderio-conduits/src/generated/resources/.cache/374ea09bacfd9990d354c87c776e153586f6906e @@ -1,4 +1,4 @@ -// 1.21 2024-07-10T21:58:11.089137953 Ender IO Data (conduits) +// 1.21 2024-07-16T21:17:51.8606452 Ender IO Data (conduits) 2d5ff4726d2103c6167c8e8182861d1f4e7ea063 data/c/tags/block/relocation_not_supported.json eb91478c664470a50d24f5cfced8bc77d7870f62 data/enderio/advancement/recipes/building_blocks/ender_fluid.json 573c1a53273b7e81556c621798c32a102156dfc4 data/enderio/advancement/recipes/building_blocks/ender_fluid_conduit_upgrade.json diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_xor_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_xor_filter.json index 91c710a061..4a16c2e8fc 100644 --- a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_xor_filter.json +++ b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_xor_filter.json @@ -2,20 +2,20 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "A": { - "tag": "c:ingots/redstone_alloy" - }, "B": { "item": "enderio:redstone_filter_base" }, + "I": { + "tag": "c:ingots/redstone_alloy" + }, "T": { "item": "minecraft:redstone_torch" } }, "pattern": [ " T ", - "ABA", - " A " + "IBI", + " T " ], "result": { "count": 1, diff --git a/enderio-machines/src/generated/resources/.cache/aad1e49dd2f870dac7e75ef548e2e44fa7d73e02 b/enderio-machines/src/generated/resources/.cache/aad1e49dd2f870dac7e75ef548e2e44fa7d73e02 index 5933925dd7..708b342013 100644 --- a/enderio-machines/src/generated/resources/.cache/aad1e49dd2f870dac7e75ef548e2e44fa7d73e02 +++ b/enderio-machines/src/generated/resources/.cache/aad1e49dd2f870dac7e75ef548e2e44fa7d73e02 @@ -1,4 +1,4 @@ -// 1.21 2024-07-14T14:21:25.167610699 Ender IO Data (machines) +// 1.21 2024-07-16T21:18:04.4885066 Ender IO Data (machines) 9c99444249ea9362072a08ee44c2d01c8ab03176 data/c/tags/item/crops.json 9c99444249ea9362072a08ee44c2d01c8ab03176 data/c/tags/item/seeds.json 9ff2ab17ab68f1a6c36efa69ca816a618adb5fa9 data/enderio/advancement/place_capacitor_bank.json @@ -27,14 +27,16 @@ eb712361dba1956bf52720a3e7f98d8b01254c46 data/enderio/advancement/recipes/misc/p 19ed3f7d2ab9523a7270a3b93cf49903a2f40131 data/enderio/advancement/recipes/misc/stirling_generator.json 4ec46e41773a07adf47b92d36f016342b0c4c9d9 data/enderio/advancement/recipes/misc/travel_anchor.json 890cca3c349fb11df2c3adf683d26e297141ddab data/enderio/advancement/recipes/misc/vacuum_chest.json +684ae45e808210c2973eb92074dc402fff5e92ea data/enderio/advancement/recipes/misc/vat.json 75f36d7d357692dfec36254d4b953f6c748fad47 data/enderio/advancement/recipes/misc/vibrant_capacitor_bank.json 4de45e766138b44df9b9908acfe5cd70d9094c83 data/enderio/advancement/recipes/misc/vibrant_capacitor_bank_upgrade.json 1b8f5bc4ac9e552d379e0b0e76fb11aacec4398d data/enderio/advancement/recipes/misc/vibrant_photovoltaic_module.json 600836e7b282490493d723b9695e3f39efd2b622 data/enderio/advancement/recipes/misc/wired_charger.json 3339ec9e4ec4693cb452c38bdbcd760114523211 data/enderio/advancement/recipes/misc/xp_obelisk.json aff5da32ec7ec0aaf1c3a384e0c430f6c414b61c data/enderio/advancement/recipes/misc/xp_vacuum.json -583b5ab83878f78f08c29d59bbb2359fe029db05 data/enderio/data_maps/item/vat_reagent.json +5e5f6880a91100a5746e4d29adda15f577bb9da7 data/enderio/data_maps/item/vat_reagent.json d413417a47778ae06e75b5641cd32748992c6669 data/enderio/eio_soul/engine/minecraft_blaze.json +6d0d7a44b41f7881437d9fd9bd99a3f06d7c694d data/enderio/eio_soul/engine/minecraft_creeper.json 5b581282fa6926dce120ef1ac1a4af9ec8a397f5 data/enderio/eio_soul/engine/minecraft_enderman.json 068b0c399796c5c5d6c4bf849834ccd5c47c66ac data/enderio/eio_soul/engine/minecraft_husk.json 8363fae44d5ae33a0271bf09106b56a61beabb85 data/enderio/eio_soul/engine/minecraft_zombie.json @@ -55,9 +57,9 @@ afe03dbc625bceaf4a87ca2ae4b48649749cd445 data/enderio/eio_soul/spawner/minecraft 0bea58ed48696dd8cdfaba084488ef6d1795725c data/enderio/eio_soul/spawner/minecraft_donkey.json bbdb936ae8e40f0367c1bdacb66fecab4179870a data/enderio/eio_soul/spawner/minecraft_drowned.json 8c59af2e00d659c6fb9e11cd68c20c48de091095 data/enderio/eio_soul/spawner/minecraft_elder_guardian.json -2ccc014d096ec6b8425ba53e9c5a9267adc5c367 data/enderio/eio_soul/spawner/minecraft_ender_dragon.json cae85c726b213c8f0d73f45759858c3e37d3699b data/enderio/eio_soul/spawner/minecraft_enderman.json 6372203ba2bd64fae87f3964403ea3f199202e93 data/enderio/eio_soul/spawner/minecraft_endermite.json +2ccc014d096ec6b8425ba53e9c5a9267adc5c367 data/enderio/eio_soul/spawner/minecraft_ender_dragon.json 6d5f69b930c0b5be9f9308520563c8ca7e8be910 data/enderio/eio_soul/spawner/minecraft_evoker.json 4f6997f0f8152995af578d67baa0a6cca8822fe6 data/enderio/eio_soul/spawner/minecraft_fox.json cb806613f36bf981326f3867858e5fbb74eb6c67 data/enderio/eio_soul/spawner/minecraft_frog.json @@ -132,8 +134,8 @@ af38c348e103d38e843f97de832ce6cf878b940f data/enderio/recipe/alloy_smelting/cond 05a8e6a613d0ad71934e34c970f6edf2958537cc data/enderio/recipe/alloy_smelting/copper_alloy_ingot.json 2494510c8b02cfce94bac7b6ede6cdc805f1164f data/enderio/recipe/alloy_smelting/dark_steel_ingot.json 5bd84aec94350fdaeda53424c6fd5f1b430d6ae8 data/enderio/recipe/alloy_smelting/dead_bush.json -cc6cac3a9cf01f6e2170064b9b8b75ddcbc077ce data/enderio/recipe/alloy_smelting/end_steel_ingot.json d949e6b3c70e606da1813c62ddd36bfb1e30f6ba data/enderio/recipe/alloy_smelting/ender_pearl.json +cc6cac3a9cf01f6e2170064b9b8b75ddcbc077ce data/enderio/recipe/alloy_smelting/end_steel_ingot.json f4c525b6dbf76086b34981ef0e02025f1f899191 data/enderio/recipe/alloy_smelting/energetic_alloy_ingot.json 19139655ec962511faa145b23b7545c3f17917e2 data/enderio/recipe/alloy_smelting/fused_quartz.json 0d2c90bf0b6831c702d999d9f570eb868d6d4ef8 data/enderio/recipe/alloy_smelting/fused_quartz_alt.json @@ -159,8 +161,8 @@ d7f2bdcee5f30e45de228354c691fc2331688e3c data/enderio/recipe/alloy_smelting/orga 72ad8a50e28a1f4a81a1075f2410bf373378c1f5 data/enderio/recipe/alloy_smelting/organic_green_dye_double_clippings.json 2240116a871f9e80ac9ba0c4d4fb3eccb714be70 data/enderio/recipe/alloy_smelting/photovoltaic_plate.json 4b56f3a14bc8842767e54f13f6a0e59c6a0f5ef9 data/enderio/recipe/alloy_smelting/pulsating_alloy_ingot.json -dd10338fdfc9147603c8f81327df67bb663aca79 data/enderio/recipe/alloy_smelting/red_dye.json 71429a1e5fd4e7ae6ea7641c07f6829ba011e430 data/enderio/recipe/alloy_smelting/redstone_alloy_ingot.json +dd10338fdfc9147603c8f81327df67bb663aca79 data/enderio/recipe/alloy_smelting/red_dye.json 4239723634b8bbd1d275bd668e909b15311ae7db data/enderio/recipe/alloy_smelting/soularium_ingot.json 25f321a557bd6bc846e94c80b23d5f787477454b data/enderio/recipe/alloy_smelting/vibrant_alloy_ingot.json 43c3738f8f6c9524f86ed26d36606aed19ae5325 data/enderio/recipe/aversion_obelisk.json @@ -206,7 +208,11 @@ b3af5db5dec8a35cc7110f92f4e1d6da1b578bb5 data/enderio/recipe/enchanting/sweeping 40ca1204d6f6fcd5f182758e88d26db9f677b90b data/enderio/recipe/enchanting/thorns.json 920e23caa5e2596f64d85000ca6f3ff0554bb06b data/enderio/recipe/enchanting/unbreaking.json 3a0f297834170d8b1352456d143ccee871ef8bb7 data/enderio/recipe/energetic_photovoltaic_module.json +ceb998071094c510e631b98e5f25e6a436c02583 data/enderio/recipe/fermenting/fluid_fire_water_still.json ce7d3144135de090c966370cd09f1873acb0b7d3 data/enderio/recipe/fermenting/fluid_hootch_still.json +aef2dab28804971b4a36fae9d3fdc23ebe30a244 data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json +8ba882df5ad880ad6494740e97c4a89b0df889a2 data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json +4d26bc1962e86f5fe63937286c19bfc90d458fe5 data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json 983a93c5453e48ba167e51729417eeb57534b2ad data/enderio/recipe/fluid_tank.json 34815e64bef0eca5391c17b681aa1a5fa93bfffa data/enderio/recipe/impulse_hopper.json f7bce24372ce3a0b80f7f1b8bb1ba997ee52ec01 data/enderio/recipe/inhibitor_obelisk.json @@ -288,8 +294,8 @@ bb3fea2c523f7d9bd4772e364ba51f50de6500f1 data/enderio/recipe/sag_milling/quartz_ f0d53abfadcfa293a2270458f11a60baa16aa524 data/enderio/recipe/sag_milling/quartz_ore.json 23dae2b1da163a688f75282fc693e362dbd3d888 data/enderio/recipe/sag_milling/quartz_slabs.json b51137b15fc40f9174422e80b75c39011a7e59ce data/enderio/recipe/sag_milling/quartz_stairs.json -022b25d349ac854cde32bec7c9d078bb5777548d data/enderio/recipe/sag_milling/red_tulip.json 9273090b0029c04ec85987caf6a56f318e903d39 data/enderio/recipe/sag_milling/redstone_ore.json +022b25d349ac854cde32bec7c9d078bb5777548d data/enderio/recipe/sag_milling/red_tulip.json 8474eef3b74715a4ea9773238d2930ead70f45a5 data/enderio/recipe/sag_milling/rose_bush.json 2dd8d5382239447ef5805ac81a6c58610f083cc1 data/enderio/recipe/sag_milling/sand.json 48680b6ca728f822bda83f45346da45343b37dd8 data/enderio/recipe/sag_milling/sandstone.json @@ -310,10 +316,8 @@ a75f32a0b05dab251d53aac00585f6ccb4f7d089 data/enderio/recipe/sag_milling/vibrant 4643eb527a9dcb03b8a57ec172cdcac4c8855444 data/enderio/recipe/slicing/ender_resonator.json 967729e34c748bcc11b93237955a2c4693efef8c data/enderio/recipe/slicing/guardian_diode.json b854588b2cc3f72511d48ec2e48874bcf5c71db4 data/enderio/recipe/slicing/skeletal_contractor.json -04b601994c873f2ba9f203533043f97fc62789d0 data/enderio/recipe/slicing/z_logic_controller.json 731e4445cd474e012eb5c9cbfe175e211466aef9 data/enderio/recipe/slicing/zombie_electrode.json -8f27759164c47602dbdc0d954635a8dd9202df80 data/enderio/recipe/soul_binder.json -861c0e02e7f568620f6a985fbbe36e7876fb4ea9 data/enderio/recipe/soul_engine.json +04b601994c873f2ba9f203533043f97fc62789d0 data/enderio/recipe/slicing/z_logic_controller.json 55e0ab833f6287819f888a2bda278c513ec94bb7 data/enderio/recipe/soulbinding/animal_token.json fd3aa6bda1dee767569b2078e5b1ca7ea9c048e4 data/enderio/recipe/soulbinding/broken_spawner.json 2f26cc4fad6872e4d26cc9c333bab8d8166a3fee data/enderio/recipe/soulbinding/ender_crystal.json @@ -327,6 +331,8 @@ f21b1a62440d73594734e3bcc45a0e06cc4e68c1 data/enderio/recipe/soulbinding/pulsati 1413903a82ffa5d44930937f807e1546b13bb1b0 data/enderio/recipe/soulbinding/sentient_ender.json f8991d070155c19ffdd80fffea624723efa6f0c5 data/enderio/recipe/soulbinding/soul_engine.json acd0ae7887d13ed7adf6743289dc66700ed44ad7 data/enderio/recipe/soulbinding/vibrant_photovoltaic_module.json +8f27759164c47602dbdc0d954635a8dd9202df80 data/enderio/recipe/soul_binder.json +861c0e02e7f568620f6a985fbbe36e7876fb4ea9 data/enderio/recipe/soul_engine.json 94c8bb784b051470779e0ebdaf365b436d14240a data/enderio/recipe/stirling_generator.json 9237d3279e01fb90002585dbed67974ea43f0a8c data/enderio/recipe/tank_empty/glass_bottle.json 7cd6d8a2db57c11e1951a6be9cca8fc17147ced7 data/enderio/recipe/tank_empty/sponge.json @@ -351,6 +357,7 @@ f0a1c303075c6fdbc3f0f584c263adbb956159ab data/enderio/recipe/tank_fill/nutritiou 5e7b64b6c1e4b586a460afa7d6f89a453299f3f8 data/enderio/recipe/tank_fill/yellow_concrete.json 41fb687fec340319dd0fce14e6cbc7dd52912cc6 data/enderio/recipe/travel_anchor.json bdd8e50ccf0e3da7b4fc75658bfa674b88f0f2cd data/enderio/recipe/vacuum_chest.json +56fb0ef3887f738833b92f8fb3eaf442e4df66ab data/enderio/recipe/vat.json 08d07c97557e94fabe6841c052002b3d028779ef data/enderio/recipe/vibrant_capacitor_bank.json 4a1e53bfe511ce2f7a846c2be8421f370d732304 data/enderio/recipe/vibrant_capacitor_bank_upgrade.json dc100f02aaf78579b487def74ef35de2fcfd246b data/enderio/recipe/vibrant_photovoltaic_module.json @@ -358,3 +365,7 @@ dc100f02aaf78579b487def74ef35de2fcfd246b data/enderio/recipe/vibrant_photovoltai 52db0dac7b44b43e611c4700b7a67a039a61d76a data/enderio/recipe/xp_obelisk.json 10ab56f5184b6682a4dfc31f002cdcbe8fe9c209 data/enderio/recipe/xp_vacuum.json 2ed7e90390f20dac108882344534fcacfa5f6c4a data/enderio/tags/entity_type/spawner_blacklist.json +9798d67e68f1fc1fcbc41d664432a3a37ba63beb data/enderio/tags/item/blaze_powder.json +ee82ba1d25c4ff3432975bb947516036744fad57 data/enderio/tags/item/explosives.json +9f1069ba4490e35d3aa2f1b4d983f3debc0d1bcf data/enderio/tags/item/natural_lights.json +db00135b028441b7d5044e392c715155bdfad2ae data/enderio/tags/item/sunflower.json diff --git a/enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json b/enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json new file mode 100644 index 0000000000..980af94437 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "minecraft:barrel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:vat" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:vat" + ] + } +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/data_maps/item/vat_reagent.json b/enderio-machines/src/generated/resources/data/enderio/data_maps/item/vat_reagent.json index 4fea5d770f..63e1bbeb52 100644 --- a/enderio-machines/src/generated/resources/data/enderio/data_maps/item/vat_reagent.json +++ b/enderio-machines/src/generated/resources/data/enderio/data_maps/item/vat_reagent.json @@ -1,5 +1,26 @@ { "values": { + "minecraft:fire_charge": { + "#enderio:explosives": 0.5 + }, + "minecraft:firework_rocket": { + "#enderio:explosives": 0.5 + }, + "minecraft:glow_berries": { + "#enderio:natural_lights": 0.15 + }, + "minecraft:glow_ink_sac": { + "#enderio:natural_lights": 0.2 + }, + "minecraft:glow_lichen": { + "#enderio:natural_lights": 0.2 + }, + "minecraft:glowstone_dust": { + "#enderio:natural_lights": 0.25 + }, + "minecraft:sea_pickle": { + "#enderio:natural_lights": 0.25 + }, "minecraft:wheat": { "#c:crops": 3.0, "#c:seeds": 2.0 diff --git a/enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json b/enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json new file mode 100644 index 0000000000..6e462db55c --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json @@ -0,0 +1,6 @@ +{ + "entity": "minecraft:creeper", + "fluid": "enderio:fluid_rocket_fuel_still", + "power/mb": 500, + "tick/mb": 15 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json new file mode 100644 index 0000000000..0f7cfc83ee --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "fluid": "enderio:fluid_hootch_still" + }, + "left_reagent": "enderio:blaze_powder", + "output": { + "amount": 1000, + "id": "enderio:fluid_fire_water_still" + }, + "right_reagent": "c:dusts/redstone", + "ticks": 150 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json new file mode 100644 index 0000000000..af446b04c2 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "tag": "minecraft:water" + }, + "left_reagent": "enderio:natural_lights", + "output": { + "amount": 1000, + "id": "enderio:fluid_liquid_sunshine_still" + }, + "right_reagent": "enderio:sunflower", + "ticks": 100 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json new file mode 100644 index 0000000000..6143b39945 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "tag": "minecraft:water" + }, + "left_reagent": "minecraft:meat", + "output": { + "amount": 250, + "id": "enderio:fluid_nutrient_distillation_still" + }, + "right_reagent": "c:crops", + "ticks": 100 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json new file mode 100644 index 0000000000..c257fabe24 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "fluid": "enderio:fluid_hootch_still" + }, + "left_reagent": "enderio:explosives", + "output": { + "amount": 1000, + "id": "enderio:fluid_rocket_fuel_still" + }, + "right_reagent": "c:dusts/redstone", + "ticks": 150 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/vat.json b/enderio-machines/src/generated/resources/data/enderio/recipe/vat.json new file mode 100644 index 0000000000..751ef23ae3 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/vat.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "c:ingots/copper_alloy" + }, + "B": { + "item": "minecraft:barrel" + }, + "C": { + "item": "enderio:void_chassis" + }, + "M": { + "tag": "c:gears/iron" + }, + "R": { + "tag": "c:ingots/redstone_alloy" + }, + "S": { + "tag": "c:ingots/dark_steel" + } + }, + "pattern": [ + "SBS", + "ACA", + "MRM" + ], + "result": { + "count": 1, + "id": "enderio:vat" + } +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/blaze_powder.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/blaze_powder.json new file mode 100644 index 0000000000..10d5c86815 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/blaze_powder.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blaze_powder" + ] +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/explosives.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/explosives.json new file mode 100644 index 0000000000..eec88ed0a3 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/explosives.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:tnt", + "minecraft:firework_star", + "minecraft:firework_rocket" + ] +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/natural_lights.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/natural_lights.json new file mode 100644 index 0000000000..fc9c9f7fc9 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/natural_lights.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:glowstone_dust", + "minecraft:glowstone", + "minecraft:sea_lantern", + "minecraft:sea_pickle", + "minecraft:glow_lichen", + "minecraft:glow_berries", + "minecraft:glow_ink_sac" + ] +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/sunflower.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/sunflower.json new file mode 100644 index 0000000000..55320195f2 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/sunflower.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:sunflower" + ] +} \ No newline at end of file diff --git a/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java b/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java index 5486390585..52b424ec80 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java +++ b/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java @@ -31,7 +31,9 @@ import com.enderio.machines.data.recipes.SoulBindingRecipeProvider; import com.enderio.machines.data.recipes.TankRecipeProvider; import com.enderio.machines.data.souldata.SoulDataProvider; +import com.enderio.machines.data.tag.MachineBlockTagsProvider; import com.enderio.machines.data.tag.MachineEntityTypeTagsProvider; +import com.enderio.machines.data.tag.MachineItemTagsProvider; import com.enderio.regilite.Regilite; import net.minecraft.Util; import net.minecraft.core.HolderLookup; @@ -109,6 +111,9 @@ public static void gatherData(GatherDataEvent event) { provider.addSubProvider(event.includeServer(), new PaintingRecipeProvider(packOutput, lookupProvider)); provider.addSubProvider(event.includeServer(), new SoulDataProvider(packOutput)); provider.addSubProvider(event.includeServer(), new MachineEntityTypeTagsProvider(packOutput, lookupProvider, event.getExistingFileHelper())); + var b = new MachineBlockTagsProvider(packOutput, lookupProvider, event.getExistingFileHelper()); + provider.addSubProvider(event.includeServer(), b); + provider.addSubProvider(event.includeServer(), new MachineItemTagsProvider(packOutput, lookupProvider, b.contentsGetter(), event.getExistingFileHelper())); provider.addSubProvider(event.includeServer(), new ReagentDataProvider(packOutput, lookupProvider, event.getExistingFileHelper())); generator.addProvider(true, provider); diff --git a/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java b/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java index eb2916d1ad..6e19f1bc0e 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java +++ b/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java @@ -18,7 +18,9 @@ public static class ItemTags { private static void init() {} public static TagKey EXPLOSIVES = create("explosives"); - public static TagKey REDSTONE_SOURCE = create("redstone_source"); + public static TagKey BLAZE_POWDER = create("blaze_powder"); + public static final TagKey NATURAL_LIGHTS = create("natural_lights"); + public static final TagKey SUNFLOWER = create("sunflower"); private static TagKey create(String pName) { return TagKey.create(Registries.ITEM, EnderIOBase.loc(pName)); diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java index cba2793b8e..2bc482a8c0 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java +++ b/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java @@ -2,6 +2,7 @@ import com.enderio.EnderIOBase; import com.enderio.machines.common.datamap.VatReagent; +import com.enderio.machines.common.tag.MachineTags; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.data.CachedOutput; @@ -35,6 +36,14 @@ public ReagentDataProvider(PackOutput packOutput, CompletableFuture leftReagent, TagKey rightReagent, diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java index a13b9d9874..00fdcebc41 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java +++ b/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java @@ -407,6 +407,20 @@ protected void buildRecipes(RecipeOutput recipeOutput) { .pattern("A") .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(MachineBlocks.AVERSION_OBELISK).build())) .save(recipeOutput); + + ShapedRecipeBuilder + .shaped(RecipeCategory.MISC, MachineBlocks.VAT.get()) + .define('B', Blocks.BARREL) + .define('C', EIOBlocks.VOID_CHASSIS) + .define('M', EIOTags.Items.GEARS_IRON) + .define('A', EIOTags.Items.INGOTS_COPPER_ALLOY) + .define('R', EIOTags.Items.INGOTS_REDSTONE_ALLOY) + .define('S', EIOTags.Items.INGOTS_DARK_STEEL) + .pattern("SBS") + .pattern("ACA") + .pattern("MRM") + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(Blocks.BARREL).build())) + .save(recipeOutput); // TODO: Enable once the block detector has a model. /*ShapedRecipeBuilder diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/souldata/SoulDataProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/souldata/SoulDataProvider.java index 6df85504aa..105f2392d0 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/data/souldata/SoulDataProvider.java +++ b/enderio-machines/src/main/java/com/enderio/machines/data/souldata/SoulDataProvider.java @@ -121,6 +121,7 @@ public void buildSoulData(Consumer> finshedSoulDataConsumer) addEngineData(EntityType.ZOMBIE_VILLAGER, EIOFluids.NUTRIENT_DISTILLATION.getSource(), 500, 15, finshedSoulDataConsumer); addEngineData(EntityType.HUSK, EIOFluids.NUTRIENT_DISTILLATION.getSource(), 500, 15, finshedSoulDataConsumer); addEngineData(EntityType.ENDERMAN, EIOFluids.DEW_OF_THE_VOID.getSource(), 900, 10, finshedSoulDataConsumer); + addEngineData(EntityType.CREEPER, EIOFluids.ROCKET_FUEL.getSource(), 500, 15, finshedSoulDataConsumer); addSolarData(EntityType.PHANTOM, false, true, null, finshedSoulDataConsumer); } diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineBlockTagsProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineBlockTagsProvider.java new file mode 100644 index 0000000000..d571bec20a --- /dev/null +++ b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineBlockTagsProvider.java @@ -0,0 +1,20 @@ +package com.enderio.machines.data.tag; + +import com.enderio.EnderIOBase; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.neoforged.neoforge.common.data.BlockTagsProvider; + +import java.util.concurrent.CompletableFuture; + +public class MachineBlockTagsProvider extends BlockTagsProvider { + + public MachineBlockTagsProvider(PackOutput packOutput, CompletableFuture provider, net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) { + super(packOutput, provider, EnderIOBase.REGISTRY_NAMESPACE, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + + } +} diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineItemTagsProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineItemTagsProvider.java new file mode 100644 index 0000000000..e4802fc8d8 --- /dev/null +++ b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineItemTagsProvider.java @@ -0,0 +1,27 @@ +package com.enderio.machines.data.tag; + +import com.enderio.EnderIOBase; +import com.enderio.machines.common.tag.MachineTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import java.util.concurrent.CompletableFuture; + +public class MachineItemTagsProvider extends ItemTagsProvider { + + public MachineItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTags, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, blockTags, EnderIOBase.REGISTRY_NAMESPACE, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + tag(MachineTags.ItemTags.EXPLOSIVES).add(Items.TNT, Items.FIREWORK_STAR, Items.FIREWORK_ROCKET); + tag(MachineTags.ItemTags.NATURAL_LIGHTS).add(Items.GLOWSTONE_DUST, Items.GLOWSTONE, Items.SEA_LANTERN, Items.SEA_PICKLE, Items.GLOW_LICHEN, Items.GLOW_BERRIES, Items.GLOW_INK_SAC); + tag(MachineTags.ItemTags.SUNFLOWER).add(Items.SUNFLOWER); + tag(MachineTags.ItemTags.BLAZE_POWDER).add(Items.BLAZE_POWDER); + } +}