diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 841643fe2..86c2e27f6 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -857,6 +857,8 @@ "item.tfg.twigs.strophar": "Strophar Twig", "item.tfg.twigs.glacian": "Glacian Twig", "item.tfg.twigs.alphacene": "Alphacene Twig", + "item.tfg.crimsene_gem": "Crimsene Rosin", + "item.tfg.warpane_gem": "Warpane Rosin", "item.tfg.glacian_wool": "Glacian Ram Wool", "item.tfg.sniffer_wool": "Mineral Rich Tufts", "item.tfg.sniffer_egg": "Sniffer Egg", @@ -1007,6 +1009,12 @@ "material.tfg.tungsten-bismuth_oxide_composite": "Bismuth Oxide Composite", "material.tfg.tungsten_oxide": "Tungsten Oxide", "material.tfg.sodium_tungstate": "Sodium Tungstate", + "material.tfg.crimsene": "Crimsene", + "material.tfg.warpane": "Warpane", + "material.tfg.mycelienzene": "Mycelienzene", + "material.tfg.cooked_mycelienzane": "1,3-Mycelienzane", + "material.tfg.iodomethane": "Iodomethane", + "material.tfg.trideuteroiodomethane": "Trideuteroiodomethane", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json index db306261e..17ddda756 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json @@ -14,7 +14,8 @@ "stem_state": { "Name": "beneath:wood/log/crimson", "Properties": { - "axis": "y" + "axis": "y", + "branch_direction": "down" } }, "valid_base_block": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json index 6ae00d9e9..c4ddd4aea 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json @@ -14,7 +14,8 @@ "stem_state": { "Name": "beneath:wood/log/crimson", "Properties": { - "axis": "y" + "axis": "y", + "branch_direction": "down" } }, "valid_base_block": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json index 3556eb889..a0e370030 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json @@ -14,7 +14,8 @@ "stem_state": { "Name": "beneath:wood/log/crimson", "Properties": { - "axis": "y" + "axis": "y", + "branch_direction": "down" } }, "valid_base_block": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json index 4e373bad3..6016e4a85 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json @@ -14,7 +14,8 @@ "stem_state": { "Name": "beneath:wood/log/warped", "Properties": { - "axis": "y" + "axis": "y", + "branch_direction": "down" } }, "valid_base_block": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json index 5d8dae140..69cbc3e67 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json @@ -14,7 +14,8 @@ "stem_state": { "Name": "beneath:wood/log/warped", "Properties": { - "axis": "y" + "axis": "y", + "branch_direction": "down" } }, "valid_base_block": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json index d06c69b7e..78f0aed59 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json @@ -14,7 +14,8 @@ "stem_state": { "Name": "beneath:wood/log/warped", "Properties": { - "axis": "y" + "axis": "y", + "branch_direction": "down" } }, "valid_base_block": { diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 5cf435746..7562e7d8e 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -182,6 +182,36 @@ const registerAFCRecipes = (event) => { .requiresNaturalLog(true) .id("tfg:tree_tapping/ancient_douglas_fir_resin") + // Mars stuff + + event.recipes.afc.tree_tapping(TFC.blockIngredient('beneath:wood/log/crimson')) + .resultFluid(Fluid.of('tfg:crimsene', 1)) + .minTemp(-110) + .maxTemp(-15) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/crimson_log") + + event.recipes.afc.tree_tapping(TFC.blockIngredient('beneath:wood/wood/crimson')) + .resultFluid(Fluid.of('tfg:crimsene', 1)) + .minTemp(-110) + .maxTemp(-15) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/crimson_wood") + + event.recipes.afc.tree_tapping(TFC.blockIngredient('beneath:wood/log/warped')) + .resultFluid(Fluid.of('tfg:warpane', 1)) + .minTemp(-110) + .maxTemp(-15) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/warped_log") + + event.recipes.afc.tree_tapping(TFC.blockIngredient('beneath:wood/wood/warped')) + .resultFluid(Fluid.of('tfg:warpane', 1)) + .minTemp(-110) + .maxTemp(-15) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/warped_wood") + //#region Extractor Recipe // Latex diff --git a/kubejs/server_scripts/afc/tags.js b/kubejs/server_scripts/afc/tags.js index 33d35c550..f56819634 100644 --- a/kubejs/server_scripts/afc/tags.js +++ b/kubejs/server_scripts/afc/tags.js @@ -121,6 +121,11 @@ const registerAFCBlockTags = (event) => { event.add("afc:tappable_logs", "tfc:wood/log/ancient_spruce") event.add("afc:tappable_logs", "tfc:wood/log/spruce") + event.add("afc:tappable_logs", "beneath:wood/log/crimson") + event.add("afc:tappable_logs", "beneath:wood/wood/crimson") + event.add("afc:tappable_logs", "beneath:wood/log/warped") + event.add("afc:tappable_logs", "beneath:wood/wood/warped") + event.add("tfg:latex_logs", "#tfc:kapok_logs") event.add("tfg:latex_logs", "#afc:hevea_logs") event.add("tfg:latex_logs", "#afc:rubber_fig_logs") diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index aedd83b2c..b17863e12 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -417,6 +417,10 @@ function removeGTCEURecipes(event) { //#region Выход: Пыль незерака + event.remove({ id: 'gtceu:shaped/nether_bricks_hammer' }) + event.remove({ id: 'gtceu:shaped/nether_bricks_stair_saw' }) + event.remove({ id: 'gtceu:shaped/nether_bricks_slab_saw' }) + event.remove({ id: 'gtceu:shaped/nether_bricks_wall_saw' }) removeMaceratorRecipe(event, 'macerate_nether_brick_stairs') removeMaceratorRecipe(event, 'macerate_nether_brick_slab') @@ -653,6 +657,11 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:gas_collector/nether_air' }) event.remove({ id: 'gtceu:gas_collector/ender_air' }) + // TODO: uncomment with venus update + //event.remove({ id: 'gtceu:vacuum_freezer/liquid_ender_air' }) + //event.remove({ id: 'gtceu:vacuum_freezer/liquid_nether_air' }) + //event.remove({ id: 'gtceu:distillation_tower/distill_liquid_ender_air' }) + //event.remove({ id: 'gtceu:distillation_tower/distill_liquid_nether_air' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__ender_eye' }) diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 400d6b3ef..0460e31e1 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -271,6 +271,7 @@ function registerTFGSpaceRecipes(event) { .cleanroom(CleanroomType.CLEANROOM) // Railgun stuff + // (the railgun inputs and outputs are in tfg-core) event.recipes.gtceu.assembler('tfg:railgun_ammo_basic') .itemInputs('#forge:double_plates/steel', '2x #forge:rods/magnetic_iron', '2x #forge:fine_wires/annealed_copper') @@ -356,5 +357,73 @@ function registerTFGSpaceRecipes(event) { H: 'gtceu:mv_machine_hull' }).id('tfg:shaped/interplanetary_item_receiver') - // the railgun inputs and outputs are in tfg-core + // Mars tree tapping + + event.recipes.gtceu.autoclave('tfg:crimsene') + .inputFluids(Fluid.of('tfg:crimsene', 144), Fluid.of('gtceu:liquid_carbon_dioxide', 1000)) + .outputFluids(Fluid.of('gtceu:carbon_monoxide', 1000)) + .itemOutputs('#forge:gems/crimsene') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.autoclave('tfg:warpane') + .inputFluids(Fluid.of('tfg:warpane', 144), Fluid.of('gtceu:liquid_carbon_dioxide', 1000)) + .outputFluids(Fluid.of('gtceu:hydrogen', 1000)) + .itemOutputs('#forge:gems/warpane') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.macerator('tfg:crimsene') + .itemInputs('#forge:gems/crimsene') + .itemOutputs('#forge:dusts/crimsene') + .duration(20 * 5) + .EUt(2) + + event.recipes.gtceu.macerator('tfg:warpane') + .itemInputs('#forge:gems/warpane') + .itemOutputs('#forge:dusts/warpane') + .duration(20 * 5) + .EUt(2) + + event.recipes.gtceu.mixer('tfg:mars_sap') + .itemInputs('#forge:dusts/warpane', '#forge:dusts/crimsene') + .inputFluids(Fluid.of('gtceu:hydrochloric_acid', 1000), Fluid.of('gtceu:krypton', 1000)) + .itemOutputs('#forge:dusts/mycelienzene') + .duration(30 * 20) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.deafission.fission_reactor_processing('tfg:mars_sap') + .itemInputs('#forge:dusts/mycelienzene') + .outputFluids(Fluid.of('tfg:cooked_mycelienzane', 1000)) + // TODO: change these to something appropriate + .blastFurnaceTemp(100) + .duration(30 * 10) + + event.recipes.gtceu.centrifuge('mars_sap_separation') + .inputFluids(Fluid.of('tfg:cooked_mycelienzane', 2000)) + .outputFluids( + Fluid.of('tfg:iodomethane', 1000), + Fluid.of('tfg:trideuteroiodomethane', 1000), + Fluid.of('gtceu:krypton', 1000), + Fluid.of('gtceu:diluted_hydrochloric_acid', 4000)) + .duration(20 * 20) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_reactor('tfg:iodomethane_separation') + .inputFluids( + Fluid.of('tfg:iodomethane', 1000), + Fluid.of('gtceu:hydrogen', 1000)) + .itemOutputs('#forge:dusts/iodine') + .outputFluids(Fluid.of('gtceu:methane', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.chemical_reactor('tfg:trideuteroiodomethane_separation') + .inputFluids( + Fluid.of('tfg:trideuteroiodomethane', 1000), + Fluid.of('gtceu:oxygen', 1500)) + .itemOutputs('#forge:dusts/iodine', '#forge:dusts/carbon') + .outputFluids(Fluid.of('tfg:heavy_water', 1500)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.MV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 30af3b056..568bd31cc 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -107,6 +107,8 @@ const registerTFGItemTags = (event) => { event.add('forge:wax', 'tfg:paraffin_wax') event.add('forge:wax', 'firmalife:beeswax') event.add('forge:wax', 'tfg:conifer_rosin') + event.add('forge:wax', 'tfg:crimsene_gem') + event.add('forge:wax', 'tfg:warpane_gem') event.add('tfc:fluxstone', 'tfg:loose/dripstone') // #endregion @@ -1016,9 +1018,18 @@ const registerTFGBlockTags = (event) => { event.add('tfc:grass', 'tfg:grass/amber_kaolin_mycelium') event.add('tfc:grass', 'tfg:grass/rusticus_kaolin_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_kaolin_mycelium') + event.add('tfc:kaolin_clay', 'tfg:grass/amber_kaolin_mycelium') + event.add('tfc:kaolin_clay', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('tfc:kaolin_clay', 'tfg:grass/sangnum_kaolin_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/amber_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/rusticus_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/sangnum_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/amber_clay_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/rusticus_clay_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/sangnum_clay_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/amber_kaolin_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/sangnum_kaolin_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/mars_farmland') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/mars_path') event.add('tfc:can_landslide', 'tfg:grass/mars_dirt') diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 20db7e48c..998de5811 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -332,6 +332,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false)); GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false)); GTMaterials.Thorium.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.ANY, GTMedicalConditions.CARCINOGEN, 1, true)); + + // This contains hazardous elements so GT tags it as hazardous automatically + TFGHelpers.getMaterial('ostrum').getProperties().removeProperty(PropertyKey.HAZARD); // Make these the lowest tier of EBF instead GTMaterials.BlackSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000) diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index e152bb696..3c90aa21a 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -45,8 +45,9 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { GTCEuStartupEvents.registry('gtceu:tag_prefix', event => { registerAE2TagPrefixes(event) - registerTFCTagPrefixes(event) registerGTCEuTagPrefixes(event) + registerTFCTagPrefixes(event) + registerTFGTagPrefixes(event) }) GTCEuStartupEvents.registry('gtceu:material', event => { diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 8f76bd102..bbc2c6aff 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -361,16 +361,4 @@ const registerTFGBlocks = (event) => { }) // #endregion Reconstituted Stone - - // #region Deprecated - - event.create('treetap:tap') - .requiresTool(false) - .textureAll('tfg:item/deprecated') - - event.create('tfcea:refrigerator') - .requiresTool(false) - .textureAll('tfg:item/deprecated') - - // #endregion } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index b7693d832..0cb885c75 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -411,13 +411,14 @@ const registerTFGMaterials = (event) => { event.create('tfg:apt') .gem() - .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .iconSet(GTMaterialIconSet.FLINT) + .setFormula("(NH4)10(H2W12O42)(H2O)4") .color('0xaabdf0') event.create('tfg:tungsten_oxide') .dust() - .flags(GTMaterialFlags.NO_UNIFICATION, GTMaterialFlags.DISABLE_DECOMPOSITION) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .iconSet(GTMaterialIconSet.FLINT) .components('1x tungsten', '3x oxygen') .color('0xf0c851') @@ -456,7 +457,48 @@ const registerTFGMaterials = (event) => { GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_BOLT_SCREW, - GTMaterialFlags.EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, - + GTMaterialFlags.EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES ) + + // #endregion + + // #region Mars sap + + event.create('tfg:crimsene') + .liquid(new GTFluidBuilder().state(GTFluidState.LIQUID).temperature(220)) + .gem() + .iconSet('lapis') + .flags(GTMaterialFlags.NO_UNIFICATION) + .color(0xB12727) + .secondaryColor(0x562C3E) + + event.create('tfg:warpane') + .liquid(new GTFluidBuilder().state(GTFluidState.LIQUID).temperature(220)) + .gem() + .iconSet('quartz') + .flags(GTMaterialFlags.NO_UNIFICATION) + .color(0x45ABA9) + .secondaryColor(0x562C3E) + + event.create('tfg:mycelienzene') + .dust() + .color(0x9E7385) + + event.create('tfg:cooked_mycelienzane') + .liquid(new GTFluidBuilder().state(GTFluidState.LIQUID).temperature(1830)) + .color(0x9E7385) + + event.create('tfg:iodomethane') + .liquid() + .components('1x carbon', '3x hydrogen', '1x iodine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xAC45C6) + + event.create('tfg:trideuteroiodomethane') + .liquid() + .components('1x carbon', '3x deuterium', '1x iodine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xDD9DED) + + // #endregion } diff --git a/kubejs/startup_scripts/tfg/materials.nuclear.js b/kubejs/startup_scripts/tfg/materials.nuclear.js index 21b0ea970..136d3c3b8 100644 --- a/kubejs/startup_scripts/tfg/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/materials.nuclear.js @@ -3,257 +3,257 @@ const registerTFGNuclearMaterials = (event) => { -/* event.create('mysterious_ooze') - .fluid() - .color(0x500bbf) - .fluidTemp(69420) + /* event.create('mysterious_ooze') + .fluid() + .color(0x500bbf) + .fluidTemp(69420) + .dust() + .cableProperties(GTValues.V[GTValues.LV], 69, 0, true) // Voltage, Amperage, EU loss, Is Superconductor. + .gem(2, 4000) + .element(GTElements.C) + .ore(2, 3) + .color(0x7D2DDB) + .iconSet(GTMaterialIconSet.LIGNITE) + .ingot() + .components('1x andesite', '1x iron') + .color(0x839689) + .iconSet(GTMaterialIconSet.DULL) + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_SMALL_GEAR) + */ + + //#region Fluid + + event.create('dense_steam') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) + .components('2x hydrogen', '1x oxygen') + .flags( + GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('radioactive_steam') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) + .components('2x hydrogen', '1x oxygen') + .formula('H2O(?)') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('radioactive_waste') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) + .formula("(?)") + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('irradiated_steam') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(4250)) + .formula("(?)") + .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)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .formula('ThU(?)') + + event.create('dirty_hexafluorosilicic_acid') + .liquid(new GTFluidBuilder().attribute(GTFluidAttributes.ACID)) + //.liquid(320) + .formula('H2SiF6(?)') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xe6fafb) + .secondaryColor(0xb5fdff) + .iconSet(GTMaterialIconSet.getByName('thick_fluid')) + + event.create('martian_sludge') + .liquid(new GTFluidBuilder().temperature(4239)) + .formula('(?)') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xd86f27) + .secondaryColor(0xecd7c9) + .iconSet(GTMaterialIconSet.getByName('bullshit')) + + event.create('dioxygen_difluoride') + .fluid() + .components('2x oxygen', '2x fluorine') + .iconSet(GTMaterialIconSet.FINE) + .color(0xffa500) + .secondaryColor(0xffffff) + + event.create('tritiated_water') + .fluid() + .components('2x tritium', '1x oxygen') + .iconSet(GTMaterialIconSet.FINE) + .color(0xb2c3e7) + + // FLiBe Line + + event.create('raw_rich_brine') + .liquid(new GTFluidBuilder().customStill().temperature(293)) + + event.create('hot_iodine_brine') + .liquid(new GTFluidBuilder().customStill().temperature(293)) + .formula('HIMgCl(?)') + + event.create('brominated_iodine_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(412)) + .formula('HI(?)') + + 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(?)') + + event.create('flibe') + .liquid(new GTFluidBuilder().customStill().temperature(293)) + .formula('FLiBe') + + event.create('hot_flibe') + .liquid(new GTFluidBuilder().customStill().temperature(3293)) + .formula('FLiBe') + + //#endregion + + //#region Dust + + event.create('tfg:nuclear_residue') .dust() - .cableProperties(GTValues.V[GTValues.LV], 69, 0, true) // Voltage, Amperage, EU loss, Is Superconductor. - .gem(2, 4000) - .element(GTElements.C) - .ore(2, 3) - .color(0x7D2DDB) - .iconSet(GTMaterialIconSet.LIGNITE) + .formula('(?)') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x332816) + .secondaryColor(0x674c24) + .iconSet(GTMaterialIconSet.RADIOACTIVE) + + event.create('tfg:oxidized_nuclear_residue') + .dust() + .formula('U?O?(?)') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x286529) + .secondaryColor(0x012702) + .iconSet(GTMaterialIconSet.RADIOACTIVE) + + event.create('tfg:refined_nuclear_residue') + .dust() + .formula('U?(?)') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x82c383) + .secondaryColor('0xffffff') + .iconSet(GTMaterialIconSet.RADIOACTIVE) + + // FLiBe Dusts + + event.create('lithium_carbonate') + .dust() + .components('2x lithium', '1x carbon', '3x oxygen') + .formula('Li2CO3') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xffffff) + .secondaryColor(0xb7b9bd) + .iconSet(GTMaterialIconSet.GLASS) + + event.create('lithium_fluoride') + .gem() + .components('1x lithium', '1x fluorine') + .formula('LiF') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_UNIFICATION) + .color(0xffffff) + .secondaryColor(0xb7b9bd) + .iconSet(GTMaterialIconSet.FLINT) + + event.create('tetrafluoroberyllate') + .gem() + .components('1x beryllium', '4x fluorine') + .formula('BeF4') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_UNIFICATION) + .color(0xdcdee1) + .secondaryColor(0xb7b9bd) + .iconSet(GTMaterialIconSet.OPAL) + + //#endregion + + //#region Ingots + + event.create('thorium_230') .ingot() - .components('1x andesite', '1x iron') - .color(0x839689) - .iconSet(GTMaterialIconSet.DULL) - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_SMALL_GEAR) -*/ - - //#region Fluid - - event.create('dense_steam') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) - .components('2x hydrogen', '1x oxygen') - .flags( - GTMaterialFlags.DISABLE_DECOMPOSITION) - - event.create('radioactive_steam') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) - .components('2x hydrogen', '1x oxygen') - .formula('H2O(?)') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - - event.create('radioactive_waste') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) - .formula("(?)") - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - - event.create('irradiated_steam') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(4250)) - .formula("(?)") - .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)) - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .formula('ThU(?)') - - event.create('dirty_hexafluorosilicic_acid') - .liquid(new GTFluidBuilder().attribute(GTFluidAttributes.ACID)) - //.liquid(320) - .formula('H2SiF6(?)') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xe6fafb) - .secondaryColor(0xb5fdff) - .iconSet(GTMaterialIconSet.getByName('thick_fluid')) - - event.create('martian_sludge') - .liquid(new GTFluidBuilder().temperature(4239)) - .formula('(?)') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xd86f27) - .secondaryColor(0xecd7c9) - .iconSet(GTMaterialIconSet.getByName('bullshit')) - - event.create('dioxygen_difluoride') - .fluid() - .components('2x oxygen', '2x fluorine') - .iconSet(GTMaterialIconSet.FINE) - .color(0xffa500) - .secondaryColor(0xffffff) - - event.create('tritiated_water') - .fluid() - .components('2x tritium', '1x oxygen') - .iconSet(GTMaterialIconSet.FINE) - .color(0xb2c3e7) - - // FLiBe Line - - event.create('raw_rich_brine') - .liquid(new GTFluidBuilder().customStill().temperature(293)) - - event.create('hot_iodine_brine') - .liquid(new GTFluidBuilder().customStill().temperature(293)) - .formula('HIMgCl(?)') - - event.create('brominated_iodine_vapor') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(412)) - .formula('HI(?)') - - 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(?)') - - event.create('flibe') - .liquid(new GTFluidBuilder().customStill().temperature(293)) - .formula('FLiBe') - - event.create('hot_flibe') - .liquid(new GTFluidBuilder().customStill().temperature(3293)) - .formula('FLiBe') - - //#endregion - - //#region Dust - - event.create('tfg:nuclear_residue') - .dust() - .formula('(?)') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0x332816) - .secondaryColor(0x674c24) - .iconSet(GTMaterialIconSet.RADIOACTIVE) - - event.create('tfg:oxidized_nuclear_residue') - .dust() - .formula('U?O?(?)') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0x286529) - .secondaryColor(0x012702) - .iconSet(GTMaterialIconSet.RADIOACTIVE) - - event.create('tfg:refined_nuclear_residue') - .dust() - .formula('U?(?)') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0x82c383) - .secondaryColor('0xffffff') - .iconSet(GTMaterialIconSet.RADIOACTIVE) - - // FLiBe Dusts - - event.create('lithium_carbonate') - .dust() - .components('2x lithium', '1x carbon', '3x oxygen') - .formula('Li2CO3') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xffffff) - .secondaryColor(0xb7b9bd) - .iconSet(GTMaterialIconSet.GLASS) - - event.create('lithium_fluoride') - .gem() - .components('1x lithium', '1x fluorine') - .formula('LiF') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_UNIFICATION) - .color(0xffffff) - .secondaryColor(0xb7b9bd) - .iconSet(GTMaterialIconSet.FLINT) - - event.create('tetrafluoroberyllate') - .gem() - .components('1x beryllium', '4x fluorine') - .formula('BeF4') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_UNIFICATION) - .color(0xdcdee1) - .secondaryColor(0xb7b9bd) - .iconSet(GTMaterialIconSet.OPAL) - - //#endregion - - //#region Ingots - - event.create('thorium_230') - .ingot() - .element(GTElements.get("thorium_230")) - .iconSet(GTMaterialIconSet.RADIOACTIVE) + .element(GTElements.get("thorium_230")) + .iconSet(GTMaterialIconSet.RADIOACTIVE) .color(0x3b2f37) .secondaryColor(0xECECEC) - .radioactiveHazard(1000000) + .radioactiveHazard(1000000) - event.create("thorium_232") - .ingot() - .element(GTElements.get("thorium_232")) - .iconSet(GTMaterialIconSet.METALLIC) - .color(0x694c66) - .secondaryColor('0xFFFFFF') - .radioactiveHazard(1000) + event.create("thorium_232") + .ingot() + .element(GTElements.get("thorium_232")) + .iconSet(GTMaterialIconSet.METALLIC) + .color(0x694c66) + .secondaryColor('0xFFFFFF') + .radioactiveHazard(1000) - //#endregion + //#endregion - //#region Fuel Pellet + //#region Fuel Pellet - /* - Adding the Fuel Rod, the textures are applied through a model.json - Durability - Number of rod unused for now - %Heat - In ReactorCurve getHeating returns fuelHeat * 200.0d * throttle and getCooling returns _state.Heat() * (coolantConversion + 0.01). - Where coolantConversion is 1.00 if enough coolant is present. Solving that equation for a steady-state: heating + cooling = 0. - When throttle=coolantConversion=1:heat = fuelHeat * 200.0d / 1.01 - So one 100% cell is 198.0198 heat it should reach. Simulation accuracy might of course throw that off by a small margin. - So purely passively it reaches 20000.0 heat. - */ + /* + Adding the Fuel Rod, the textures are applied through a model.json + Durability + Number of rod unused for now + %Heat + In ReactorCurve getHeating returns fuelHeat * 200.0d * throttle and getCooling returns _state.Heat() * (coolantConversion + 0.01). + Where coolantConversion is 1.00 if enough coolant is present. Solving that equation for a steady-state: heating + cooling = 0. + When throttle=coolantConversion=1:heat = fuelHeat * 200.0d / 1.01 + So one 100% cell is 198.0198 heat it should reach. Simulation accuracy might of course throw that off by a small margin. + So purely passively it reaches 20000.0 heat. + */ - } +} - const $FuelCellItem = Java.loadClass("fi.dea.mc.deafission.common.data.items.FuelCellItem"); +const $FuelCellItem = Java.loadClass("fi.dea.mc.deafission.common.data.items.FuelCellItem"); StartupEvents.registry("item", (event) => { - event.createCustom("tfg:thorium_rod", () => { - return new $FuelCellItem( - 5000, - 1, - 0.7 // Max Heat 139 - 1 Fuel - ); - }) - event.createCustom("tfg:uranium_rod", () => { - return new $FuelCellItem( - 20000, - 1, - 2.2 // Max Heat 435 - 1 Fuel - ); - }) - event.createCustom("tfg:plutonium_rod", () => { - return new $FuelCellItem( - 30000, - 1, - 3.0 // Max Heat 595 - 1 Fuel - ); - }) + event.createCustom("tfg:thorium_rod", () => { + return new $FuelCellItem( + 5000, + 1, + 0.7 // Max Heat 139 - 1 Fuel + ); + }) + event.createCustom("tfg:uranium_rod", () => { + return new $FuelCellItem( + 20000, + 1, + 2.2 // Max Heat 435 - 1 Fuel + ); + }) + event.createCustom("tfg:plutonium_rod", () => { + return new $FuelCellItem( + 30000, + 1, + 3.0 // Max Heat 595 - 1 Fuel + ); + }) - event.createCustom("tfg:tbu_232_rod", () => { - return new $FuelCellItem( - 20000, - 1, - 2.0 - ); - }) - }); + event.createCustom("tfg:tbu_232_rod", () => { + return new $FuelCellItem( + 20000, + 1, + 2.0 + ); + }) +}); diff --git a/kubejs/startup_scripts/tfg/tag_prefixes.js b/kubejs/startup_scripts/tfg/tag_prefixes.js new file mode 100644 index 000000000..849f28380 --- /dev/null +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -0,0 +1,17 @@ +// priority: 0 +"use strict"; + +function registerTFGTagPrefixes(event) { + + excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:apt')); + excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:crimsene')); + excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:warpane')); +} + +function excludeAllGemsButNormal(material) { + TagPrefix.gemChipped.setIgnored(material); + TagPrefix.gemFlawed.setIgnored(material); + TagPrefix.gemFlawless.setIgnored(material); + TagPrefix.gemExquisite.setIgnored(material); + TagPrefix.block.setIgnored(material); +} \ No newline at end of file