From d8f8639ee37e49b463c8d3366eaf06503b6d4340 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Wed, 5 Nov 2025 10:44:17 -0600 Subject: [PATCH] more molecule stuff (#2166) * om * maddie told me they should be in "" * adjusted some things --------- Co-authored-by: Pyritie --- .../gtceu/molecules/antimony_trifluoride.json | 8 +- .../gtceu/molecules/antimony_trioxide.json | 14 +- kubejs/assets/gtceu/molecules/barite.json | 14 +- kubejs/assets/gtceu/molecules/calcite.json | 10 +- .../gtceu/molecules/calcium_ferrocyanide.json | 199 ++++++++++++++++++ .../gtceu/molecules/calcium_hydroxide.json | 4 +- .../gtceu/molecules/dinitrogen_tetroxide.json | 76 +++++++ kubejs/assets/gtceu/molecules/lactose.json | 22 +- .../gtceu/molecules/lithium_carbonate.json | 10 +- kubejs/assets/gtceu/molecules/magnesite.json | 10 +- .../gtceu/molecules/nitrogen_dioxide.json | 37 ++++ .../gtceu/molecules/nitrosyl_chloride.json | 37 ++++ .../assets/gtceu/molecules/nitrous_oxide.json | 51 +++++ .../assets/gtceu/molecules/paracetamol.json | 12 +- kubejs/assets/gtceu/molecules/phosphate.json | 2 +- .../gtceu/molecules/phosphorus_pentoxide.json | 36 ++-- .../gtceu/molecules/potassium_carbonate.json | 10 +- .../gtceu/molecules/potassium_cyanide.json | 4 +- .../gtceu/molecules/potassium_dichromate.json | 26 +-- .../molecules/potassium_ferrocyanide.json | 14 +- .../gtceu/molecules/potassium_hydroxide.json | 4 +- .../gtceu/molecules/potassium_sulfate.json | 14 +- kubejs/assets/gtceu/molecules/saltpeter.json | 8 +- kubejs/assets/gtceu/molecules/scheelite.json | 14 +- kubejs/assets/gtceu/molecules/soda_ash.json | 10 +- .../gtceu/molecules/sodium_bicarbonate.json | 12 +- .../gtceu/molecules/sodium_bisulfate.json | 14 +- .../gtceu/molecules/sodium_hydroxide.json | 4 +- .../gtceu/molecules/sodium_nitrite.json | 6 +- kubejs/assets/gtceu/molecules/sugar.json | 38 ++-- .../gtceu/molecules/titanium_trifluoride.json | 8 +- kubejs/assets/gtceu/molecules/tungstate.json | 14 +- .../assets/gtceu/molecules/tungstic_acid.json | 14 +- .../molecules/1_1_1_2_tetrafluoroethane.json | 8 +- kubejs/assets/tfg/molecules/acetylene.json | 4 +- .../assets/tfg/molecules/ammonia_borane.json | 24 ++- .../tfg/molecules/ammonium_tungstate.json | 136 ++++++------ kubejs/assets/tfg/molecules/aniline.json | 6 +- kubejs/assets/tfg/molecules/apt.json | 141 ++++++------- kubejs/assets/tfg/molecules/boric_acid.json | 8 +- .../tfg/molecules/chlorine_pentafluoride.json | 12 +- .../tfg/molecules/chloryl_fluoride.json | 12 +- .../tfg/molecules/dimethyl_carbonate.json | 8 +- .../tfg/molecules/methyl_phenylcarbamate.json | 14 +- .../methylene_diphenyl_dicarbamate.json | 16 +- .../methylene_diphenyl_diisocyanate.json | 24 +-- .../tfg/molecules/sodium_borohydride.json | 8 +- .../tfg/molecules/sodium_tungstate.json | 10 +- .../tfg/molecules/tetrafluoroethane.json | 8 +- kubejs/assets/tfg/molecules/tmos.json | 10 +- .../tfg/molecules/trimethyl_borate.json | 8 +- .../assets/tfg/molecules/tungsten_oxide.json | 14 +- 52 files changed, 816 insertions(+), 411 deletions(-) create mode 100644 kubejs/assets/gtceu/molecules/calcium_ferrocyanide.json create mode 100644 kubejs/assets/gtceu/molecules/dinitrogen_tetroxide.json create mode 100644 kubejs/assets/gtceu/molecules/nitrogen_dioxide.json create mode 100644 kubejs/assets/gtceu/molecules/nitrosyl_chloride.json create mode 100644 kubejs/assets/gtceu/molecules/nitrous_oxide.json diff --git a/kubejs/assets/gtceu/molecules/antimony_trifluoride.json b/kubejs/assets/gtceu/molecules/antimony_trifluoride.json index ee1fe0ee8..283c23de3 100644 --- a/kubejs/assets/gtceu/molecules/antimony_trifluoride.json +++ b/kubejs/assets/gtceu/molecules/antimony_trifluoride.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": Sb, + "element": "Sb", "index": 0, "x": 0.866, "y": -0.5 }, { "type": "atom", - "element": F, + "element": "F", "index": 1, "x": 0.866, "y": -1.5 }, { "type": "atom", - "element": F, + "element": "F", "index": 2, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": F, + "element": "F", "index": 3, "x": 1.732, "y": 0.0 diff --git a/kubejs/assets/gtceu/molecules/antimony_trioxide.json b/kubejs/assets/gtceu/molecules/antimony_trioxide.json index e5fd582ea..6bed298af 100644 --- a/kubejs/assets/gtceu/molecules/antimony_trioxide.json +++ b/kubejs/assets/gtceu/molecules/antimony_trioxide.json @@ -2,35 +2,35 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": Sb, + "element": "Sb", "index": 1, "x": 0.866, "y": 0.5 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.732, "y": 0.0 }, { "type": "atom", - "element": Sb, + "element": "Sb", "index": 3, "x": 2.598, "y": 0.5 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 3.4641, "y": 0.0 @@ -39,7 +39,7 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -57,7 +57,7 @@ "type": "bond", "a": 3, "b": 4, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/barite.json b/kubejs/assets/gtceu/molecules/barite.json index 729227ffc..6438265de 100644 --- a/kubejs/assets/gtceu/molecules/barite.json +++ b/kubejs/assets/gtceu/molecules/barite.json @@ -2,35 +2,35 @@ "contents": [ { "type": "atom", - "element": S, + "element": "S", "index": 0, "x": 2.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.33, "y": -1.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 2.33, "y": 1.0 @@ -76,13 +76,13 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 4, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/calcite.json b/kubejs/assets/gtceu/molecules/calcite.json index 42976f3ca..3bfaa824a 100644 --- a/kubejs/assets/gtceu/molecules/calcite.json +++ b/kubejs/assets/gtceu/molecules/calcite.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": C, + "element": "C", "index": 0, "x": 2.2933, "y": -0.155 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.1594, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.4273, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.2933, "y": 0.845 @@ -68,7 +68,7 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/calcium_ferrocyanide.json b/kubejs/assets/gtceu/molecules/calcium_ferrocyanide.json new file mode 100644 index 000000000..905856972 --- /dev/null +++ b/kubejs/assets/gtceu/molecules/calcium_ferrocyanide.json @@ -0,0 +1,199 @@ +{ + "contents": [ + { + "type": "atom", + "element": "Fe", + "index": 0, + "x": 2.95, + "y": 0.0 + }, + { + "type": "atom", + "index": 1, + "x": 2.084, + "y": 0.5 + }, + { + "type": "atom", + "index": 2, + "x": 2.084, + "y": -0.5 + }, + { + "type": "atom", + "index": 3, + "x": 2.95, + "y": 1.0 + }, + { + "type": "atom", + "index": 4, + "x": 2.95, + "y": -1.0 + }, + { + "type": "atom", + "index": 5, + "x": 3.816, + "y": 0.5 + }, + { + "type": "atom", + "index": 6, + "x": 3.816, + "y": -0.5 + }, + { + "type": "atom", + "element": "N", + "index": 7, + "x": 1.218, + "y": -1.0 + }, + { + "type": "atom", + "element": "N", + "index": 8, + "x": 4.6821, + "y": 1.0 + }, + { + "type": "atom", + "element": "N", + "index": 9, + "x": 2.95, + "y": 2.0 + }, + { + "type": "atom", + "element": "N", + "index": 10, + "x": 4.6821, + "y": -1.0 + }, + { + "type": "atom", + "element": "N", + "index": 11, + "x": 1.218, + "y": 1.0 + }, + { + "type": "atom", + "element": "N", + "index": 12, + "x": 2.95, + "y": -2.0 + }, + { + "sup": "4-", + "atoms": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12 + ], + "type": "parens" + }, + { + "type": "atom", + "element": { + "symbol": "Ca⁺", + "color": { + "color": -12714240, + "optional": true + }, + "material": "gtceu:calcium" + }, + "index": 13, + "x": 0.0, + "y": 0.0 + }, + { + "sub": "2", + "atoms": [ 13 ], + "type": "parens" + }, + { + "type": "bond", + "a": 0, + "b": 1, + "bond_type": "inward" + }, + { + "type": "bond", + "a": 0, + "b": 2, + "bond_type": "outward" + }, + { + "type": "bond", + "a": 0, + "b": 3, + "bond_type": "single" + }, + { + "type": "bond", + "a": 0, + "b": 4, + "bond_type": "single" + }, + { + "type": "bond", + "a": 0, + "b": 5, + "bond_type": "inward" + }, + { + "type": "bond", + "a": 0, + "b": 6, + "bond_type": "outward" + }, + { + "type": "bond", + "a": 2, + "b": 7, + "bond_type": "triple" + }, + { + "type": "bond", + "a": 5, + "b": 8, + "bond_type": "triple" + }, + { + "type": "bond", + "a": 3, + "b": 9, + "bond_type": "triple" + }, + { + "type": "bond", + "a": 6, + "b": 10, + "bond_type": "triple" + }, + { + "type": "bond", + "a": 1, + "b": 11, + "bond_type": "triple" + }, + { + "type": "bond", + "a": 4, + "b": 12, + "bond_type": "triple" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/calcium_hydroxide.json b/kubejs/assets/gtceu/molecules/calcium_hydroxide.json index bc7e35fa9..93531500b 100644 --- a/kubejs/assets/gtceu/molecules/calcium_hydroxide.json +++ b/kubejs/assets/gtceu/molecules/calcium_hydroxide.json @@ -2,14 +2,14 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 1.0, "y": 0 }, { "type": "atom", - "element": H, + "element": "H", "index": 1, "x": 2.0, "y": 0 diff --git a/kubejs/assets/gtceu/molecules/dinitrogen_tetroxide.json b/kubejs/assets/gtceu/molecules/dinitrogen_tetroxide.json new file mode 100644 index 000000000..f9151a604 --- /dev/null +++ b/kubejs/assets/gtceu/molecules/dinitrogen_tetroxide.json @@ -0,0 +1,76 @@ +{ + "contents": [ + { + "type": "atom", + "element": "N", + "index": 0, + "x": 0.5, + "y": -0.866 + }, + { + "type": "atom", + "element": "O", + "index": 1, + "x": 0.0, + "y": -1.732 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "N", + "index": 3, + "x": 1.5, + "y": -0.866 + }, + { + "type": "atom", + "element": "O", + "index": 4, + "x": 2.0, + "y": -1.732 + }, + { + "type": "atom", + "element": "O", + "index": 5, + "x": 2.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "bond_type": "one_and_half" + }, + { + "type": "bond", + "a": 0, + "b": 2, + "bond_type": "one_and_half" + }, + { + "type": "bond", + "a": 0, + "b": 3, + "bond_type": "single" + }, + { + "type": "bond", + "a": 3, + "b": 4, + "bond_type": "one_and_half" + }, + { + "type": "bond", + "a": 3, + "b": 5, + "bond_type": "one_and_half" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/lactose.json b/kubejs/assets/gtceu/molecules/lactose.json index 0069ff2fc..0f67fabef 100644 --- a/kubejs/assets/gtceu/molecules/lactose.json +++ b/kubejs/assets/gtceu/molecules/lactose.json @@ -2,7 +2,7 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 1.8660000000000014, "y": -1.5 @@ -39,7 +39,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "left": "H", "index": 6, "x": 0.36600000000000144, @@ -47,7 +47,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "right": "H", "index": 7, "x": 0.8660000000000014, @@ -55,7 +55,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "right": "H", "index": 8, "x": 1.8660000000000014, @@ -63,7 +63,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 9, "x": 2.3660000000000014, "y": -1.3659999999999997 @@ -82,7 +82,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "left": "H", "index": 12, "x": 0.0, @@ -108,7 +108,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 16, "x": 3.8660000000000014, "y": 0.5 @@ -121,7 +121,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "right": "H", "index": 18, "x": 2.8660000000000014, @@ -129,7 +129,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "right": "H", "index": 19, "x": 3.8660000000000014, @@ -137,7 +137,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "right": "H", "index": 20, "x": 4.366000000000001, @@ -151,7 +151,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "left": "H", "index": 22, "x": 2.0, diff --git a/kubejs/assets/gtceu/molecules/lithium_carbonate.json b/kubejs/assets/gtceu/molecules/lithium_carbonate.json index c02a43ccb..88c09cd7e 100644 --- a/kubejs/assets/gtceu/molecules/lithium_carbonate.json +++ b/kubejs/assets/gtceu/molecules/lithium_carbonate.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": C, + "element": "C", "index": 0, "x": 2.2933, "y": -0.155 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.1594, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.4273, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.2933, "y": 0.845 @@ -73,7 +73,7 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/magnesite.json b/kubejs/assets/gtceu/molecules/magnesite.json index 620b0a631..509af8010 100644 --- a/kubejs/assets/gtceu/molecules/magnesite.json +++ b/kubejs/assets/gtceu/molecules/magnesite.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": C, + "element": "C", "index": 0, "x": 2.2933, "y": -0.155 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.1594, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.4273, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.2933, "y": 0.845 @@ -68,7 +68,7 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/nitrogen_dioxide.json b/kubejs/assets/gtceu/molecules/nitrogen_dioxide.json new file mode 100644 index 000000000..371974a33 --- /dev/null +++ b/kubejs/assets/gtceu/molecules/nitrogen_dioxide.json @@ -0,0 +1,37 @@ +{ + "contents": [ + { + "type": "atom", + "element": "N", + "index": 0, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "element": "O", + "index": 1, + "x": 1.732, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 0.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "bond_type": "one_and_half" + }, + { + "type": "bond", + "a": 0, + "b": 2, + "bond_type": "one_and_half" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/nitrosyl_chloride.json b/kubejs/assets/gtceu/molecules/nitrosyl_chloride.json new file mode 100644 index 000000000..7ce57e366 --- /dev/null +++ b/kubejs/assets/gtceu/molecules/nitrosyl_chloride.json @@ -0,0 +1,37 @@ +{ + "contents": [ + { + "type": "atom", + "element": "N", + "index": 0, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "element": "Cl", + "index": 1, + "x": 1.7321, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 0.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "bond_type": "single" + }, + { + "type": "bond", + "a": 0, + "b": 2, + "bond_type": "double_centered" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/nitrous_oxide.json b/kubejs/assets/gtceu/molecules/nitrous_oxide.json new file mode 100644 index 000000000..dbf9bdd88 --- /dev/null +++ b/kubejs/assets/gtceu/molecules/nitrous_oxide.json @@ -0,0 +1,51 @@ +{ + "contents": [ + { + "type": "atom", + "element": "N", + "index": 0, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": { + "symbol": "N⁺", + "color": { + "color": -13610760, + "optional": true + }, + "material": "gtceu:nitrogen" + }, + "index": 1, + "x": 1.0, + "y": 0.0 + }, + { + "type": "atom", + "element": { + "symbol": "O⁻", + "color": { + "color": -62195, + "optional": true + }, + "material": "gtceu:oxygen" + }, + "index": 2, + "x": 2.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "bond_type": "triple" + }, + { + "type": "bond", + "a": 1, + "b": 2, + "bond_type": "single" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/paracetamol.json b/kubejs/assets/gtceu/molecules/paracetamol.json index d709d2c3a..2dd6fea8d 100644 --- a/kubejs/assets/gtceu/molecules/paracetamol.json +++ b/kubejs/assets/gtceu/molecules/paracetamol.json @@ -38,16 +38,16 @@ }, { "type": "atom", - "element": O, - "left": H, + "element": "O", + "left": "H", "index": 6, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": N, - "above": H, + "element": "N", + "above": "H", "index": 7, "x": 3.4641, "y": 2.0 @@ -66,7 +66,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 10, "x": 5.1962, "y": 2.0 @@ -135,7 +135,7 @@ "type": "bond", "a": 8, "b": 10, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/phosphate.json b/kubejs/assets/gtceu/molecules/phosphate.json index 776d45def..e6601a9e5 100644 --- a/kubejs/assets/gtceu/molecules/phosphate.json +++ b/kubejs/assets/gtceu/molecules/phosphate.json @@ -49,7 +49,7 @@ { "a": 0, "b": 1, - "bond_type": "double", + "bond_type": "double_centered", "type": "bond" }, { diff --git a/kubejs/assets/gtceu/molecules/phosphorus_pentoxide.json b/kubejs/assets/gtceu/molecules/phosphorus_pentoxide.json index ad3f5caa0..8e0f80407 100644 --- a/kubejs/assets/gtceu/molecules/phosphorus_pentoxide.json +++ b/kubejs/assets/gtceu/molecules/phosphorus_pentoxide.json @@ -2,98 +2,98 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 0.4132, "y": -0.7316 }, { "type": "atom", - "element": P, + "element": "P", "index": 1, "x": 1.3028, "y": -0.2795 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.3028, "y": 0.6246 }, { "type": "atom", - "element": P, + "element": "P", "index": 3, "x": 1.8466, "y": 1.5806 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 0.9568, "y": 1.1286 }, { "type": "atom", - "element": P, + "element": "P", "index": 5, "x": 0.9568, "y": 0.2244 }, { "type": "atom", - "element": O, + "element": "O", "index": 6, "x": 1.8466, "y": -0.2277 }, { "type": "atom", - "element": P, + "element": "P", "index": 7, "x": 2.7364, "y": 0.2244 }, { "type": "atom", - "element": O, + "element": "O", "index": 8, "x": 2.1926, "y": -0.7316 }, { "type": "atom", - "element": O, + "element": "O", "index": 9, "x": 2.7364, "y": 1.1286 }, { "type": "atom", - "element": O, + "element": "O", "index": 10, "x": 1.0728, "y": -1.2695 }, { "type": "atom", - "element": O, + "element": "O", "index": 11, "x": 3.7031, "y": -0.0313 }, { "type": "atom", - "element": O, + "element": "O", "index": 12, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 13, "x": 1.8466, "y": 2.5806 @@ -174,25 +174,25 @@ "type": "bond", "a": 1, "b": 10, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 7, "b": 11, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 5, "b": 12, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 3, "b": 13, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/potassium_carbonate.json b/kubejs/assets/gtceu/molecules/potassium_carbonate.json index a5ac17370..dcd30dd70 100644 --- a/kubejs/assets/gtceu/molecules/potassium_carbonate.json +++ b/kubejs/assets/gtceu/molecules/potassium_carbonate.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": C, + "element": "C", "index": 0, "x": 2.2933, "y": -0.155 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.1594, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.4273, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.2933, "y": 0.845 @@ -73,7 +73,7 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/potassium_cyanide.json b/kubejs/assets/gtceu/molecules/potassium_cyanide.json index 350ef5180..b47e878ba 100644 --- a/kubejs/assets/gtceu/molecules/potassium_cyanide.json +++ b/kubejs/assets/gtceu/molecules/potassium_cyanide.json @@ -2,14 +2,14 @@ "contents": [ { "type": "atom", - "element": N, + "element": "N", "index": 0, "x": 1.9999, "y": 0.0 }, { "type": "atom", - "element": C, + "element": "C", "index": 1, "x": 1.0, "y": 0.0 diff --git a/kubejs/assets/gtceu/molecules/potassium_dichromate.json b/kubejs/assets/gtceu/molecules/potassium_dichromate.json index 87c18f882..b51ddd149 100644 --- a/kubejs/assets/gtceu/molecules/potassium_dichromate.json +++ b/kubejs/assets/gtceu/molecules/potassium_dichromate.json @@ -2,63 +2,63 @@ "contents": [ { "type": "atom", - "element": Cr, + "element": "Cr", "index": 0, "x": 2.0238, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 1.5238, "y": -0.866 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 2.5238, "y": 0.8661 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 1.1578, "y": 0.5 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 2.8898, "y": -0.5 }, { "type": "atom", - "element": Cr, + "element": "Cr", "index": 5, "x": 3.7559, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 6, "x": 3.2559, "y": 0.8661 }, { "type": "atom", - "element": O, + "element": "O", "index": 7, "x": 4.2559, "y": -0.866 }, { "type": "atom", - "element": O, + "element": "O", "index": 8, "x": 4.6219, "y": 0.5 @@ -101,13 +101,13 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 2, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -131,13 +131,13 @@ "type": "bond", "a": 5, "b": 6, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 5, "b": 7, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", diff --git a/kubejs/assets/gtceu/molecules/potassium_ferrocyanide.json b/kubejs/assets/gtceu/molecules/potassium_ferrocyanide.json index 744968126..43bec93f7 100644 --- a/kubejs/assets/gtceu/molecules/potassium_ferrocyanide.json +++ b/kubejs/assets/gtceu/molecules/potassium_ferrocyanide.json @@ -2,7 +2,7 @@ "contents": [ { "type": "atom", - "element": Fe, + "element": "Fe", "index": 0, "x": 2.95, "y": 0.0 @@ -45,42 +45,42 @@ }, { "type": "atom", - "element": N, + "element": "N", "index": 7, "x": 1.218, "y": -1.0 }, { "type": "atom", - "element": N, + "element": "N", "index": 8, "x": 4.6821, "y": 1.0 }, { "type": "atom", - "element": N, + "element": "N", "index": 9, "x": 2.95, "y": 2.0 }, { "type": "atom", - "element": N, + "element": "N", "index": 10, "x": 4.6821, "y": -1.0 }, { "type": "atom", - "element": N, + "element": "N", "index": 11, "x": 1.218, "y": 1.0 }, { "type": "atom", - "element": N, + "element": "N", "index": 12, "x": 2.95, "y": -2.0 diff --git a/kubejs/assets/gtceu/molecules/potassium_hydroxide.json b/kubejs/assets/gtceu/molecules/potassium_hydroxide.json index 3d711692d..84e9fe863 100644 --- a/kubejs/assets/gtceu/molecules/potassium_hydroxide.json +++ b/kubejs/assets/gtceu/molecules/potassium_hydroxide.json @@ -2,14 +2,14 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 1.0, "y": 0 }, { "type": "atom", - "element": H, + "element": "H", "index": 1, "x": 2.0, "y": 0 diff --git a/kubejs/assets/gtceu/molecules/potassium_sulfate.json b/kubejs/assets/gtceu/molecules/potassium_sulfate.json index 1a6d1c7a6..597e0a009 100644 --- a/kubejs/assets/gtceu/molecules/potassium_sulfate.json +++ b/kubejs/assets/gtceu/molecules/potassium_sulfate.json @@ -2,35 +2,35 @@ "contents": [ { "type": "atom", - "element": S, + "element": "S", "index": 0, "x": 2.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.33, "y": -1.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 2.33, "y": 1.0 @@ -81,13 +81,13 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 4, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/saltpeter.json b/kubejs/assets/gtceu/molecules/saltpeter.json index 3ba713ef9..f0b4eb9d7 100644 --- a/kubejs/assets/gtceu/molecules/saltpeter.json +++ b/kubejs/assets/gtceu/molecules/saltpeter.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": N, + "element": "N", "index": 0, "x": 2.2933, "y": -0.155 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.1594, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.4273, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.2933, "y": 0.845 diff --git a/kubejs/assets/gtceu/molecules/scheelite.json b/kubejs/assets/gtceu/molecules/scheelite.json index 56bad1315..c9dbce296 100644 --- a/kubejs/assets/gtceu/molecules/scheelite.json +++ b/kubejs/assets/gtceu/molecules/scheelite.json @@ -2,35 +2,35 @@ "contents": [ { "type": "atom", - "element": W, + "element": "W", "index": 0, "x": 2.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.0, "y": -1.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 2.0, "y": 1.0 @@ -76,13 +76,13 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 4, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/soda_ash.json b/kubejs/assets/gtceu/molecules/soda_ash.json index 870f94e39..43337b1c2 100644 --- a/kubejs/assets/gtceu/molecules/soda_ash.json +++ b/kubejs/assets/gtceu/molecules/soda_ash.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": C, + "element": "C", "index": 0, "x": 2.2933, "y": -0.155 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.1594, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.4273, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.2933, "y": 0.845 @@ -73,7 +73,7 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/sodium_bicarbonate.json b/kubejs/assets/gtceu/molecules/sodium_bicarbonate.json index 446fb1e09..7538ef0a9 100644 --- a/kubejs/assets/gtceu/molecules/sodium_bicarbonate.json +++ b/kubejs/assets/gtceu/molecules/sodium_bicarbonate.json @@ -2,29 +2,29 @@ "contents": [ { "type": "atom", - "element": C, + "element": "C", "index": 0, "x": 2.2933, "y": -0.155 }, { "type": "atom", - "element": O, - "right": H, + "element": "O", + "right": "H", "index": 1, "x": 3.1594, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.4273, "y": -0.655 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.2933, "y": 0.845 @@ -69,7 +69,7 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/sodium_bisulfate.json b/kubejs/assets/gtceu/molecules/sodium_bisulfate.json index 75d37f762..d5469264c 100644 --- a/kubejs/assets/gtceu/molecules/sodium_bisulfate.json +++ b/kubejs/assets/gtceu/molecules/sodium_bisulfate.json @@ -2,35 +2,35 @@ "contents": [ { "type": "atom", - "element": S, + "element": "S", "index": 0, "x": 2.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.33, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.33, "y": -1.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 2.33, "y": 1.0 @@ -81,13 +81,13 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 4, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/sodium_hydroxide.json b/kubejs/assets/gtceu/molecules/sodium_hydroxide.json index c4d484fee..1cbd9e721 100644 --- a/kubejs/assets/gtceu/molecules/sodium_hydroxide.json +++ b/kubejs/assets/gtceu/molecules/sodium_hydroxide.json @@ -2,14 +2,14 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 1.0, "y": 0 }, { "type": "atom", - "element": H, + "element": "H", "index": 1, "x": 2.0, "y": 0 diff --git a/kubejs/assets/gtceu/molecules/sodium_nitrite.json b/kubejs/assets/gtceu/molecules/sodium_nitrite.json index 5a40a5045..bd70cdf62 100644 --- a/kubejs/assets/gtceu/molecules/sodium_nitrite.json +++ b/kubejs/assets/gtceu/molecules/sodium_nitrite.json @@ -2,21 +2,21 @@ "contents": [ { "type": "atom", - "element": N, + "element": "N", "index": 0, "x": 2.13, "y": 0.25 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 2.996, "y": -0.25 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.264, "y": -0.25 diff --git a/kubejs/assets/gtceu/molecules/sugar.json b/kubejs/assets/gtceu/molecules/sugar.json index 1ab618be7..9d6794bff 100644 --- a/kubejs/assets/gtceu/molecules/sugar.json +++ b/kubejs/assets/gtceu/molecules/sugar.json @@ -20,7 +20,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 1.8661, "y": -1.5 @@ -39,7 +39,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 6, "x": 4.3956, "y": -1.7183 @@ -70,7 +70,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 11, "x": 2.9721, "y": -2.8761 @@ -83,24 +83,24 @@ }, { "type": "atom", - "element": O, - "right": H, + "element": "O", + "right": "H", "index": 13, "x": 0.8661, "y": -2.2321 }, { "type": "atom", - "element": O, - "right": H, + "element": "O", + "right": "H", "index": 14, "x": 0.3661, "y": -3.3661 }, { "type": "atom", - "element": O, - "right": H, + "element": "O", + "right": "H", "index": 15, "x": 1.8661, "y": -4.2321 @@ -113,32 +113,32 @@ }, { "type": "atom", - "element": O, - "left": H, + "element": "O", + "left": "H", "index": 17, "x": 2.7205, "y": -0.8061 }, { "type": "atom", - "element": O, - "left": H, + "element": "O", + "left": "H", "index": 18, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, - "right": H, + "element": "O", + "right": "H", "index": 19, "x": 3.8956, "y": -4.2572 }, { "type": "atom", - "element": O, - "left": H, + "element": "O", + "left": "H", "index": 20, "x": 4.6555, "y": -2.3972 @@ -151,8 +151,8 @@ }, { "type": "atom", - "element": O, - "right": H, + "element": "O", + "right": "H", "index": 22, "x": 6.0706, "y": -3.8061 diff --git a/kubejs/assets/gtceu/molecules/titanium_trifluoride.json b/kubejs/assets/gtceu/molecules/titanium_trifluoride.json index b19b7a111..57e66fff9 100644 --- a/kubejs/assets/gtceu/molecules/titanium_trifluoride.json +++ b/kubejs/assets/gtceu/molecules/titanium_trifluoride.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": Ti, + "element": "Ti", "index": 0, "x": 0.866, "y": -0.5 }, { "type": "atom", - "element": F, + "element": "F", "index": 1, "x": 0.866, "y": -1.5 }, { "type": "atom", - "element": F, + "element": "F", "index": 2, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": F, + "element": "F", "index": 3, "x": 1.732, "y": 0.0 diff --git a/kubejs/assets/gtceu/molecules/tungstate.json b/kubejs/assets/gtceu/molecules/tungstate.json index d81e773d7..a146851b8 100644 --- a/kubejs/assets/gtceu/molecules/tungstate.json +++ b/kubejs/assets/gtceu/molecules/tungstate.json @@ -2,35 +2,35 @@ "contents": [ { "type": "atom", - "element": W, + "element": "W", "index": 0, "x": 2.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 3.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 1.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 2.0, "y": -1.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 2.0, "y": 1.0 @@ -81,13 +81,13 @@ "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 4, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/gtceu/molecules/tungstic_acid.json b/kubejs/assets/gtceu/molecules/tungstic_acid.json index 1d376cf63..4aad99429 100644 --- a/kubejs/assets/gtceu/molecules/tungstic_acid.json +++ b/kubejs/assets/gtceu/molecules/tungstic_acid.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": W, + "element": "W", "index": 0, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 0.0, "y": -0.825 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 0.0, "y": 0.825 }, { "type": "atom", - "element": O, + "element": "O", "right": "H", "index": 3, "x": 0.825, @@ -31,7 +31,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "left": "H", "index": 4, "x": -0.825, @@ -41,13 +41,13 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 2, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", diff --git a/kubejs/assets/tfg/molecules/1_1_1_2_tetrafluoroethane.json b/kubejs/assets/tfg/molecules/1_1_1_2_tetrafluoroethane.json index 4b4f2fc3a..96546e631 100644 --- a/kubejs/assets/tfg/molecules/1_1_1_2_tetrafluoroethane.json +++ b/kubejs/assets/tfg/molecules/1_1_1_2_tetrafluoroethane.json @@ -14,28 +14,28 @@ }, { "type": "atom", - "element": F, + "element": "F", "index": 2, "x": -2.6110, "y": -0.0256 }, { "type": "atom", - "element": F, + "element": "F", "index": 3, "x": -1.7860, "y": 0.7993 }, { "type": "atom", - "element": F, + "element": "F", "index": 4, "x": -1.7860, "y": -0.8506 }, { "type": "atom", - "element": F, + "element": "F", "index": 5, "x": -0.5485, "y": -0.7401 diff --git a/kubejs/assets/tfg/molecules/acetylene.json b/kubejs/assets/tfg/molecules/acetylene.json index 8fb87b91c..bcccd1fe5 100644 --- a/kubejs/assets/tfg/molecules/acetylene.json +++ b/kubejs/assets/tfg/molecules/acetylene.json @@ -14,14 +14,14 @@ }, { "type": "atom", - "element": H, + "element": "H", "index": 2, "x": -2.7223, "y": 0.9151 }, { "type": "atom", - "element": H, + "element": "H", "index": 3, "x": -0.2473, "y": 0.9151 diff --git a/kubejs/assets/tfg/molecules/ammonia_borane.json b/kubejs/assets/tfg/molecules/ammonia_borane.json index adbd61a38..e8f1e608e 100644 --- a/kubejs/assets/tfg/molecules/ammonia_borane.json +++ b/kubejs/assets/tfg/molecules/ammonia_borane.json @@ -4,8 +4,12 @@ "type": "atom", "element": { "symbol": "N⁺", + "color": { + "color": -13610760, + "optional": true + }, "material": "gtceu:nitrogen" - }, + }, "index": 0, "x": 0.0, "y": 0.0 @@ -14,50 +18,54 @@ "type": "atom", "element": { "symbol": "B⁻", + "color": { + "color": -19019, + "optional": true + }, "material": "gtceu:boron" - }, + }, "index": 1, "x": -0.8249, "y": 0.0 }, { "type": "atom", - "element": H, + "element": "H", "index": 2, "x": 0.0, "y": 0.825 }, { "type": "atom", - "element": H, + "element": "H", "index": 3, "x": -0.8249, "y": 0.825 }, { "type": "atom", - "element": H, + "element": "H", "index": 4, "x": -1.6499, "y": 0.0 }, { "type": "atom", - "element": H, + "element": "H", "index": 5, "x": 0.825, "y": 0.0 }, { "type": "atom", - "element": H, + "element": "H", "index": 6, "x": -0.8249, "y": -0.8249 }, { "type": "atom", - "element": H, + "element": "H", "index": 7, "x": 0.0, "y": -0.8249 diff --git a/kubejs/assets/tfg/molecules/ammonium_tungstate.json b/kubejs/assets/tfg/molecules/ammonium_tungstate.json index 43810792b..f2e6160e2 100644 --- a/kubejs/assets/tfg/molecules/ammonium_tungstate.json +++ b/kubejs/assets/tfg/molecules/ammonium_tungstate.json @@ -2,378 +2,378 @@ "contents": [ { "type": "atom", - "element": W, + "element": "W", "index": 0, "x": -0.0869, "y": -3.2348 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": -0.0869, "y": -4.0598 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 0.72, "y": -3.4063 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": -0.9118999999999999, "y": -3.2348 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": -0.7, "y": -2.6827 }, { "type": "atom", - "element": O, + "element": "O", "index": 5, "x": 0.6976, "y": -2.9798 }, { "type": "atom", - "element": O, + "element": "O", "index": 6, "x": -0.02310000000000001, "y": -2.258 }, { "type": "atom", - "element": W, + "element": "W", "index": 7, "x": -1.6965000000000001, "y": -2.9798 }, { "type": "atom", - "element": W, + "element": "W", "index": 8, "x": -0.7862, "y": -1.8622999999999998 }, { "type": "atom", - "element": W, + "element": "W", "index": 9, "x": 1.0332, "y": -2.2262 }, { "type": "atom", - "element": W, + "element": "W", "index": 10, "x": 1.5404, "y": -3.3201 }, { "type": "atom", - "element": O, + "element": "O", "index": 11, "x": -1.6103, "y": -3.8003 }, { "type": "atom", - "element": O, + "element": "O", "index": 12, "x": -2.411, "y": -3.3923 }, { "type": "atom", - "element": O, + "element": "O", "index": 13, "x": -2.364, "y": -2.4949 }, { "type": "atom", - "element": O, + "element": "O", "index": 14, "x": -1.8681, "y": -2.1729 }, { "type": "atom", - "element": O, + "element": "O", "index": 15, "x": -1.1445, "y": -2.3667 }, { "type": "atom", - "element": W, + "element": "W", "index": 16, "x": -1.6673, "y": -1.2918999999999998 }, { "type": "atom", - "element": W, + "element": "W", "index": 17, "x": -2.4812000000000003, "y": -1.6208 }, { "type": "atom", - "element": O, + "element": "O", "index": 18, "x": -1.8904, "y": -0.7563 }, { "type": "atom", - "element": O, + "element": "O", "index": 19, "x": -2.6151, "y": -0.5503 }, { "type": "atom", - "element": O, + "element": "O", "index": 20, "x": -3.0942000000000003, "y": -1.0688 }, { "type": "atom", - "element": O, + "element": "O", "index": 21, "x": -3.1956, "y": -2.0333 }, { "type": "atom", - "element": O, + "element": "O", "index": 22, "x": -1.0987, "y": -0.881 }, { "type": "atom", - "element": O, + "element": "O", "index": 23, "x": 0.020599999999999993, "y": -1.6906999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 24, "x": -1.8907, "y": -1.6821 }, { "type": "atom", - "element": O, + "element": "O", "index": 25, "x": 0.6372, "y": -2.3662 }, { "type": "atom", - "element": O, + "element": "O", "index": 26, "x": 1.2048999999999999, "y": -4.0737000000000005 }, { "type": "atom", - "element": O, + "element": "O", "index": 27, "x": 2.1534999999999997, "y": -3.8721 }, { "type": "atom", - "element": O, + "element": "O", "index": 28, "x": 1.6266999999999998, "y": -2.4996 }, { "type": "atom", - "element": O, + "element": "O", "index": 29, "x": 2.2941, "y": -2.9844999999999997 }, { "type": "atom", - "element": W, + "element": "W", "index": 30, "x": 2.2941, "y": -2.0147 }, { "type": "atom", - "element": O, + "element": "O", "index": 31, "x": 1.4327999999999999, "y": -1.7188999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 32, "x": 2.9072, "y": -2.5667 }, { "type": "atom", - "element": O, + "element": "O", "index": 33, "x": 3.1010999999999997, "y": -1.8431 }, { "type": "atom", - "element": O, + "element": "O", "index": 34, "x": 1.2827, "y": -0.8858 }, { "type": "atom", - "element": O, + "element": "O", "index": 35, "x": 2.5490999999999997, "y": -1.23 }, { "type": "atom", - "element": O, + "element": "O", "index": 36, "x": 1.6082999999999998, "y": -1.2803 }, { "type": "atom", - "element": W, + "element": "W", "index": 37, "x": 2.0641, "y": -0.5626 }, { "type": "atom", - "element": O, + "element": "O", "index": 38, "x": 2.7316, "y": -0.0778 }, { "type": "atom", - "element": O, + "element": "O", "index": 39, "x": 2.0641, "y": 0.2623 }, { "type": "atom", - "element": O, + "element": "O", "index": 40, "x": 1.2725, "y": -0.07759999999999999 }, { "type": "atom", - "element": W, + "element": "W", "index": 41, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 42, "x": 0.11229999999999998, "y": 0.8207 }, { "type": "atom", - "element": O, + "element": "O", "index": 43, "x": -0.8037, "y": 0.4125 }, { "type": "atom", - "element": O, + "element": "O", "index": 44, "x": 0.6666, "y": -0.48550000000000004 }, { "type": "atom", - "element": O, + "element": "O", "index": 45, "x": -1.1864000000000001, "y": -0.3053 }, { "type": "atom", - "element": W, + "element": "W", "index": 46, "x": -1.6048, "y": -0.22139999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 47, "x": -2.1853000000000002, "y": 0.3026 }, { "type": "atom", - "element": O, + "element": "O", "index": 48, "x": -1.4332, "y": 0.5631999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 49, "x": -0.5295, "y": -1.0244 }, { "type": "atom", - "element": W, + "element": "W", "index": 50, "x": 0.1585, "y": -0.8017 }, { "type": "atom", - "element": O, + "element": "O", "index": 51, "x": -0.37350000000000005, "y": -1.4035 }, { "type": "atom", - "element": O, + "element": "O", "index": 52, "x": -1.2137, "y": -1.6296 }, { "type": "atom", - "element": O, + "element": "O", "index": 53, "x": 0.5707, "y": -1.3983999999999999 @@ -401,7 +401,7 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -491,13 +491,13 @@ "type": "bond", "a": 7, "b": 12, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 7, "b": 11, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -533,13 +533,13 @@ "type": "bond", "a": 17, "b": 20, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 17, "b": 21, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -587,13 +587,13 @@ "type": "bond", "a": 10, "b": 26, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 10, "b": 27, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -641,13 +641,13 @@ "type": "bond", "a": 30, "b": 32, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 30, "b": 33, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -677,13 +677,13 @@ "type": "bond", "a": 37, "b": 39, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 37, "b": 38, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -737,13 +737,13 @@ "type": "bond", "a": 46, "b": 48, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 46, "b": 47, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -773,7 +773,7 @@ "type": "bond", "a": 41, "b": 42, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", diff --git a/kubejs/assets/tfg/molecules/aniline.json b/kubejs/assets/tfg/molecules/aniline.json index fe68df9b6..7e08e86c7 100644 --- a/kubejs/assets/tfg/molecules/aniline.json +++ b/kubejs/assets/tfg/molecules/aniline.json @@ -38,21 +38,21 @@ }, { "type": "atom", - "element": N, + "element": "N", "index": 6, "x": -1.6287, "y": 0.9705 }, { "type": "atom", - "element": H, + "element": "H", "index": 7, "x": -2.0412, "y": 0.2560 }, { "type": "atom", - "element": H, + "element": "H", "index": 8, "x": -2.0412, "y": 1.6850 diff --git a/kubejs/assets/tfg/molecules/apt.json b/kubejs/assets/tfg/molecules/apt.json index 5862fa2d3..09f825de8 100644 --- a/kubejs/assets/tfg/molecules/apt.json +++ b/kubejs/assets/tfg/molecules/apt.json @@ -2,378 +2,378 @@ "contents": [ { "type": "atom", - "element": W, + "element": "W", "index": 0, "x": -0.0869, "y": -3.2348 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": -0.0869, "y": -4.0598 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 0.72, "y": -3.4063 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": -0.9118999999999999, "y": -3.2348 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": -0.7, "y": -2.6827 }, { "type": "atom", - "element": O, + "element": "O", "index": 5, "x": 0.6976, "y": -2.9798 }, { "type": "atom", - "element": O, + "element": "O", "index": 6, "x": -0.02310000000000001, "y": -2.258 }, { "type": "atom", - "element": W, + "element": "W", "index": 7, "x": -1.6965000000000001, "y": -2.9798 }, { "type": "atom", - "element": W, + "element": "W", "index": 8, "x": -0.7862, "y": -1.8622999999999998 }, { "type": "atom", - "element": W, + "element": "W", "index": 9, "x": 1.0332, "y": -2.2262 }, { "type": "atom", - "element": W, + "element": "W", "index": 10, "x": 1.5404, "y": -3.3201 }, { "type": "atom", - "element": O, + "element": "O", "index": 11, "x": -1.6103, "y": -3.8003 }, { "type": "atom", - "element": O, + "element": "O", "index": 12, "x": -2.411, "y": -3.3923 }, { "type": "atom", - "element": O, + "element": "O", "index": 13, "x": -2.364, "y": -2.4949 }, { "type": "atom", - "element": O, + "element": "O", "index": 14, "x": -1.8681, "y": -2.1729 }, { "type": "atom", - "element": O, + "element": "O", "index": 15, "x": -1.1445, "y": -2.3667 }, { "type": "atom", - "element": W, + "element": "W", "index": 16, "x": -1.6673, "y": -1.2918999999999998 }, { "type": "atom", - "element": W, + "element": "W", "index": 17, "x": -2.4812000000000003, "y": -1.6208 }, { "type": "atom", - "element": O, + "element": "O", "index": 18, "x": -1.8904, "y": -0.7563 }, { "type": "atom", - "element": O, + "element": "O", "index": 19, "x": -2.6151, "y": -0.5503 }, { "type": "atom", - "element": O, + "element": "O", "index": 20, "x": -3.0942000000000003, "y": -1.0688 }, { "type": "atom", - "element": O, + "element": "O", "index": 21, "x": -3.1956, "y": -2.0333 }, { "type": "atom", - "element": O, + "element": "O", "index": 22, "x": -1.0987, "y": -0.881 }, { "type": "atom", - "element": O, + "element": "O", "index": 23, "x": 0.020599999999999993, "y": -1.6906999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 24, "x": -1.8907, "y": -1.6821 }, { "type": "atom", - "element": O, + "element": "O", "index": 25, "x": 0.6372, "y": -2.3662 }, { "type": "atom", - "element": O, + "element": "O", "index": 26, "x": 1.2048999999999999, "y": -4.0737000000000005 }, { "type": "atom", - "element": O, + "element": "O", "index": 27, "x": 2.1534999999999997, "y": -3.8721 }, { "type": "atom", - "element": O, + "element": "O", "index": 28, "x": 1.6266999999999998, "y": -2.4996 }, { "type": "atom", - "element": O, + "element": "O", "index": 29, "x": 2.2941, "y": -2.9844999999999997 }, { "type": "atom", - "element": W, + "element": "W", "index": 30, "x": 2.2941, "y": -2.0147 }, { "type": "atom", - "element": O, + "element": "O", "index": 31, "x": 1.4327999999999999, "y": -1.7188999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 32, "x": 2.9072, "y": -2.5667 }, { "type": "atom", - "element": O, + "element": "O", "index": 33, "x": 3.1010999999999997, "y": -1.8431 }, { "type": "atom", - "element": O, + "element": "O", "index": 34, "x": 1.2827, "y": -0.8858 }, { "type": "atom", - "element": O, + "element": "O", "index": 35, "x": 2.5490999999999997, "y": -1.23 }, { "type": "atom", - "element": O, + "element": "O", "index": 36, "x": 1.6082999999999998, "y": -1.2803 }, { "type": "atom", - "element": W, + "element": "W", "index": 37, "x": 2.0641, "y": -0.5626 }, { "type": "atom", - "element": O, + "element": "O", "index": 38, "x": 2.7316, "y": -0.0778 }, { "type": "atom", - "element": O, + "element": "O", "index": 39, "x": 2.0641, "y": 0.2623 }, { "type": "atom", - "element": O, + "element": "O", "index": 40, "x": 1.2725, "y": -0.07759999999999999 }, { "type": "atom", - "element": W, + "element": "W", "index": 41, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 42, "x": 0.11229999999999998, "y": 0.8207 }, { "type": "atom", - "element": O, + "element": "O", "index": 43, "x": -0.8037, "y": 0.4125 }, { "type": "atom", - "element": O, + "element": "O", "index": 44, "x": 0.6666, "y": -0.48550000000000004 }, { "type": "atom", - "element": O, + "element": "O", "index": 45, "x": -1.1864000000000001, "y": -0.3053 }, { "type": "atom", - "element": W, + "element": "W", "index": 46, "x": -1.6048, "y": -0.22139999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 47, "x": -2.1853000000000002, "y": 0.3026 }, { "type": "atom", - "element": O, + "element": "O", "index": 48, "x": -1.4332, "y": 0.5631999999999999 }, { "type": "atom", - "element": O, + "element": "O", "index": 49, "x": -0.5295, "y": -1.0244 }, { "type": "atom", - "element": W, + "element": "W", "index": 50, "x": 0.1585, "y": -0.8017 }, { "type": "atom", - "element": O, + "element": "O", "index": 51, "x": -0.37350000000000005, "y": -1.4035 }, { "type": "atom", - "element": O, + "element": "O", "index": 52, "x": -1.2137, "y": -1.6296 }, { "type": "atom", - "element": O, + "element": "O", "index": 53, "x": 0.5707, "y": -1.3983999999999999 @@ -399,10 +399,7 @@ }, { "type": "atom", - "element": { - "symbol": "O", - "material": "gtceu:oxygen" - }, + "element": "O", "left": [ "H", 2 @@ -420,7 +417,7 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -510,13 +507,13 @@ "type": "bond", "a": 7, "b": 12, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 7, "b": 11, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -552,13 +549,13 @@ "type": "bond", "a": 17, "b": 20, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 17, "b": 21, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -606,13 +603,13 @@ "type": "bond", "a": 10, "b": 26, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 10, "b": 27, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -660,13 +657,13 @@ "type": "bond", "a": 30, "b": 32, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 30, "b": 33, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -696,13 +693,13 @@ "type": "bond", "a": 37, "b": 39, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 37, "b": 38, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -756,13 +753,13 @@ "type": "bond", "a": 46, "b": 48, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 46, "b": 47, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -792,7 +789,7 @@ "type": "bond", "a": 41, "b": 42, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", diff --git a/kubejs/assets/tfg/molecules/boric_acid.json b/kubejs/assets/tfg/molecules/boric_acid.json index 0d9b24816..4092cbd99 100644 --- a/kubejs/assets/tfg/molecules/boric_acid.json +++ b/kubejs/assets/tfg/molecules/boric_acid.json @@ -2,14 +2,14 @@ "contents": [ { "type": "atom", - "element": B, + "element": "B", "index": 0, "x": 0.5, "y": -0.866 }, { "type": "atom", - "element": O, + "element": "O", "right": "H", "index": 1, "x": 1.5, @@ -17,7 +17,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "left": "H", "index": 2, "x": 0.0, @@ -25,7 +25,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "left": "H", "index": 3, "x": 0.0, diff --git a/kubejs/assets/tfg/molecules/chlorine_pentafluoride.json b/kubejs/assets/tfg/molecules/chlorine_pentafluoride.json index a6d45b8e5..af44f4050 100644 --- a/kubejs/assets/tfg/molecules/chlorine_pentafluoride.json +++ b/kubejs/assets/tfg/molecules/chlorine_pentafluoride.json @@ -2,42 +2,42 @@ "contents": [ { "type": "atom", - "element": Cl, + "element": "Cl", "index": 0, "x": -0.3098, "y": -0.2864 }, { "type": "atom", - "element": F, + "element": "F", "index": 1, "x": -0.3098, "y": -1.1113 }, { "type": "atom", - "element": F, + "element": "F", "index": 2, "x": -0.7947, "y": 0.3810 }, { "type": "atom", - "element": F, + "element": "F", "index": 3, "x": 0.1750, "y": 0.3810 }, { "type": "atom", - "element": F, + "element": "F", "index": 4, "x": 0.4747, "y": -0.5412 }, { "type": "atom", - "element": F, + "element": "F", "index": 5, "x": -1.0944, "y": -0.5413 diff --git a/kubejs/assets/tfg/molecules/chloryl_fluoride.json b/kubejs/assets/tfg/molecules/chloryl_fluoride.json index e72a7703e..e033f3d87 100644 --- a/kubejs/assets/tfg/molecules/chloryl_fluoride.json +++ b/kubejs/assets/tfg/molecules/chloryl_fluoride.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": Cl, + "element": "Cl", "index": 0, "x": 0.0000, "y": 0.1115 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 0.4125, "y": 0.8260 }, { "type": "atom", - "element": F, + "element": "F", "index": 2, "x": 0.4125, "y": -0.6028 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": -0.8250, "y": 0.1115 @@ -32,13 +32,13 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", diff --git a/kubejs/assets/tfg/molecules/dimethyl_carbonate.json b/kubejs/assets/tfg/molecules/dimethyl_carbonate.json index 443b4d66b..41d1b5c3c 100644 --- a/kubejs/assets/tfg/molecules/dimethyl_carbonate.json +++ b/kubejs/assets/tfg/molecules/dimethyl_carbonate.json @@ -8,7 +8,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": -3.4873, "y": -0.7749 @@ -21,7 +21,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": -2.0584, "y": -0.7749 @@ -34,7 +34,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 5, "x": -2.7728, "y": 0.4625 @@ -67,7 +67,7 @@ "type": "bond", "a": 2, "b": 5, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/methyl_phenylcarbamate.json b/kubejs/assets/tfg/molecules/methyl_phenylcarbamate.json index 19e618329..307810532 100644 --- a/kubejs/assets/tfg/molecules/methyl_phenylcarbamate.json +++ b/kubejs/assets/tfg/molecules/methyl_phenylcarbamate.json @@ -2,21 +2,21 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 1.6418, "y": 0.5155 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 0.9273, "y": -0.7218 }, { "type": "atom", - "element": N, + "element": "N", "index": 2, "x": 0.2128, "y": 0.5156 @@ -71,7 +71,7 @@ }, { "type": "atom", - "element": H, + "element": "H", "index": 11, "x": 0.2129, "y": 1.3406 @@ -92,7 +92,7 @@ "type": "bond", "a": 1, "b": 9, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -126,8 +126,8 @@ }, { "type": "bond", - "a": 5, - "b": 7, + "a": 7, + "b": 5, "bond_type": "double" }, { diff --git a/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json b/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json index aa38d0503..e94f4df81 100644 --- a/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json +++ b/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json @@ -80,14 +80,14 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 13, "x": 1.732099999999999, "y": 0 }, { "type": "atom", - "element": O, + "element": "O", "index": 14, "x": 8.660300000000001, "y": 0 @@ -100,14 +100,14 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 16, "x": 0.8659999999999997, "y": -1.4999999999999991 }, { "type": "atom", - "element": N, + "element": "N", "left": [ "H", 2 @@ -124,7 +124,7 @@ }, { "type": "atom", - "element": N, + "element": "N", "right": [ "H", 2 @@ -135,7 +135,7 @@ }, { "type": "atom", - "element": O, + "element": "O", "index": 20, "x": 10.3924, "y": 0.0 @@ -246,7 +246,7 @@ "type": "bond", "a": 15, "b": 16, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -270,7 +270,7 @@ "type": "bond", "a": 18, "b": 20, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/methylene_diphenyl_diisocyanate.json b/kubejs/assets/tfg/molecules/methylene_diphenyl_diisocyanate.json index 968dfa588..bc6ddaf99 100644 --- a/kubejs/assets/tfg/molecules/methylene_diphenyl_diisocyanate.json +++ b/kubejs/assets/tfg/molecules/methylene_diphenyl_diisocyanate.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": O, + "element": "O", "index": 0, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 10.3924, "y": 0.0 }, { "type": "atom", - "element": N, + "element": "N", "index": 2, "x": 1.7321, "y": 1.0 }, { "type": "atom", - "element": N, + "element": "N", "index": 3, "x": 8.6603, "y": 1.0 @@ -124,13 +124,13 @@ "type": "bond", "a": 0, "b": 17, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 1, "b": 18, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -142,7 +142,7 @@ "type": "bond", "a": 2, "b": 17, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -154,7 +154,7 @@ "type": "bond", "a": 3, "b": 18, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", @@ -170,8 +170,8 @@ }, { "type": "bond", - "a": 5, - "b": 7, + "a": 7, + "b": 5, "bond_type": "double" }, { @@ -224,8 +224,8 @@ }, { "type": "bond", - "a": 12, - "b": 16, + "a": 16, + "b": 12, "bond_type": "double" }, { diff --git a/kubejs/assets/tfg/molecules/sodium_borohydride.json b/kubejs/assets/tfg/molecules/sodium_borohydride.json index 5a34bb131..aefc8ddc4 100644 --- a/kubejs/assets/tfg/molecules/sodium_borohydride.json +++ b/kubejs/assets/tfg/molecules/sodium_borohydride.json @@ -12,28 +12,28 @@ }, { "type": "atom", - "element": H, + "element": "H", "index": 1, "x": 0.8249, "y": 0.0 }, { "type": "atom", - "element": H, + "element": "H", "index": 2, "x": 0.0, "y": -0.8249 }, { "type": "atom", - "element": H, + "element": "H", "index": 3, "x": -0.8250000000000001, "y": 0.0 }, { "type": "atom", - "element": H, + "element": "H", "index": 4, "x": 0.0, "y": 0.8250000000000001 diff --git a/kubejs/assets/tfg/molecules/sodium_tungstate.json b/kubejs/assets/tfg/molecules/sodium_tungstate.json index 7d13c4ddf..882e8a3b4 100644 --- a/kubejs/assets/tfg/molecules/sodium_tungstate.json +++ b/kubejs/assets/tfg/molecules/sodium_tungstate.json @@ -2,21 +2,21 @@ "contents": [ { "type": "atom", - "element": W, + "element": "W", "index": 0, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 0.0, "y": -0.825 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 0.0, "y": 0.825 @@ -65,13 +65,13 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 2, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", diff --git a/kubejs/assets/tfg/molecules/tetrafluoroethane.json b/kubejs/assets/tfg/molecules/tetrafluoroethane.json index 7b57deb3c..0a92c4057 100644 --- a/kubejs/assets/tfg/molecules/tetrafluoroethane.json +++ b/kubejs/assets/tfg/molecules/tetrafluoroethane.json @@ -14,28 +14,28 @@ }, { "type": "atom", - "element": F, + "element": "F", "index": 2, "x": 0.7341, "y": 1.3559 }, { "type": "atom", - "element": F, + "element": "F", "index": 3, "x": 0.7341, "y": -0.0730 }, { "type": "atom", - "element": F, + "element": "F", "index": 4, "x": -0.9158, "y": -0.0730 }, { "type": "atom", - "element": F, + "element": "F", "index": 5, "x": -0.9158, "y": 1.3559 diff --git a/kubejs/assets/tfg/molecules/tmos.json b/kubejs/assets/tfg/molecules/tmos.json index cc2b37415..11f94d465 100644 --- a/kubejs/assets/tfg/molecules/tmos.json +++ b/kubejs/assets/tfg/molecules/tmos.json @@ -2,35 +2,35 @@ "contents": [ { "type": "atom", - "element": Si, + "element": "Si", "index": 0, "x": -0.1504, "y": -0.7464 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 0.4625, "y": -1.2984 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": -0.7635, "y": -0.1943 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": -0.7025, "y": -1.3595 }, { "type": "atom", - "element": O, + "element": "O", "index": 4, "x": 0.4015, "y": -0.1333 diff --git a/kubejs/assets/tfg/molecules/trimethyl_borate.json b/kubejs/assets/tfg/molecules/trimethyl_borate.json index 23f8cfc3f..3f36766a5 100644 --- a/kubejs/assets/tfg/molecules/trimethyl_borate.json +++ b/kubejs/assets/tfg/molecules/trimethyl_borate.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": B, + "element": "B", "index": 0, "x": -0.6874, "y": 0.9488 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": -0.6874, "y": 1.7738 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 0.0270, "y": 0.5363 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": -1.4019, "y": 0.5363 diff --git a/kubejs/assets/tfg/molecules/tungsten_oxide.json b/kubejs/assets/tfg/molecules/tungsten_oxide.json index 8901ddefd..ca6a445d1 100644 --- a/kubejs/assets/tfg/molecules/tungsten_oxide.json +++ b/kubejs/assets/tfg/molecules/tungsten_oxide.json @@ -2,28 +2,28 @@ "contents": [ { "type": "atom", - "element": W, + "element": "W", "index": 0, "x": 0.866, "y": -0.5 }, { "type": "atom", - "element": O, + "element": "O", "index": 1, "x": 0.866, "y": -1.5 }, { "type": "atom", - "element": O, + "element": "O", "index": 2, "x": 0.0, "y": 0.0 }, { "type": "atom", - "element": O, + "element": "O", "index": 3, "x": 1.732, "y": 0.0 @@ -32,19 +32,19 @@ "type": "bond", "a": 0, "b": 1, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 2, - "bond_type": "double" + "bond_type": "double_centered" }, { "type": "bond", "a": 0, "b": 3, - "bond_type": "double" + "bond_type": "double_centered" } ] } \ No newline at end of file