From 7d4c88cbd578dfdafcb9a632b8d6cf60c1f40326 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 22 Aug 2019 03:14:46 +0300 Subject: [PATCH] Fix electrolyzer recipes. Closes #1805 --- .../iron_dust_1.json => almandine_dust.json} | 4 ++-- .../calcium_1.json => andradite_dust.json} | 6 +++--- .../{auto/carbonfiber.json => ashes_dust.json} | 2 +- .../aluminum_dust_1.json => bauxite_dust.json} | 4 ++-- .../{auto/calcium.json => calcite_dust.json} | 6 +++--- .../{auto/carbon_1.json => charcoal_dust.json} | 2 +- .../{auto/mercury.json => cinnabar_dust.json} | 2 +- .../{auto/carbon.json => coal_dust.json} | 2 +- .../aluminum_dust_4.json => emerald_dust.json} | 6 +++--- .../nitrogen.json => ender_pearl_dust.json} | 10 +++++----- .../{auto/silicon.json => flint_dust.json} | 4 ++-- .../silver_small_dust.json => galena_dust.json} | 0 .../calcium_2.json => grossular_dust.json} | 6 +++--- .../aluminum_dust.json => lazurite_dust.json} | 6 +++--- .../{auto/hydrogen.json => methane.json} | 4 ++-- ...esium_small_dust.json => obsidian_dust.json} | 4 ++-- .../magnesium_dust.json => peridot_dust.json} | 4 ++-- .../{auto/iron_dust.json => pyrite_dust.json} | 0 .../magnesium_dust_1.json => pyrope_dust.json} | 4 ++-- .../aluminum_dust_2.json => ruby_dust.json} | 2 +- .../potassium.json => saltpeter_dust.json} | 6 +++--- .../aluminum_dust_3.json => sapphire_dust.json} | 2 +- .../{auto/sodium.json => sodalite_dust.json} | 6 +++--- ...uminum_dust_5.json => spessartine_dust.json} | 4 ++-- .../zinc_dust.json => sphalerite_dust.json} | 0 .../hydrogen_1.json => sulfuric_acid.json} | 17 ++++++++--------- .../wolframium.json => tungsten_dust.json} | 2 +- .../calcium_3.json => uvarovite_dust.json} | 6 +++--- 28 files changed, 60 insertions(+), 61 deletions(-) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/iron_dust_1.json => almandine_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/calcium_1.json => andradite_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/carbonfiber.json => ashes_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/aluminum_dust_1.json => bauxite_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/calcium.json => calcite_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/carbon_1.json => charcoal_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/mercury.json => cinnabar_dust.json} (96%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/carbon.json => coal_dust.json} (96%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/aluminum_dust_4.json => emerald_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/nitrogen.json => ender_pearl_dust.json} (87%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/silicon.json => flint_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/silver_small_dust.json => galena_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/calcium_2.json => grossular_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/aluminum_dust.json => lazurite_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/hydrogen.json => methane.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/magnesium_small_dust.json => obsidian_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/magnesium_dust.json => peridot_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/iron_dust.json => pyrite_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/magnesium_dust_1.json => pyrope_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/aluminum_dust_2.json => ruby_dust.json} (97%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/potassium.json => saltpeter_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/aluminum_dust_3.json => sapphire_dust.json} (96%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/sodium.json => sodalite_dust.json} (93%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/aluminum_dust_5.json => spessartine_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/zinc_dust.json => sphalerite_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/hydrogen_1.json => sulfuric_acid.json} (76%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/wolframium.json => tungsten_dust.json} (95%) rename src/main/resources/data/techreborn/recipes/industrial_electrolyzer/{auto/calcium_3.json => uvarovite_dust.json} (93%) diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/iron_dust_1.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/almandine_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/iron_dust_1.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/almandine_dust.json index 2fb26d64d..d5eecfd4c 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/iron_dust_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/almandine_dust.json @@ -25,14 +25,14 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_1.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/andradite_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_1.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/andradite_dust.json index 2a092ab51..cb4f01c1f 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/andradite_dust.json @@ -17,7 +17,7 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:calcium" } }, @@ -28,14 +28,14 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbonfiber.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ashes_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbonfiber.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ashes_dust.json index 6e3e9065d..0334f3a70 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbonfiber.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ashes_dust.json @@ -15,7 +15,7 @@ "results": [ { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:carbon_fiber" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_1.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/bauxite_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_1.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/bauxite_dust.json index f3faf5948..ac6577a81 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/bauxite_dust.json @@ -25,14 +25,14 @@ { "item": "techreborn:cell", "count": 5, - "tag": { + "nbt": { "fluid": "techreborn:hydrogen" } }, { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/calcite_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/calcite_dust.json index 89ac4cf64..eeb9e1664 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/calcite_dust.json @@ -17,21 +17,21 @@ { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:calcium" } }, { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:carbon" } }, { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbon_1.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/charcoal_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbon_1.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/charcoal_dust.json index 42f0e6ad7..7130e3652 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbon_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/charcoal_dust.json @@ -14,7 +14,7 @@ "results": [ { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:carbon" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/mercury.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/cinnabar_dust.json similarity index 96% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/mercury.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/cinnabar_dust.json index d3ef4178c..095a901de 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/mercury.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/cinnabar_dust.json @@ -15,7 +15,7 @@ "results": [ { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:mercury" } }, diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbon.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/coal_dust.json similarity index 96% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbon.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/coal_dust.json index cbba7b3a2..51859e1b1 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbon.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/coal_dust.json @@ -16,7 +16,7 @@ { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:carbon" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_4.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/emerald_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_4.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/emerald_dust.json index 73f12d057..43435c3b1 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_4.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/emerald_dust.json @@ -21,21 +21,21 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:beryllium" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 9, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/nitrogen.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ender_pearl_dust.json similarity index 87% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/nitrogen.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ender_pearl_dust.json index 20a7c17cc..1e98e3d2f 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/nitrogen.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ender_pearl_dust.json @@ -17,27 +17,27 @@ { "item": "techreborn:cell", "count": 5, - "tag": { + "nbt": { "fluid": "techreborn:nitrogen" } }, { "item": "techreborn:cell", - "tag": { - "fluid": "techreborn:berylium" + "nbt": { + "fluid": "techreborn:beryllium" } }, { "item": "techreborn:cell", "count": 4, - "tag": { + "nbt": { "fluid": "techreborn:potassium" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:chlorite" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silicon.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/flint_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silicon.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/flint_dust.json index 257355cc9..88a8c0410 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silicon.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/flint_dust.json @@ -16,13 +16,13 @@ "results": [ { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silver_small_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/galena_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silver_small_dust.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/galena_dust.json diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_2.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/grossular_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_2.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/grossular_dust.json index baeef2f72..d6b19031f 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_2.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/grossular_dust.json @@ -17,7 +17,7 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:calcium" } }, @@ -28,14 +28,14 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/lazurite_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/lazurite_dust.json index 7995e2993..d5d8736e8 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/lazurite_dust.json @@ -21,21 +21,21 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:calcium" } }, { "item": "techreborn:cell", "count": 4, - "tag": { + "nbt": { "fluid": "techreborn:sodium" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/methane.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/methane.json index f4ccfd1fe..ad4a0d74a 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/methane.json @@ -12,13 +12,13 @@ { "item": "techreborn:cell", "count": 4, - "tag": { + "nbt": { "fluid": "techreborn:hydrogen" } }, { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:carbon" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_small_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/obsidian_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_small_dust.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/obsidian_dust.json index 0dab8d02d..0332717c3 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_small_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/obsidian_dust.json @@ -24,14 +24,14 @@ }, { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/peridot_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/peridot_dust.json index dce1695a1..9ec08e81f 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/peridot_dust.json @@ -24,14 +24,14 @@ }, { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/iron_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrite_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/iron_dust.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrite_dust.json diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust_1.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrope_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust_1.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrope_dust.json index eb507352b..c21a33446 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/pyrope_dust.json @@ -25,14 +25,14 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_2.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ruby_dust.json similarity index 97% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_2.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ruby_dust.json index 3e127f058..64039e567 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_2.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/ruby_dust.json @@ -24,7 +24,7 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/potassium.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/saltpeter_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/potassium.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/saltpeter_dust.json index 8b6b5de22..9c285d0c0 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/potassium.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/saltpeter_dust.json @@ -17,21 +17,21 @@ { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:potassium" } }, { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:nitrogen" } }, { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_3.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sapphire_dust.json similarity index 96% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_3.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sapphire_dust.json index e1ce8c287..8af37306b 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_3.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sapphire_dust.json @@ -21,7 +21,7 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/sodium.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sodalite_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/sodium.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sodalite_dust.json index df9ccdd10..b6798fa24 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/sodium.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sodalite_dust.json @@ -17,7 +17,7 @@ { "item": "techreborn:cell", "count": 4, - "tag": { + "nbt": { "fluid": "techreborn:sodium" } }, @@ -28,13 +28,13 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:chlorite" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_5.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/spessartine_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_5.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/spessartine_dust.json index 9a0be0f23..b32e64172 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_5.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/spessartine_dust.json @@ -25,14 +25,14 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/zinc_dust.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sphalerite_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/zinc_dust.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sphalerite_dust.json diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen_1.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sulfuric_acid.json similarity index 76% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen_1.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sulfuric_acid.json index e112f8901..b166789b0 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sulfuric_acid.json @@ -4,34 +4,33 @@ "time": 1400, "ingredients": [ { - "fluid": "techreborn:sulfuric_acid", - "holder": "techreborn:cell" + "item": "techreborn:cell", + "count": 5, + "nbt": { + "fluid": "techreborn:sulfuric_acid" + } } ], "results": [ { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:hydrogen" } }, { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:sulfur" } }, { "item": "techreborn:cell", "count": 2, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } - }, - { - "item": "techreborn:cell", - "count": 2 } ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/wolframium.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/tungsten_dust.json similarity index 95% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/wolframium.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/tungsten_dust.json index 4697a492d..68f75aa78 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/wolframium.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/tungsten_dust.json @@ -14,7 +14,7 @@ "results": [ { "item": "techreborn:cell", - "tag": { + "nbt": { "fluid": "techreborn:wolframium" } } diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_3.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/uvarovite_dust.json similarity index 93% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_3.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/uvarovite_dust.json index 0ed566083..c4b04a56d 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_3.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/uvarovite_dust.json @@ -17,7 +17,7 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:calcium" } }, @@ -28,14 +28,14 @@ { "item": "techreborn:cell", "count": 3, - "tag": { + "nbt": { "fluid": "techreborn:silicon" } }, { "item": "techreborn:cell", "count": 6, - "tag": { + "nbt": { "fluid": "techreborn:compressed_air" } }