diff --git a/kubejs/startup_scripts/common/elements_materials/elements/abydos.js b/kubejs/startup_scripts/common/elements_materials/elements/abydos.js index b893e4f83..bbea9a86e 100644 --- a/kubejs/startup_scripts/common/elements_materials/elements/abydos.js +++ b/kubejs/startup_scripts/common/elements_materials/elements/abydos.js @@ -3,8 +3,8 @@ GTCEuStartupEvents.registry('gtceu:element', event => { const elem = global.elementFunction(event); - elem('zapolgium', 141, 217, 'Zg'); - elem('akreyrium', -1, -1, 'Ak'); + elem('zapolgium', 138, 217, 'Zg'); + elem('akreyrium', 164, 280, 'Ak'); elem('dysprosium', 66, 98, 'Dy'); }); \ No newline at end of file diff --git a/kubejs/startup_scripts/common/elements_materials/elements/end.js b/kubejs/startup_scripts/common/elements_materials/elements/end.js index 17994d827..79203a783 100644 --- a/kubejs/startup_scripts/common/elements_materials/elements/end.js +++ b/kubejs/startup_scripts/common/elements_materials/elements/end.js @@ -3,9 +3,9 @@ GTCEuStartupEvents.registry('gtceu:element', event => { const elem = global.elementFunction(event); - elem('xeproda', 136, 265, 'Xp'); - elem('rhexis', 137, 298, 'Rx'); - elem('chalyblux', 138, 312, 'Cx'); + elem('xeproda', 146, 245, 'Xp'); + elem('rhexis', 147, 247, 'Rx'); + elem('chalyblux', 148, 249, 'Cx'); elem('voidic', -1, -1, '∅'); elem('dragon', -1, -1, '🜍'); diff --git a/kubejs/startup_scripts/common/elements_materials/elements/gate.js b/kubejs/startup_scripts/common/elements_materials/elements/gate.js index 773cb6974..9581935a2 100644 --- a/kubejs/startup_scripts/common/elements_materials/elements/gate.js +++ b/kubejs/startup_scripts/common/elements_materials/elements/gate.js @@ -3,7 +3,7 @@ GTCEuStartupEvents.registry('gtceu:element', event => { const elem = global.elementFunction(event); - elem('purified_naquadah', 174, 350, 'Nq-'); - elem('echo_r', -1, -1, 'Ec'); + elem('purified_naquadah', 154, 250, 'Nq-'); + elem('echo_r', 152, 252, 'Ec'); }); \ No newline at end of file diff --git a/kubejs/startup_scripts/common/elements_materials/elements/modifications.js b/kubejs/startup_scripts/common/elements_materials/elements/modifications.js new file mode 100644 index 000000000..2a00f7865 --- /dev/null +++ b/kubejs/startup_scripts/common/elements_materials/elements/modifications.js @@ -0,0 +1,19 @@ + +GTCEuStartupEvents.registry('gtceu:element', event => { + + const setCounts = (name, protons, neutrons) => { + let elem = GTElements.get(name); + elem.protons(protons); + elem.neutrons(neutrons); + } + + [ + { name: 'Tritanium', protons: 125, neutrons: 198 }, + { name: 'Trinium', protons: 150, neutrons: 251 }, + { name: 'Naquadah', protons: 154, neutrons: 252 }, + { name: 'Naquadria', protons: 155, neutrons: 255 }, + { name: 'NaquadahEnriched', protons: 156, neutrons: 256 }, + { name: 'Duranium', protons: 123, neutrons: 112 } + ].forEach(e => setCounts(e.name, e.protons, e.neutrons)); + +}); \ No newline at end of file diff --git a/kubejs/startup_scripts/common/elements_materials/elements/nether.js b/kubejs/startup_scripts/common/elements_materials/elements/nether.js index 633452750..a2f598d80 100644 --- a/kubejs/startup_scripts/common/elements_materials/elements/nether.js +++ b/kubejs/startup_scripts/common/elements_materials/elements/nether.js @@ -3,13 +3,13 @@ GTCEuStartupEvents.registry('gtceu:element', event => { const elem = global.elementFunction(event); - elem('mythril', 132, 193, 'My'); - elem('adamantine', 131, 182, 'Ad'); - elem('estalt', 133, 199, 'El'); - elem('enriched_estalt', 133, 212, 'El+'); - elem('calamatium', 134, 211, 'Ct'); - elem('isovol', 135, 221, 'Is'); - elem('ancient_netherite', 124, 295, 'Nr+'); + elem('mythril', 133, 193, 'My'); + elem('adamantine', 132, 182, 'Ad'); + elem('estalt', 134, 199, 'El'); + elem('enriched_estalt', 134, 212, 'El+'); + elem('calamatium', 135, 211, 'Ct'); + elem('isovol', 136, 221, 'Is'); + elem('ancient_netherite', 124, 195, 'Nr+'); elem('aurourium', -1, -1, '*A*') }); \ No newline at end of file diff --git a/kubejs/startup_scripts/common/elements_materials/elements/netherite.js b/kubejs/startup_scripts/common/elements_materials/elements/netherite.js index 115bb2a47..d95b73b21 100644 --- a/kubejs/startup_scripts/common/elements_materials/elements/netherite.js +++ b/kubejs/startup_scripts/common/elements_materials/elements/netherite.js @@ -3,7 +3,8 @@ GTCEuStartupEvents.registry('gtceu:element', event => { const elem = global.elementFunction(event); - elem('debris', -1, -1, '?'); - elem('pure_netherite', 124, 345, '*Nr*'); + elem('debris', 122, 138, '?'); + elem('netherite', 124, 191, 'Nr'); + elem('pure_netherite', 124, 187, '*Nr*'); }); \ No newline at end of file diff --git a/kubejs/startup_scripts/common/elements_materials/material/materials.js b/kubejs/startup_scripts/common/elements_materials/material/materials.js index 13c02d6c4..2995fe429 100644 --- a/kubejs/startup_scripts/common/elements_materials/material/materials.js +++ b/kubejs/startup_scripts/common/elements_materials/material/materials.js @@ -328,6 +328,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => { matmod('iron', foil); matmod('wrought_iron', frame); matmod('red_alloy', spring); + matmod('netherite', no_decomp); // Blast Properties of periodic table metals const blast = global.blastProperty; @@ -344,6 +345,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => { // Fluid Pipes GTMaterials.NaquadahEnriched.setProperty(PropertyKey.FLUID_PIPE, new FluidPipeProperties(8000, 500, true, true, true, false)); + GTMaterials.Netherite.setComponents('4x netherite', '4x gold'); // Materials from elements const compIngot = (name, elements, color, icon, blasting, flags) => {