diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 9800c0024..bfd0c0cfa 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -70,8 +70,7 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:ostrum_linear_accelerator'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_1')); text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_2')); - text.add(3, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_3')); - text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); + text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['gtceu:heat_exchanger'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.heat_exchanger_1')); diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js index aacbef8fd..36090a32f 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js @@ -30,7 +30,7 @@ const registerTFGBlockTagsNuclear = (event) => { event.add(COMPONENTS_FR, 'tfg:impure_moderate_core_frame'); // Max Heat 5 //event.add(COMPONENTS, 'minecraft:blue_ice'); // Max Heat 0.5 - event.add(COMPONENTS_FR, 'minecraft:bedrock'); // Max Heat 10000 CREATIVE BLOCK + //event.add(COMPONENTS_FR, 'minecraft:bedrock'); // Max Heat 10000 CREATIVE BLOCK // Increase Throttle //event.add(COMPONENTS_FR, 'minecraft:iron_block'); @@ -47,7 +47,7 @@ const registerTFGBlockTagsNuclear = (event) => { event.add(COMPONENTS_HB, 'minecraft:sand'); event.add(COMPONENTS_HB, 'tfg:impure_moderate_core_frame'); event.add(COMPONENTS_HB, 'tfg:moderate_core_frame'); - event.add(COMPONENTS_HB, 'minecraft:bedrock'); // For Creative usage only + //event.add(COMPONENTS_HB, 'minecraft:bedrock'); // For Creative usage only //#endregion diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index 025b563f5..c371989c7 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -460,6 +460,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Rhenium.setMaterialSecondaryARGB(0x9ccbd6) GTMaterials.Diamond.setMaterialARGB(0x4AEDD9) GTMaterials.Diamond.setMaterialSecondaryARGB(0x1AAAA7) + GTMaterials.Boron.setMaterialARGB(0x75BD8D) + GTMaterials.Boron.setMaterialSecondaryARGB(0x013A15) + GTMaterials.Americium.setMaterialARGB(0x284D7B) // Fluids global.MINECRAFT_DYE_NAMES.forEach(colorName => { @@ -477,4 +480,6 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Glowstone.setComponents('1x gold', '1x redstone') GTMaterials.Thorium.setFormula('ThO2') GTMaterials.Americium.setFormula('Am²⁴³') + GTMaterials.Boron.setFormula('B¹¹') + GTMaterials.Caesium.setFormula('Cs¹³³') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js index 04a1dd43c..0d06ea808 100644 --- a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js @@ -200,16 +200,16 @@ const registerTFGNuclearMaterials = (event) => { .element(GTElements.get("boron_10")) .iconSet(GTMaterialIconSet.DULL) .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES) - .color(0xf8a8c0) - .secondaryColor(0xcd8dbc) + .color(0xbffdbf) + .secondaryColor(0x6d7058) event.create('caesium_137') .dust() .element(GTElements.get("caesium_137")) - .iconSet(GTMaterialIconSet.METALLIC) + .iconSet(GTMaterialIconSet.SHINY) .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES) - .color(0xB6FF00) - .secondaryColor(0x9FAFB2) + .color(0xFCB65C) + .secondaryColor(0x55461B) event.create('tfg:boron_thrichloride') .gas(new GTFluidBuilder().state(GTFluidState.GAS).attribute(GTFluidAttributes.ACID).temperature(380)) @@ -324,8 +324,8 @@ const registerTFGNuclearMaterials = (event) => { .element(GTElements.get("americium_241")) .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) - .color(0x10B193) - .secondaryColor(0x66ff00) + .color(0x648ABA) + .secondaryColor(0x999900) .radioactiveHazard(1000000) event.create('neptunium_237') @@ -343,7 +343,7 @@ const registerTFGNuclearMaterials = (event) => { .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) .color(0xffba00) - .secondaryColor(0x66ff00) + .secondaryColor(0xA85A12) .radioactiveHazard(10000000) //#endregion