diff --git a/CHANGELOG.md b/CHANGELOG.md index e1d3c3a8a..51a5f0b91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added a sky stone block recipe to the rock breaker (#2159) @Pyritie - Improved the tag for cleanroom doors @Pyritie - The food oven and refrigerator now emit heat (for TFC ambiental) @Pyritie +- Dioxygen Difluoride is now cryogenic and acidic @Pyritie ### Bug fixes - Fixed TFC bug where paths and roads can collapse on themselves when creating a staircase shape. (#2144) @Redeix - Fixed the HV aqueous accumulator water recipe so the amount of water can actually fit in the HV machine @Pyritie diff --git a/config/moldraw.yaml b/config/moldraw.yaml index 85f917542..412541969 100644 --- a/config/moldraw.yaml +++ b/config/moldraw.yaml @@ -4,7 +4,7 @@ debugMode: false coloredAtoms: true -useMaterialColors: false +useMaterialColors: true onlyShowOnShift: true diff --git a/kubejs/startup_scripts/ae2/materials.js b/kubejs/startup_scripts/ae2/materials.js index 316f6fe33..d4ab8056d 100644 --- a/kubejs/startup_scripts/ae2/materials.js +++ b/kubejs/startup_scripts/ae2/materials.js @@ -11,7 +11,7 @@ const registerAE2Materials = (event) => { GTMaterialFlags.CRYSTALLIZABLE, GTMaterialFlags.DISABLE_DECOMPOSITION ) - .components('1x nether_quartz', '1x certus_quartz') + .components('1x unknown', '1x nether_quartz', '1x certus_quartz') .color(0x8f5ccb) .secondaryColor(0x252f5a) } \ No newline at end of file diff --git a/kubejs/startup_scripts/greate/materials.js b/kubejs/startup_scripts/greate/materials.js index f02a6127d..910e6125c 100644 --- a/kubejs/startup_scripts/greate/materials.js +++ b/kubejs/startup_scripts/greate/materials.js @@ -8,6 +8,7 @@ const registerGreateMaterialModification = (event) => { GTMaterials.get("rose_quartz").addFlags( GTMaterialFlags.GENERATE_LENS ); - - GTMaterials.get('andesite_alloy').setFormula("?", true) + + GTMaterials.get('andesite_alloy').setComponents([]) + GTMaterials.get('andesite_alloy').setFormula("?") } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 186d44764..9684071d5 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -422,10 +422,7 @@ const registerGTCEuMaterialModification = (event) => { rose_quartz.getProperty(PropertyKey.ORE).setOreByProducts(rose_quartz, GTMaterials.Redstone, rose_quartz); rose_quartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) - GTMaterials.get('tfg:kaolinite').setFormula("Al2Si2O5(OH)4", true) - GTMaterials.get('tfg:vitrified_pearl').setFormula("(Al2Si2O5(OH)4)(BeK4N5)", true) - GTMaterials.get('tfg:tmos').setFormula("Si(OCH3)4", true) - GTMaterials.get('tfg:fluix').setFormula("?(?SiO2)(SiO2)", true) - GTMaterials.CertusQuartz.setFormula("?SiO2", true) - GTMaterials.GraniteRed.setFormula("?", true) + GTMaterials.CertusQuartz.setComponents('1x unknown', '1x silicon', '2x oxygen') + GTMaterials.GraniteRed.setComponents([]) + GTMaterials.GraniteRed.setFormula("?") } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index bb08e9a95..f9d443a8e 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -3,6 +3,10 @@ const registerTFGMaterials = (event) => { + event.create('unknown') + .color('0xFFFFFF') + .formula('?') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('hardwood') .dust() @@ -155,6 +159,7 @@ const registerTFGMaterials = (event) => { .components('2x aluminium', '2x silicon', '9x oxygen', '4x hydrogen') .color(0xEEB9AD) .secondaryColor(0xF6A797) + .formula("Al2Si2O5(OH)4") event.create('tfg:vitrified_pearl') .dust() @@ -162,6 +167,7 @@ const registerTFGMaterials = (event) => { .components('2x aluminium', '2x silicon', '9x oxygen', '4x hydrogen', '1x ender_pearl') .color(0xFFFFFF) .secondaryColor(0x67FFE6) + .formula("(Al2Si2O5(OH)4)(BeK4N5)") //#region Solar Panel Chemicals @@ -182,7 +188,8 @@ const registerTFGMaterials = (event) => { event.create('tfg:solar_coolant_tier2') .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(73)) - .formula('(He³8O11H11)8(Ar)(?)') + .components('8x tfg:solar_coolant', '1x argon') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0xfeff5d) //#endregion @@ -253,7 +260,7 @@ const registerTFGMaterials = (event) => { event.create('tfg:dimethyl_carbonate') .liquid() .flags(GTMaterialFlags.DECOMPOSITION_BY_ELECTROLYZING) - .components('3x carbon','6x hydrogen', '3x oxygen') + .components('3x formaldehyde') // CH2O .color(0xFFFFF2) event.create('tfg:methyl_phenylcarbamate') .liquid() @@ -275,6 +282,7 @@ const registerTFGMaterials = (event) => { //#region aerogel event.create('tfg:tmos') .liquid() + .formula("Si(OCH3)4") .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0xC2C6CC) event.create('tfg:silica_gel') @@ -300,22 +308,26 @@ const registerTFGMaterials = (event) => { event.create('hot_chlorinated_brominated_brine') .liquid(320) .color(0xbf8d5a) - .formula('?Cl') + .components('1x unknown', '1x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('brominated_chlorine_vapor') .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(320)) .color(0xbf8d5a) - .formula('ClBr(H2O)') + .components('1x chlorine', '1x bromine', '1x water') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('acidic_bromine_solution') .liquid(new GTFluidBuilder().attribute(GTFluidAttributes.ACID)) .color(0xe7b989) - .formula('ClBr') + .components('1x chlorine', '1x bromine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('concentrated_bromine_solution') .liquid() .color(0x905d29) - .formula('Br2Cl') + .components('1x bromine', '1x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('debrominated_brine') .liquid() @@ -324,12 +336,14 @@ const registerTFGMaterials = (event) => { event.create('acidic_bromine_exhaust') .gas(new GTFluidBuilder().state(GTFluidState.GAS).attribute(GTFluidAttributes.ACID).temperature(293)) .color(0xec9c4a) - .formula('(H2O)3Cl') + .components('3x water', '1x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('hot_alkaline_debrominated_brine') .liquid() .color(0xcc6a06) - .formula('?2Cl') + .components('2x unknown', '1x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('hot_debrominated_brine') .liquid(320) @@ -338,7 +352,7 @@ const registerTFGMaterials = (event) => { event.create('hydrogen_iodide') .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(293)) .color(0x82a6ce) - .formula('HI') + .components('1x hydrogen', '1x iodine') //#endregion @@ -346,19 +360,15 @@ const registerTFGMaterials = (event) => { event.create('lightweight_ostrum_vapor') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(760)) - .formula('(?)') event.create('ostrum_vapor') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(815)) - .formula('(?)') event.create('dense_ostrum_vapor') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(930)) - .formula('(?)') event.create('residual_radioactive_concoction') .liquid(new GTFluidBuilder().customStill().temperature(450)) - .formula('(?)') //#endregion @@ -413,18 +423,22 @@ const registerTFGMaterials = (event) => { .components('2x sodium','1x tungsten', '4x oxygen') .color('0xdcf6f7') + event.create('tfg:tungstate') + .components('2x hydrogen', '12x tungsten', '42x oxygen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + event.create('tfg:ammonium_tungstate') .dust() .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES, GTMaterialFlags.DISABLE_DECOMPOSITION) .iconSet(GTMaterialIconSet.DULL) - .formula('(NH4)10(H2W12O42)') + .components('10x ammonia', '1x tfg:tungstate') .color('0xfafafa') event.create('tfg:apt') .gem() .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .iconSet(GTMaterialIconSet.FLINT) - .formula("(NH4)10(H2W12O42)(H2O)4") + .components('10x ammonia', '1x tfg:tungstate', '4x water') .color('0xaabdf0') event.create('tfg:tungsten_oxide') diff --git a/kubejs/startup_scripts/tfg/materials.nuclear.js b/kubejs/startup_scripts/tfg/materials.nuclear.js index 6b10776bc..cb92092db 100644 --- a/kubejs/startup_scripts/tfg/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/materials.nuclear.js @@ -26,55 +26,49 @@ const registerTFGNuclearMaterials = (event) => { event.create('dense_steam') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) .components('2x hydrogen', '1x oxygen') - .flags( - GTMaterialFlags.DISABLE_DECOMPOSITION) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('radioactive_steam') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) - .components('2x hydrogen', '1x oxygen') - .formula('H2O(?)') + .components('1x water', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('radioactive_waste') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) - .formula("(?)") + .components('1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('irradiated_steam') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(4250)) - .formula("(?)") + .components('1x water', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('tfg:heavy_water') .liquid(new GTFluidBuilder().temperature(236)) .components('2x deuterium', '1x oxygen') - .iconSet(GTMaterialIconSet.FINE) .color(0xB5B9FF) .secondaryColor(0x81FFF9) event.create('tfg:semiheavy_water') .liquid(new GTFluidBuilder().temperature(213)) .components('1x deuterium', '1x hydrogen', '1x oxygen') - .iconSet(GTMaterialIconSet.FINE) .color(0xb5ffff) .secondaryColor(0x81FFF9) event.create('uranium_waste') .liquid(new GTFluidBuilder().customStill().temperature(3850)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .iconSet(GTMaterialIconSet.FINE) .color(0xB5B9FF) .secondaryColor(0x81FFF9) event.create('nuclear_waste') .liquid(new GTFluidBuilder().customStill().temperature(3850)) + .components('1x thorium', '1x uranium', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .formula('ThU(?)') event.create('dirty_hexafluorosilicic_acid') .liquid(new GTFluidBuilder().attribute(GTFluidAttributes.ACID)) - //.liquid(320) - .formula('H2SiF6(?)') + .components('2x hydrogen', '1x silicon', '6x fluorine', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0xe6fafb) .secondaryColor(0xb5fdff) @@ -82,23 +76,21 @@ const registerTFGNuclearMaterials = (event) => { event.create('martian_sludge') .liquid(new GTFluidBuilder().temperature(4239)) - .formula('(?)') + .components('1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0xd86f27) .secondaryColor(0xecd7c9) .iconSet(GTMaterialIconSet.getByName('bullshit')) event.create('dioxygen_difluoride') - .fluid() + .liquid(new GTFluidBuilder().temperature(110).attribute(GTFluidAttributes.ACID)) .components('2x oxygen', '2x fluorine') - .iconSet(GTMaterialIconSet.FINE) .color(0xfcb603) .secondaryColor(0xfc5e03) event.create('tritiated_water') .fluid() .components('2x tritium', '1x oxygen') - .iconSet(GTMaterialIconSet.FINE) .color(0xb2c3e7) // FLiBe Line @@ -108,26 +100,33 @@ const registerTFGNuclearMaterials = (event) => { event.create('hot_iodine_brine') .liquid(new GTFluidBuilder().customStill().temperature(293)) - .formula('HIMgCl(?)') + .components('1x hydrogen', '1x iodine', '1x magnesium', '1x chlorine', '1x unknown') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('brominated_iodine_vapor') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(412)) - .formula('HI(?)') + .components('1x hydrogen', '1x iodine', '1x unknown') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('basic_bromine_exhaust') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(406)) - - event.create('dirty_flibe') - .liquid(new GTFluidBuilder().customStill().temperature(293)) - .formula('FLiBe(?)') + .components('1x bromine', '1x unknown') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) event.create('flibe') .liquid(new GTFluidBuilder().customStill().temperature(293)) - .formula('FLiBe') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x fluorine', '1x lithium', '1x beryllium') + + event.create('dirty_flibe') + .liquid(new GTFluidBuilder().customStill().temperature(293)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x flibe', '1x unknown') event.create('hot_flibe') .liquid(new GTFluidBuilder().customStill().temperature(3293)) - .formula('FLiBe') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x flibe') //#endregion @@ -135,7 +134,7 @@ const registerTFGNuclearMaterials = (event) => { event.create('tfg:nuclear_residue') .dust() - .formula('(?)') + .components('1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .iconSet(GTMaterialIconSet.SHINY) .color(0x332816) @@ -144,7 +143,7 @@ const registerTFGNuclearMaterials = (event) => { event.create('tfg:oxidized_nuclear_residue') .dust() - .formula('U?O?(?)') + .components('1x uranium', '1x oxygen', '2x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .iconSet(GTMaterialIconSet.SHINY) .color(0x286529) @@ -153,7 +152,7 @@ const registerTFGNuclearMaterials = (event) => { event.create('tfg:refined_nuclear_residue') .dust() - .formula('U?(?)') + .components('1x uranium', '2x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0x82c383) .secondaryColor('0xffffff') @@ -164,7 +163,6 @@ const registerTFGNuclearMaterials = (event) => { event.create('lithium_carbonate') .dust() .components('2x lithium', '1x carbon', '3x oxygen') - .formula('Li2CO3') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0xffffff) .secondaryColor(0xb7b9bd) @@ -173,7 +171,6 @@ const registerTFGNuclearMaterials = (event) => { event.create('lithium_fluoride') .gem() .components('1x lithium', '1x fluorine') - .formula('LiF') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.DISABLE_MATERIAL_RECIPES) .color(0xffffff) .secondaryColor(0xb7b9bd) @@ -182,7 +179,6 @@ const registerTFGNuclearMaterials = (event) => { event.create('tetrafluoroberyllate') .gem() .components('1x beryllium', '4x fluorine') - .formula('BeF4') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.DISABLE_MATERIAL_RECIPES) .color(0xdcdee1) .secondaryColor(0xb7b9bd) diff --git a/pakku-lock.json b/pakku-lock.json index 0b74ff332..a79c6a460 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -7121,7 +7121,7 @@ ] }, { - "pakku_id": "WTbDrl3JrTmqPQaW", + "pakku_id": "QHcH7jVuZ4XwJ61j", "pakku_links": [ "WN9DdLqsRKVeZIc9" ], @@ -7138,7 +7138,7 @@ "files": [ { "type": "curseforge", - "file_name": "gtmoldraw-2.0.0.jar", + "file_name": "gtmoldraw-2.0.1.jar", "mc_versions": [ "1.20.1" ], @@ -7146,18 +7146,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7197/3/gtmoldraw-2.0.0.jar", - "id": "7197003", + "url": "https://edge.forgecdn.net/files/7197/329/gtmoldraw-2.0.1.jar", + "id": "7197329", "parent_id": "1348330", "hashes": { - "sha1": "cd8c19e95f5ad36a5a439ef9a917c3e362ba5aac", - "md5": "ac3a8b5b9e4926cbca43f8000cfe2312" + "sha1": "701eb021adae14b1d1df909fa6fc8974aa01c8d6", + "md5": "9236597f2d9001eb79ad0f5af589a2f9" }, "required_dependencies": [ "890405" ], - "size": 826370, - "date_published": "2025-11-07T23:18:11.033Z" + "size": 826741, + "date_published": "2025-11-08T02:02:14.183Z" } ] },