diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 733bc9068..4792f1113 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -34,7 +34,7 @@ import reborncore.common.fluid.*; import techreborn.TechReborn; public enum ModFluids { - BERYLIUM, + BERYLLIUM, CALCIUM, CALCIUM_CARBONATE, CARBON, @@ -46,7 +46,7 @@ public enum ModFluids { ELECTROLYZED_WATER, GLYCERYL, HELIUM, - HELIUM_3, + HELIUM3, HELIUMPLASMA, HYDROGEN, LITHIUM, @@ -57,13 +57,13 @@ public enum ModFluids { NITROCOAL_FUEL, NITROFUEL, NITROGEN, - NITROGENDIOXIDE, + NITROGEN_DIOXIDE, OIL, POTASSIUM, SILICON, SODIUM, SODIUM_SULFIDE, - SODIUMPERSULFATE, + SODIUM_PERSULFATE, SULFUR, SULFURIC_ACID, TRITIUM, @@ -77,11 +77,11 @@ public enum ModFluids { private final Identifier identifier; ModFluids() { - this.identifier = new Identifier(TechReborn.MOD_ID, this.name().replace("_", "").toLowerCase()); + this.identifier = new Identifier(TechReborn.MOD_ID, this.toString().toLowerCase()); FluidSettings fluidSettings = FluidSettings.create(); - Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.name().replace("_", "").toLowerCase() + "_flowing"); + Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.toString().toLowerCase() + "_flowing"); fluidSettings.setStillTexture(texture); fluidSettings.setFlowingTexture(texture); diff --git a/src/main/resources/assets/techreborn/blockstates/berylium.json b/src/main/resources/assets/techreborn/blockstates/berylium.json deleted file mode 100644 index 580aba91b..000000000 --- a/src/main/resources/assets/techreborn/blockstates/berylium.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/berylium" } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/beryllium.json b/src/main/resources/assets/techreborn/blockstates/beryllium.json new file mode 100644 index 000000000..f752166ab --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/beryllium.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/beryllium" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/calcium_carbonate.json b/src/main/resources/assets/techreborn/blockstates/calcium_carbonate.json new file mode 100644 index 000000000..f65d504d5 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/calcium_carbonate.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/calcium_carbonate" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/calciumcarbonate.json b/src/main/resources/assets/techreborn/blockstates/calciumcarbonate.json deleted file mode 100644 index d00380413..000000000 --- a/src/main/resources/assets/techreborn/blockstates/calciumcarbonate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/calciumcarbonate" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/carbon_fiber.json b/src/main/resources/assets/techreborn/blockstates/carbon_fiber.json new file mode 100644 index 000000000..780532bda --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/carbon_fiber.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/carbon_fiber" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/carbonfiber.json b/src/main/resources/assets/techreborn/blockstates/carbonfiber.json deleted file mode 100644 index dd23b024e..000000000 --- a/src/main/resources/assets/techreborn/blockstates/carbonfiber.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/carbonfiber" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/compressed_air.json b/src/main/resources/assets/techreborn/blockstates/compressed_air.json new file mode 100644 index 000000000..5bfd06c12 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/compressed_air.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/compressed_air" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/compressedair.json b/src/main/resources/assets/techreborn/blockstates/compressedair.json deleted file mode 100644 index 822997c05..000000000 --- a/src/main/resources/assets/techreborn/blockstates/compressedair.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/compressedair" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/electrolyzed_water.json b/src/main/resources/assets/techreborn/blockstates/electrolyzed_water.json new file mode 100644 index 000000000..b434250b0 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/electrolyzed_water.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/electrolyzed_water" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/electrolyzedwater.json b/src/main/resources/assets/techreborn/blockstates/electrolyzedwater.json deleted file mode 100644 index c98dd3efd..000000000 --- a/src/main/resources/assets/techreborn/blockstates/electrolyzedwater.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/electrolyzedwater" } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/nitro_carbon.json b/src/main/resources/assets/techreborn/blockstates/nitro_carbon.json new file mode 100644 index 000000000..ddca0cf65 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/nitro_carbon.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/nitro_carbon" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/nitro_diesel.json b/src/main/resources/assets/techreborn/blockstates/nitro_diesel.json new file mode 100644 index 000000000..22098a33a --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/nitro_diesel.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/nitro_diesel" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/nitrocarbon.json b/src/main/resources/assets/techreborn/blockstates/nitrocarbon.json deleted file mode 100644 index 280609cbc..000000000 --- a/src/main/resources/assets/techreborn/blockstates/nitrocarbon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/nitrocarbon" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/nitrocoal_fuel.json b/src/main/resources/assets/techreborn/blockstates/nitrocoal_fuel.json new file mode 100644 index 000000000..5bcf96c1c --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/nitrocoal_fuel.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/nitrocoal_fuel" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/nitrocoalfuel.json b/src/main/resources/assets/techreborn/blockstates/nitrocoalfuel.json deleted file mode 100644 index 70a43ef1f..000000000 --- a/src/main/resources/assets/techreborn/blockstates/nitrocoalfuel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/nitrocoalfuel" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/nitrodiesel.json b/src/main/resources/assets/techreborn/blockstates/nitrodiesel.json deleted file mode 100644 index 0405ace80..000000000 --- a/src/main/resources/assets/techreborn/blockstates/nitrodiesel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/nitrodiesel" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/nitrogen_dioxide.json b/src/main/resources/assets/techreborn/blockstates/nitrogen_dioxide.json new file mode 100644 index 000000000..96d3dadcc --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/nitrogen_dioxide.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/nitrogen_dioxide" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/nitrogendioxide.json b/src/main/resources/assets/techreborn/blockstates/nitrogendioxide.json deleted file mode 100644 index 9306ac39b..000000000 --- a/src/main/resources/assets/techreborn/blockstates/nitrogendioxide.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/nitrogendioxide" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/sodium_persulfate.json b/src/main/resources/assets/techreborn/blockstates/sodium_persulfate.json new file mode 100644 index 000000000..891761066 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/sodium_persulfate.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/sodium_persulfate" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/sodium_sulfide.json b/src/main/resources/assets/techreborn/blockstates/sodium_sulfide.json new file mode 100644 index 000000000..def59726d --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/sodium_sulfide.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/sodium_sulfide" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/sodiumpersulfate.json b/src/main/resources/assets/techreborn/blockstates/sodiumpersulfate.json deleted file mode 100644 index 169173e31..000000000 --- a/src/main/resources/assets/techreborn/blockstates/sodiumpersulfate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/sodiumpersulfate" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/sodiumsulfide.json b/src/main/resources/assets/techreborn/blockstates/sodiumsulfide.json deleted file mode 100644 index a6eb4907c..000000000 --- a/src/main/resources/assets/techreborn/blockstates/sodiumsulfide.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/sodiumsulfide" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/sulfuric_acid.json b/src/main/resources/assets/techreborn/blockstates/sulfuric_acid.json new file mode 100644 index 000000000..6830d1177 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/sulfuric_acid.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/fluid/sulfuric_acid" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/sulfuricacid.json b/src/main/resources/assets/techreborn/blockstates/sulfuricacid.json deleted file mode 100644 index 3327f176c..000000000 --- a/src/main/resources/assets/techreborn/blockstates/sulfuricacid.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "techreborn:block/fluid/sulfuricacid" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/berylium.json b/src/main/resources/assets/techreborn/models/block/fluid/berylium.json deleted file mode 100644 index 536406858..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/berylium.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/berylium_flowing" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/fluid/beryllium.json b/src/main/resources/assets/techreborn/models/block/fluid/beryllium.json new file mode 100644 index 000000000..84e5c7b29 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/beryllium.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/beryllium_flowing" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/fluid/calcium_carbonate.json b/src/main/resources/assets/techreborn/models/block/fluid/calcium_carbonate.json new file mode 100644 index 000000000..50cea32b9 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/calcium_carbonate.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/calcium_carbonate_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/calciumcarbonate.json b/src/main/resources/assets/techreborn/models/block/fluid/calciumcarbonate.json deleted file mode 100644 index a5bf820cc..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/calciumcarbonate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/calciumcarbonate_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/carbon_fiber.json b/src/main/resources/assets/techreborn/models/block/fluid/carbon_fiber.json new file mode 100644 index 000000000..66394bd4a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/carbon_fiber.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/carbon_fiber_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/carbonfiber.json b/src/main/resources/assets/techreborn/models/block/fluid/carbonfiber.json deleted file mode 100644 index 142f05459..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/carbonfiber.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/carbonfiber_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/compressed_air.json b/src/main/resources/assets/techreborn/models/block/fluid/compressed_air.json new file mode 100644 index 000000000..485c34edb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/compressed_air.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/compressed_air_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/compressedair.json b/src/main/resources/assets/techreborn/models/block/fluid/compressedair.json deleted file mode 100644 index 9b71a138a..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/compressedair.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/compressedair_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/electrolyzed_water.json b/src/main/resources/assets/techreborn/models/block/fluid/electrolyzed_water.json new file mode 100644 index 000000000..42fac9b0a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/electrolyzed_water.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/electrolyzed_water_flowing" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/fluid/electrolyzedwater.json b/src/main/resources/assets/techreborn/models/block/fluid/electrolyzedwater.json deleted file mode 100644 index 6efedff4d..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/electrolyzedwater.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/electrolyzedwater_flowing" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitro_carbon.json b/src/main/resources/assets/techreborn/models/block/fluid/nitro_carbon.json new file mode 100644 index 000000000..dc3bffe71 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitro_carbon.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/nitro_carbon_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitro_diesel.json b/src/main/resources/assets/techreborn/models/block/fluid/nitro_diesel.json new file mode 100644 index 000000000..1be7efae7 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitro_diesel.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/nitro_diesel_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrocarbon.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrocarbon.json deleted file mode 100644 index 05ae8974b..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrocarbon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrocarbon_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrocoal_fuel.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrocoal_fuel.json new file mode 100644 index 000000000..2474ec9e6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitrocoal_fuel.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/nitrocoal_fuel_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrocoalfuel.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrocoalfuel.json deleted file mode 100644 index fd5d9a2f5..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrocoalfuel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrocoalfuel_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrodiesel.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrodiesel.json deleted file mode 100644 index f1c50f266..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrodiesel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrodiesel_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrogen_dioxide.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrogen_dioxide.json new file mode 100644 index 000000000..1e3deb99a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/nitrogen_dioxide.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/nitrogen_dioxide_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/nitrogendioxide.json b/src/main/resources/assets/techreborn/models/block/fluid/nitrogendioxide.json deleted file mode 100644 index c937df8a1..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/nitrogendioxide.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/nitrogendioxide_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sodium_persulfate.json b/src/main/resources/assets/techreborn/models/block/fluid/sodium_persulfate.json new file mode 100644 index 000000000..edec262a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/sodium_persulfate.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/sodium_persulfate_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sodium_sulfide.json b/src/main/resources/assets/techreborn/models/block/fluid/sodium_sulfide.json new file mode 100644 index 000000000..23cd0d22a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/sodium_sulfide.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/sodium_sulfide_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sodiumpersulfate.json b/src/main/resources/assets/techreborn/models/block/fluid/sodiumpersulfate.json deleted file mode 100644 index eaeec203c..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/sodiumpersulfate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sodiumpersulfate_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sodiumsulfide.json b/src/main/resources/assets/techreborn/models/block/fluid/sodiumsulfide.json deleted file mode 100644 index fc8c38a9c..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/sodiumsulfide.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sodiumsulfide_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sulfuric_acid.json b/src/main/resources/assets/techreborn/models/block/fluid/sulfuric_acid.json new file mode 100644 index 000000000..2fa7344cd --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/fluid/sulfuric_acid.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "techreborn:block/fluids/sulfuric_acid_flowing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/fluid/sulfuricacid.json b/src/main/resources/assets/techreborn/models/block/fluid/sulfuricacid.json deleted file mode 100644 index 501f6c775..000000000 --- a/src/main/resources/assets/techreborn/models/block/fluid/sulfuricacid.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "techreborn:block/fluids/sulfuricacid_flowing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/beryllium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/calcium_carbonate_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/carbon_fiber_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/compressed_air_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/electrolyzed_water_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitro_carbon_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitro_diesel_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrocoal_fuel_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_dioxide_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sodium_persulfate_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sodium_sulfide_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sulfuric_acid_flowing.png.mcmeta diff --git a/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_iron_ore.json b/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_iron_ore.json index 0f8d7d014..54cec5d42 100644 --- a/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_iron_ore.json +++ b/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_iron_ore.json @@ -8,7 +8,7 @@ "item": "minecraft:iron_ore" }, { - "fluid": "techreborn:calciumcarbonate", + "fluid": "techreborn:calcium_carbonate", "holder": "techreborn:cell" } ], diff --git a/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_pyrite_ore.json b/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_pyrite_ore.json index d89482428..ab1734df9 100644 --- a/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_pyrite_ore.json +++ b/src/main/resources/data/techreborn/recipes/blast_furnace/refined_iron_ingot_from_pyrite_ore.json @@ -8,7 +8,7 @@ "item": "techreborn:pyrite_ore" }, { - "fluid": "techreborn:calciumcarbonate", + "fluid": "techreborn:calcium_carbonate", "holder": "techreborn:cell" } ], diff --git a/src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json b/src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json index bd47035d4..455066697 100644 --- a/src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json +++ b/src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json @@ -5,7 +5,7 @@ "heat": 1500, "ingredients": [ { - "fluid": "techreborn:calciumcarbonate", + "fluid": "techreborn:silicon", "holder": "techreborn:cell", "count": 2 } diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/calciumcarbonate_cell.json b/src/main/resources/data/techreborn/recipes/centrifuge/calciumcarbonate_cell.json index bf0453296..0470d3c38 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/calciumcarbonate_cell.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/calciumcarbonate_cell.json @@ -4,7 +4,7 @@ "time": 5, "ingredients": [ { - "fluid": "techreborn:calciumcarbonate", + "fluid": "techreborn:calcium_carbonate", "holder": "techreborn:cell" } ], diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/calciumcarbonate.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/calcium_carbonate.json similarity index 88% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/calciumcarbonate.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/calcium_carbonate.json index 670f2a7ae..9f5147c3f 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/calciumcarbonate.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/calcium_carbonate.json @@ -17,7 +17,7 @@ "item": "techreborn:cell", "count": 2, "nbt": { - "fluid": "techreborn:calciumcarbonate" + "fluid": "techreborn:calcium_carbonate" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/glyceryl.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/glyceryl.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/glyceryl.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/glyceryl.json index a3da97bd4..ef64a99bf 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/glyceryl.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/glyceryl.json @@ -4,7 +4,7 @@ "time": 600, "ingredients": [ { - "fluid": "techreborn:nitrocarbon", + "fluid": "techreborn:nitro_carbon", "holder": "techreborn:cell" }, { diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/methane.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/methane.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/methane.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/methane.json diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocarbon.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_carbon.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocarbon.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_carbon.json index 0e218ff5b..23ef9e3f1 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocarbon.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_carbon.json @@ -17,7 +17,7 @@ "item": "techreborn:cell", "count": 2, "nbt": { - "fluid": "techreborn:nitrocarbon" + "fluid": "techreborn:nitro_carbon" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrodiesel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_diesel.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrodiesel.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_diesel.json index 2afb73ec0..3ca0c2ea0 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrodiesel.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitro_diesel.json @@ -17,7 +17,7 @@ "item": "techreborn:cell", "count": 5, "nbt": { - "fluid": "techreborn:nitrodiesel" + "fluid": "techreborn:nitro_diesel" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocoalfuel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrocoal_fuel.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocoalfuel.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/nitrocoal_fuel.json index 5bc6a4211..a79833fcc 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocoalfuel.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrocoal_fuel.json @@ -17,7 +17,7 @@ "item": "techreborn:cell", "count": 5, "nbt": { - "fluid": "techreborn:nitrocoalfuel" + "fluid": "techreborn:nitrocoal_fuel" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrofuel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrofuel.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrofuel.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/nitrofuel.json diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrogendioxide.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrogen_dioxide.json similarity index 77% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrogendioxide.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/nitrogen_dioxide.json index 8420130dd..f46f9a5d0 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrogendioxide.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/nitrogen_dioxide.json @@ -4,7 +4,7 @@ "time": 400, "ingredients": [ { - "fluid": "techreborn:compressedair", + "fluid": "techreborn:compressed_air", "holder": "techreborn:cell" }, { @@ -16,7 +16,7 @@ { "item": "techreborn:cell", "nbt": { - "fluid": "techreborn:nitrogendioxide" + "fluid": "techreborn:nitrogen_dioxide" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumpersulfate.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/sodium_persulfate.json similarity index 68% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumpersulfate.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/sodium_persulfate.json index d45687b88..4fe581138 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumpersulfate.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/sodium_persulfate.json @@ -4,11 +4,11 @@ "time": 800, "ingredients": [ { - "fluid": "techreborn:sodiumsulfide", + "fluid": "techreborn:sodium_sulfide", "holder": "techreborn:cell" }, { - "fluid": "techreborn:compressedair", + "fluid": "techreborn:compressed_air", "holder": "techreborn:cell" } ], @@ -17,7 +17,7 @@ "item": "techreborn:cell", "count": 2, "nbt": { - "fluid": "techreborn:sodiumpersulfate" + "fluid": "techreborn:sodium_persulfate" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumsulfide.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/sodium_sulfide.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumsulfide.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/sodium_sulfide.json index 4a6bb3c74..2e7d16505 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumsulfide.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/sodium_sulfide.json @@ -17,7 +17,7 @@ "item": "techreborn:cell", "count": 2, "nbt": { - "fluid": "techreborn:sodiumsulfide" + "fluid": "techreborn:sodium_sulfide" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sulfuricacid.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/sulfuric_acid.json similarity index 89% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sulfuricacid.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/sulfuric_acid.json index ae4102c8a..37f40e74f 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sulfuricacid.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/sulfuric_acid.json @@ -17,7 +17,7 @@ "item": "techreborn:cell", "count": 3, "nbt": { - "fluid": "techreborn:sulfuricacid" + "fluid": "techreborn:sulfuric_acid" } } ] diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/water.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/water.json similarity index 88% rename from src/main/resources/data/techreborn/recipes/chemical_reactor/auto/water.json rename to src/main/resources/data/techreborn/recipes/chemical_reactor/water.json index 3d78cd071..6fb49b8a3 100644 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/water.json +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/water.json @@ -4,7 +4,7 @@ "time": 400, "ingredients": [ { - "fluid": "techreborn:compressedair", + "fluid": "techreborn:compressed_air", "holder": "techreborn:cell" }, { diff --git a/src/main/resources/data/techreborn/recipes/distillation_tower/diesel.json b/src/main/resources/data/techreborn/recipes/distillation_tower/diesel.json index 899d9e793..1bc92e9a4 100644 --- a/src/main/resources/data/techreborn/recipes/distillation_tower/diesel.json +++ b/src/main/resources/data/techreborn/recipes/distillation_tower/diesel.json @@ -26,7 +26,7 @@ "item": "techreborn:cell", "count": 16, "nbt": { - "fluid": "techreborn:sulfuricacid" + "fluid": "techreborn:sulfuric_acid" } }, { diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json index b8a651232..815f6dec6 100644 --- a/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json @@ -3,7 +3,7 @@ "power": 20, "time": 100, "tank": { - "fluid": "techreborn:carbonfiber", + "fluid": "techreborn:carbon_fiber", "amount": 1000 }, "ingredients": [ diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/compressedair.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/compressedair.json index c6e8a7800..f42c605dd 100644 --- a/src/main/resources/data/techreborn/recipes/fluid_replicator/compressedair.json +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/compressedair.json @@ -3,7 +3,7 @@ "power": 20, "time": 100, "tank": { - "fluid": "techreborn:compressedair", + "fluid": "techreborn:compressed_air", "amount": 1000 }, "ingredients": [ 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/auto/aluminum_dust_1.json index 2a7a4b035..326436c0f 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_1.json @@ -33,7 +33,7 @@ "item": "techreborn:cell", "count": 3, "tag": { - "fluid": "techreborn:compressedair" + "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/auto/aluminum_dust_2.json index 4dda25d2f..c7a08e5a0 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_2.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_2.json @@ -25,7 +25,7 @@ "item": "techreborn:cell", "count": 3, "tag": { - "fluid": "techreborn:compressedair" + "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/auto/aluminum_dust_3.json index d45cc6f84..3c39c9a57 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_3.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_3.json @@ -22,7 +22,7 @@ "item": "techreborn:cell", "count": 3, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] 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/auto/aluminum_dust_4.json index e1d934549..73f12d057 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_4.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_4.json @@ -22,7 +22,7 @@ "item": "techreborn:cell", "count": 3, "tag": { - "fluid": "techreborn:berylium" + "fluid": "techreborn:beryllium" } }, { @@ -36,7 +36,7 @@ "item": "techreborn:cell", "count": 9, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] 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/auto/aluminum_dust_5.json index 91548c9b4..9a0be0f23 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_5.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/aluminum_dust_5.json @@ -33,7 +33,7 @@ "item": "techreborn:cell", "count": 6, "tag": { - "fluid": "techreborn:compressedair" + "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/auto/calcium.json index 9fb85e912..740488304 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium.json @@ -32,7 +32,7 @@ "item": "techreborn:cell", "count": 3, "tag": { - "fluid": "techreborn:compressedair" + "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/auto/calcium_1.json index f75d33acf..2a092ab51 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_1.json @@ -36,7 +36,7 @@ "item": "techreborn:cell", "count": 6, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_2.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_2.json index 1adc85648..6753c3e11 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_2.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_2.json @@ -36,7 +36,7 @@ "item": "techreborn:cell", "count": 6, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_3.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_3.json index 354532fc6..0ed566083 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_3.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/calcium_3.json @@ -36,7 +36,7 @@ "item": "techreborn:cell", "count": 6, "tag": { - "fluid": "techreborn:compressedair" + "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/auto/carbonfiber.json index ccd4cccd7..d001c0729 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbonfiber.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/carbonfiber.json @@ -16,7 +16,7 @@ { "item": "techreborn:cell", "tag": { - "fluid": "techreborn:carbonfiber" + "fluid": "techreborn:carbon_fiber" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen_1.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen_1.json index f4692a57f..b7b51db5c 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/hydrogen_1.json @@ -4,7 +4,7 @@ "time": 40, "ingredients": [ { - "fluid": "techreborn:sulfuricacid", + "fluid": "techreborn:sulfuric_acid", "holder": "techreborn:cell" } ], @@ -26,7 +26,7 @@ "item": "techreborn:cell", "count": 2, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } }, { 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/auto/iron_dust_1.json index 277b34fc8..2fb26d64d 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/iron_dust_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/iron_dust_1.json @@ -33,7 +33,7 @@ "item": "techreborn:cell", "count": 6, "tag": { - "fluid": "techreborn:compressedair" + "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/auto/magnesium_dust.json index 55008ca1b..ea069e119 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust.json @@ -32,7 +32,7 @@ "item": "techreborn:cell", "count": 2, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] 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/auto/magnesium_dust_1.json index 63851c793..eb507352b 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust_1.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_dust_1.json @@ -33,7 +33,7 @@ "item": "techreborn:cell", "count": 6, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] 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/auto/magnesium_small_dust.json index 97b4320e7..392a7aa45 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_small_dust.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/magnesium_small_dust.json @@ -32,7 +32,7 @@ "item": "techreborn:cell", "count": 2, "tag": { - "fluid": "techreborn:compressedair" + "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/auto/potassium.json index ebb48a7e5..ca299af29 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/potassium.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/potassium.json @@ -32,7 +32,7 @@ "item": "techreborn:cell", "count": 3, "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silicon.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silicon.json index 8dac44922..caa21602d 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silicon.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/auto/silicon.json @@ -23,7 +23,7 @@ { "item": "techreborn:cell", "tag": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/electrolyzedwater_cell.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/electrolyzed_water_cell.json similarity index 81% rename from src/main/resources/data/techreborn/recipes/industrial_electrolyzer/electrolyzedwater_cell.json rename to src/main/resources/data/techreborn/recipes/industrial_electrolyzer/electrolyzed_water_cell.json index dc8a235c0..483a655cc 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/electrolyzedwater_cell.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/electrolyzed_water_cell.json @@ -6,7 +6,7 @@ { "item": "techreborn:cell", "nbt": { - "fluid": "techreborn:electrolyzedwater" + "fluid": "techreborn:electrolyzed_water" }, "count": 5 } @@ -22,7 +22,7 @@ { "item": "techreborn:cell", "nbt": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json index a7b6527e5..769f2e2f7 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json @@ -23,7 +23,7 @@ { "item": "techreborn:cell", "nbt": { - "fluid": "techreborn:compressedair" + "fluid": "techreborn:compressed_air" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/water_cell.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/water_cell.json index 7d033a6e4..563db36ab 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/water_cell.json +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/water_cell.json @@ -14,7 +14,7 @@ { "item": "techreborn:cell", "nbt": { - "fluid": "techreborn:electrolyzedwater" + "fluid": "techreborn:electrolyzed_water" } } ] diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_sodiumpersulfate.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_sodiumpersulfate.json index aa0e462f4..52451cf54 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_sodiumpersulfate.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/copper_ore_with_sodiumpersulfate.json @@ -3,7 +3,7 @@ "power": 64, "time": 100, "tank": { - "fluid": "techreborn:sodiumpersulfate", + "fluid": "techreborn:sodium_persulfate", "amount": 1000 }, "ingredients": [ diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ore_with_sodiumpersulfate.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ore_with_sodiumpersulfate.json index c09105f58..e1661b390 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ore_with_sodiumpersulfate.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/gold_ore_with_sodiumpersulfate.json @@ -3,7 +3,7 @@ "power": 64, "time": 100, "tank": { - "fluid": "techreborn:sodiumpersulfate", + "fluid": "techreborn:sodium_persulfate", "amount": 1000 }, "ingredients": [ diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/sphalerite_ore_with_sodiumpersulfate.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/sphalerite_ore_with_sodiumpersulfate.json index 9fbafe2e8..55c7c2032 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/sphalerite_ore_with_sodiumpersulfate.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/sphalerite_ore_with_sodiumpersulfate.json @@ -3,7 +3,7 @@ "power": 64, "time": 100, "tank": { - "fluid": "techreborn:sodiumpersulfate", + "fluid": "techreborn:sodium_persulfate", "amount": 1000 }, "ingredients": [ diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json index 41a4633c7..129a4dfa9 100644 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/tin_ore_with_sodiumpersulfate.json @@ -3,7 +3,7 @@ "power": 64, "time": 100, "tank": { - "fluid": "techreborn:sodiumpersulfate", + "fluid": "techreborn:sodium_persulfate", "amount": 1000 }, "ingredients": [