From 54813ecdc38268a2cf63d364bbffe3c6384e39e8 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 13 Aug 2019 13:51:44 +0300 Subject: [PATCH] Bumped modloader + recipes + lang for buckets --- build.gradle | 2 +- .../assets/techreborn/lang/en_us.json | 38 ++++++++++++++++++- .../parts/carbon_fiber_from_cells.json | 16 ++++++++ .../parts/helium_coolant_cell_60k.json | 2 +- .../parts/nak_coolant_cell_60k.json | 4 +- .../parts/nak_coolant_cell_60k_alt.json | 4 +- .../parts/thick_neutron_reflector.json | 2 +- 7 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/parts/carbon_fiber_from_cells.json diff --git a/build.gradle b/build.gradle index b45f4da8b..31ecf51a5 100644 --- a/build.gradle +++ b/build.gradle @@ -83,7 +83,7 @@ group = 'TechReborn' dependencies { minecraft "com.mojang:minecraft:1.14.4" mappings "net.fabricmc:yarn:1.14.4+build.2" - modCompile "net.fabricmc:fabric-loader:0.4.8+build.157" + modCompile "net.fabricmc:fabric-loader:0.4.8+build.159" //Fabric api modCompile "net.fabricmc.fabric-api:fabric-api:0.3.1+build.208" diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index ee7e1d7a4..a0cd7abbf 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -652,5 +652,41 @@ "techreborn:recycler": "Recycler", "techreborn:scrapbox": "Scrapbox", "techreborn:vacuum_freezer": "Vacuum Freezer", - "techreborn:fluid_replicator": "Fluid Replicator" + "techreborn:fluid_replicator": "Fluid Replicator", + + "_comment26": "Fluid buckets", + "item.techreborn.beryllium_bucket": "Beryllium", + "item.techreborn.calcium_bucket": "Calcium", + "item.techreborn.calciumcarbonate_bucket": "Calcium Carbonate", + "item.techreborn.carbon_bucket": "Carbon", + "item.techreborn.carbon_fiber_bucket": "Carbon Fiber", + "item.techreborn.chlorite_bucket": "Chlorite", + "item.techreborn.compressed_air_bucket": "Compressed Air", + "item.techreborn.deuterium_bucket": "Deuterium", + "item.techreborn.diesel_bucket": "Diesel", + "item.techreborn.electrolyzed_water_bucket": "Electrolyzed Water", + "item.techreborn.glyceryl_bucket": "Glyceryl", + "item.techreborn.helium_bucket": "Helium", + "item.techreborn.helium3_bucket": "Helium3", + "item.techreborn.heliumplasma_bucket": "Heliumplasma", + "item.techreborn.hydrogen_bucket": "Hydrogen", + "item.techreborn.lithium_bucket": "Lithium", + "item.techreborn.mercury_bucket": "Mercury", + "item.techreborn.methane_bucket": "Methane", + "item.techreborn.nitro_carbon_bucket": "Nitrocarbon", + "item.techreborn.nitrocoal_fuel_bucket": "Nitrocoal Fuel", + "item.techreborn.nitro_diesel_bucket": "Nitro Diesel", + "item.techreborn.nitrofuel_bucket": "Nitrofuel", + "item.techreborn.nitrogen_bucket": "Nitrogen", + "item.techreborn.nitrogen_dioxide_bucket": "Nitrogen Dioxide", + "item.techreborn.oil_bucket": "Oil", + "item.techreborn.potassium_bucket": "Potassium", + "item.techreborn.silicon_bucket": "Silicon", + "item.techreborn.sodium_bucket": "Sodium", + "item.techreborn.sodium_persulfate_bucket": "Sodium Persulfate", + "item.techreborn.sodium_sulfide_bucket": "Sodium Sulfide", + "item.techreborn.sulfur_bucket": "Sulfur", + "item.techreborn.sulfuric_acid_bucket": "Sulfuric Acid", + "item.techreborn.tritium_bucket": "Tritium", + "item.techreborn.wolframium_bucket": "Wolframium" } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/carbon_fiber_from_cells.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/carbon_fiber_from_cells.json new file mode 100644 index 000000000..4e525b72b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/carbon_fiber_from_cells.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CCC", + "C C", + "CCC" + ], + "key": { + "C": { + "item": "techreborn:carbon_bucket" + } + }, + "result": { + "item": "techreborn:carbon_fiber" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_60k.json index 2df154002..766b7b5ee 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_60k.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_60k.json @@ -10,7 +10,7 @@ "tag": "c:tin_ingot" }, "C": { - "item": "techreborn:cell" + "item": "techreborn:helium_bucket" } }, "result": { diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k.json index 635091a3f..6152c576b 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k.json @@ -13,10 +13,10 @@ "tag": "c:tin_ingot" }, "S": { - "item": "techreborn:cell" + "item": "techreborn:sodium_bucket" }, "P": { - "item": "techreborn:cell" + "item": "techreborn:potassium_bucket" } }, "result": { diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k_alt.json index e72343ab0..ba11d13c9 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k_alt.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k_alt.json @@ -13,10 +13,10 @@ "tag": "c:tin_ingot" }, "P": { - "item": "techreborn:cell" + "item": "techreborn:potassium_bucket" }, "S": { - "item": "techreborn:cell" + "item": "techreborn:sodium_bucket" } }, "result": { diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/parts/thick_neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/thick_neutron_reflector.json index 83a1d28d7..326412b6a 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/parts/thick_neutron_reflector.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/parts/thick_neutron_reflector.json @@ -10,7 +10,7 @@ "item": "techreborn:neutron_reflector" }, "C": { - "item": "techreborn:cell" + "item": "techreborn:beryllium_bucket" } },