diff --git a/config/bluemap/packs/TFG_fix/assets/afc/blockColors.json b/config/bluemap/packs/TFG_fix/assets/afc/blockColors.json index 493aef425..3aaaa1ee5 100644 --- a/config/bluemap/packs/TFG_fix/assets/afc/blockColors.json +++ b/config/bluemap/packs/TFG_fix/assets/afc/blockColors.json @@ -1,95 +1,95 @@ -{ -//AFC leaves - "afc:wood/leaves/boabab": "@foliage", - "afc:wood/leaves/eucalyptus": "@foliage", - "afc:wood/leaves/mahogany": "@foliage", - "afc:wood/leaves/hevea": "@foliage", - "afc:wood/leaves/tualang": "@foliage", - "afc:wood/leaves/teak": "@foliage", - "afc:wood/leaves/cypress": "@foliage", - "afc:wood/leaves/fig": "@foliage", - "afc:wood/leaves/ironwood": "@foliage", - "afc:wood/leaves/ipe": "@foliage", - "afc:wood/leaves/gum_arabic": "@foliage", - "afc:wood/leaves/acacia_koa": "@foliage", - "afc:wood/leaves/poplar": "@foliage", - "afc:wood/leaves/mpingo_blackwood": "@foliage", - "afc:wood/leaves/mountain_fir": "@foliage", - "afc:wood/leaves/balsam_fir": "@foliage", - "afc:wood/leaves/scrub_hickory": "@foliage", - "afc:wood/leaves/red_silk_cotton": "@foliage", - "afc:wood/leaves/bigleaf_maple": "@foliage", - "afc:wood/leaves/weeping_maple": "@foliage", - "afc:wood/leaves/black_oak": "@foliage", - "afc:wood/leaves/live_oak": "@foliage", - "afc:wood/leaves/jaggery_palm": "@foliage", - "afc:wood/leaves/stone_pine": "@foliage", - "afc:wood/leaves/red_pine": "@foliage", - "afc:wood/leaves/tamarack": "@foliage", - "afc:wood/leaves/giant_rosewood": "@foliage", - "afc:wood/leaves/coast_redwood": "@foliage", - "afc:wood/leaves/coast_spruce": "@foliage", - "afc:wood/leaves/sitka_spruce": "@foliage", - "afc:wood/leaves/black_spruce": "@foliage", - "afc:wood/leaves/atlas_cedar": "@foliage", - "afc:wood/leaves/weeping_willow": "@foliage", - "afc:wood/leaves/rainbow_eucalyptus": "@foliage", - "afc:wood/leaves/mountain_ash": "@foliage", - "afc:wood/leaves/rubber_fig": "@foliage", - "afc:wood/leaves/redcedar": "@foliage", - "afc:wood/leaves/weeping_cypress": "@foliage", - "afc:wood/leaves/bald_cypress": "@foliage", - "afc:wood/leaves/sapele_mahogany": "@foliage", - "afc:wood/leaves/small_leaf_mahogany": "@foliage", - "afc:wood/leaves/iroko_teak": "@foliage", - "afc:wood/leaves/flame_of_the_forest": "@foliage", - "afc:wood/leaves/lebombo_ironwood": "@foliage", - "afc:wood/leaves/horsetail_ironwood": "@foliage", - -//AFC fallen_leaves - "afc:wood/fallen_leaves/boabab": "@foliage", - "afc:wood/fallen_leaves/eucalyptus": "@foliage", - "afc:wood/fallen_leaves/mahogany": "@foliage", - "afc:wood/fallen_leaves/hevea": "@foliage", - "afc:wood/fallen_leaves/tualang": "@foliage", - "afc:wood/fallen_leaves/teak": "@foliage", - "afc:wood/fallen_leaves/cypress": "@foliage", - "afc:wood/fallen_leaves/fig": "@foliage", - "afc:wood/fallen_leaves/ironwood": "@foliage", - "afc:wood/fallen_leaves/ipe": "@foliage", - "afc:wood/fallen_leaves/gum_arabic": "@foliage", - "afc:wood/fallen_leaves/acacia_koa": "@foliage", - "afc:wood/fallen_leaves/poplar": "@foliage", - "afc:wood/fallen_leaves/mpingo_blackwood": "@foliage", - "afc:wood/fallen_leaves/mountain_fir": "@foliage", - "afc:wood/fallen_leaves/balsam_fir": "@foliage", - "afc:wood/fallen_leaves/scrub_hickory": "@foliage", - "afc:wood/fallen_leaves/red_silk_cotton": "@foliage", - "afc:wood/fallen_leaves/bigleaf_maple": "@foliage", - "afc:wood/fallen_leaves/weeping_maple": "@foliage", - "afc:wood/fallen_leaves/black_oak": "@foliage", - "afc:wood/fallen_leaves/live_oak": "@foliage", - "afc:wood/fallen_leaves/jaggery_palm": "@foliage", - "afc:wood/fallen_leaves/stone_pine": "@foliage", - "afc:wood/fallen_leaves/red_pine": "@foliage", - "afc:wood/fallen_leaves/tamarack": "@foliage", - "afc:wood/fallen_leaves/giant_rosewood": "@foliage", - "afc:wood/fallen_leaves/coast_redwood": "@foliage", - "afc:wood/fallen_leaves/coast_spruce": "@foliage", - "afc:wood/fallen_leaves/sitka_spruce": "@foliage", - "afc:wood/fallen_leaves/black_spruce": "@foliage", - "afc:wood/fallen_leaves/atlas_cedar": "@foliage", - "afc:wood/fallen_leaves/weeping_willow": "@foliage", - "afc:wood/fallen_leaves/rainbow_eucalyptus": "@foliage", - "afc:wood/fallen_leaves/mountain_ash": "@foliage", - "afc:wood/fallen_leaves/rubber_fig": "@foliage", - "afc:wood/fallen_leaves/redcedar": "@foliage", - "afc:wood/fallen_leaves/weeping_cypress": "@foliage", - "afc:wood/fallen_leaves/bald_cypress": "@foliage", - "afc:wood/fallen_leaves/sapele_mahogany": "@foliage", - "afc:wood/fallen_leaves/small_leaf_mahogany": "@foliage", - "afc:wood/fallen_leaves/iroko_teak": "@foliage", - "afc:wood/fallen_leaves/flame_of_the_forest": "@foliage", - "afc:wood/fallen_leaves/lebombo_ironwood": "@foliage", - "afc:wood/fallen_leaves/horsetail_ironwood": "@foliage", +{ +//AFC leaves + "afc:wood/leaves/boabab": "@foliage", + "afc:wood/leaves/eucalyptus": "@foliage", + "afc:wood/leaves/mahogany": "@foliage", + "afc:wood/leaves/hevea": "@foliage", + "afc:wood/leaves/tualang": "@foliage", + "afc:wood/leaves/teak": "@foliage", + "afc:wood/leaves/cypress": "@foliage", + "afc:wood/leaves/fig": "@foliage", + "afc:wood/leaves/ironwood": "@foliage", + "afc:wood/leaves/ipe": "@foliage", + "afc:wood/leaves/gum_arabic": "@foliage", + "afc:wood/leaves/acacia_koa": "@foliage", + "afc:wood/leaves/poplar": "@foliage", + "afc:wood/leaves/mpingo_blackwood": "@foliage", + "afc:wood/leaves/mountain_fir": "@foliage", + "afc:wood/leaves/balsam_fir": "@foliage", + "afc:wood/leaves/scrub_hickory": "@foliage", + "afc:wood/leaves/red_silk_cotton": "@foliage", + "afc:wood/leaves/bigleaf_maple": "@foliage", + "afc:wood/leaves/weeping_maple": "@foliage", + "afc:wood/leaves/black_oak": "@foliage", + "afc:wood/leaves/live_oak": "@foliage", + "afc:wood/leaves/jaggery_palm": "@foliage", + "afc:wood/leaves/stone_pine": "@foliage", + "afc:wood/leaves/red_pine": "@foliage", + "afc:wood/leaves/tamarack": "@foliage", + "afc:wood/leaves/giant_rosewood": "@foliage", + "afc:wood/leaves/coast_redwood": "@foliage", + "afc:wood/leaves/coast_spruce": "@foliage", + "afc:wood/leaves/sitka_spruce": "@foliage", + "afc:wood/leaves/black_spruce": "@foliage", + "afc:wood/leaves/atlas_cedar": "@foliage", + "afc:wood/leaves/weeping_willow": "@foliage", + "afc:wood/leaves/rainbow_eucalyptus": "@foliage", + "afc:wood/leaves/mountain_ash": "@foliage", + "afc:wood/leaves/rubber_fig": "@foliage", + "afc:wood/leaves/redcedar": "@foliage", + "afc:wood/leaves/weeping_cypress": "@foliage", + "afc:wood/leaves/bald_cypress": "@foliage", + "afc:wood/leaves/sapele_mahogany": "@foliage", + "afc:wood/leaves/small_leaf_mahogany": "@foliage", + "afc:wood/leaves/iroko_teak": "@foliage", + "afc:wood/leaves/flame_of_the_forest": "@foliage", + "afc:wood/leaves/lebombo_ironwood": "@foliage", + "afc:wood/leaves/horsetail_ironwood": "@foliage", + +//AFC fallen_leaves + "afc:wood/fallen_leaves/boabab": "@foliage", + "afc:wood/fallen_leaves/eucalyptus": "@foliage", + "afc:wood/fallen_leaves/mahogany": "@foliage", + "afc:wood/fallen_leaves/hevea": "@foliage", + "afc:wood/fallen_leaves/tualang": "@foliage", + "afc:wood/fallen_leaves/teak": "@foliage", + "afc:wood/fallen_leaves/cypress": "@foliage", + "afc:wood/fallen_leaves/fig": "@foliage", + "afc:wood/fallen_leaves/ironwood": "@foliage", + "afc:wood/fallen_leaves/ipe": "@foliage", + "afc:wood/fallen_leaves/gum_arabic": "@foliage", + "afc:wood/fallen_leaves/acacia_koa": "@foliage", + "afc:wood/fallen_leaves/poplar": "@foliage", + "afc:wood/fallen_leaves/mpingo_blackwood": "@foliage", + "afc:wood/fallen_leaves/mountain_fir": "@foliage", + "afc:wood/fallen_leaves/balsam_fir": "@foliage", + "afc:wood/fallen_leaves/scrub_hickory": "@foliage", + "afc:wood/fallen_leaves/red_silk_cotton": "@foliage", + "afc:wood/fallen_leaves/bigleaf_maple": "@foliage", + "afc:wood/fallen_leaves/weeping_maple": "@foliage", + "afc:wood/fallen_leaves/black_oak": "@foliage", + "afc:wood/fallen_leaves/live_oak": "@foliage", + "afc:wood/fallen_leaves/jaggery_palm": "@foliage", + "afc:wood/fallen_leaves/stone_pine": "@foliage", + "afc:wood/fallen_leaves/red_pine": "@foliage", + "afc:wood/fallen_leaves/tamarack": "@foliage", + "afc:wood/fallen_leaves/giant_rosewood": "@foliage", + "afc:wood/fallen_leaves/coast_redwood": "@foliage", + "afc:wood/fallen_leaves/coast_spruce": "@foliage", + "afc:wood/fallen_leaves/sitka_spruce": "@foliage", + "afc:wood/fallen_leaves/black_spruce": "@foliage", + "afc:wood/fallen_leaves/atlas_cedar": "@foliage", + "afc:wood/fallen_leaves/weeping_willow": "@foliage", + "afc:wood/fallen_leaves/rainbow_eucalyptus": "@foliage", + "afc:wood/fallen_leaves/mountain_ash": "@foliage", + "afc:wood/fallen_leaves/rubber_fig": "@foliage", + "afc:wood/fallen_leaves/redcedar": "@foliage", + "afc:wood/fallen_leaves/weeping_cypress": "@foliage", + "afc:wood/fallen_leaves/bald_cypress": "@foliage", + "afc:wood/fallen_leaves/sapele_mahogany": "@foliage", + "afc:wood/fallen_leaves/small_leaf_mahogany": "@foliage", + "afc:wood/fallen_leaves/iroko_teak": "@foliage", + "afc:wood/fallen_leaves/flame_of_the_forest": "@foliage", + "afc:wood/fallen_leaves/lebombo_ironwood": "@foliage", + "afc:wood/fallen_leaves/horsetail_ironwood": "@foliage", } \ No newline at end of file diff --git a/config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json b/config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json index 37afc305b..33a0419a6 100644 --- a/config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json +++ b/config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json @@ -1,245 +1,245 @@ -{ -//TFC plants - "tfc:peat_grass": "@grass", - "tfc:kaolin_clay_grass": "@grass", - "tfc:grass/silt": "@grass", - "tfc:clay_grass/silt": "@grass", - "tfc:grass/loam": "@grass", - "tfc:clay_grass/loam": "@grass", - "tfc:grass/sandy": "@grass", - "tfc:clay_grass/sandy": "@grass", - "tfc:grass/silty_loam": "@grass", - "tfc:clay_grass/silty_loam": "@grass", - "tfc:grass/sandy_loam": "@grass", - "tfc:clay_grass/sandy_loam": "@grass", - "tfc:plant/sagebrush": "@foliage", - "tfc:plant/cordgrass": "@foliage", - "tfc:plant/guzmania": "@foliage", - "tfc:plant/pine_krummholz": "@foliage", - "tfc:plant/king_fern": "@foliage", - "tfc:plant/perovskia": "@foliage", - "tfc:plant/gooseberry_bush": "@foliage", - "tfc:plant/saguaro_fruit": "@foliage", - "tfc:plant/olive_growing_branch": "@foliage", - "tfc:plant/manatee_grass": "@foliage", - "tfc:plant/spanish_moss": "@foliage", - "tfc:plant/hanging_vines_plant": "@foliage", - "tfc:plant/philodendron": "@foliage", - "tfc:plant/maiden_pink": "@foliage", - "tfc:plant/switchgrass": "@foliage", - "tfc:plant/red_apple_branch": "@foliage", - "tfc:plant/lily_of_the_valley": "@foliage", - "tfc:plant/licorice_fern": "@foliage", - "tfc:plant/cloudberry_bush": "@foliage", - "tfc:plant/ivy": "@foliage", - "tfc:plant/peach_branch": "@foliage", - "tfc:plant/plum_leaves": "@foliage", - "tfc:plant/cattail": "@foliage", - "tfc:plant/butterfly_milkweed": "@foliage", - "tfc:plant/saguaro": "@foliage", - "tfc:plant/laminaria": "@foliage", - "tfc:plant/poppy": "@foliage", - "tfc:plant/snapdragon_yellow": "@foliage", - "tfc:plant/plum_sapling": "@foliage", - "tfc:plant/olive_sapling": "@foliage", - "tfc:plant/tulip_pink": "@foliage", - "tfc:plant/dead_bush": "@foliage", - "tfc:plant/peach_leaves": "@foliage", - "tfc:plant/canna": "@foliage", - "tfc:plant/green_apple_sapling": "@foliage", - "tfc:plant/orange_sapling": "@foliage", - "tfc:plant/strawberry_bush": "@foliage", - "tfc:plant/raddia_grass": "@foliage", - "tfc:plant/bromegrass": "@foliage", - "tfc:plant/kangaroo_paw": "@foliage", - "tfc:plant/green_apple_growing_branch": "@foliage", - "tfc:plant/gutweed": "@foliage", - "tfc:plant/phragmite": "@foliage", - "tfc:plant/tulip_red": "@foliage", - "tfc:plant/banana_sapling": "@foliage", - "tfc:plant/sword_fern": "@foliage", - "tfc:plant/lemon_growing_branch": "@foliage", - "tfc:plant/elderberry_bush_cane": "@foliage", - "tfc:plant/red_apple_growing_branch": "@foliage", - "tfc:plant/anthurium": "@foliage", - "tfc:plant/goldenrod": "@foliage", - "tfc:plant/peach_growing_branch": "@foliage", - "tfc:plant/elderberry_bush": "@foliage", - "tfc:plant/duckweed": "@foliage", - "tfc:plant/cranberry_bush": "@foliage", - "tfc:plant/field_horsetail": "@foliage", - "tfc:plant/olive_branch": "@foliage", - "tfc:plant/giant_kelp_plant": "@foliage", - "tfc:plant/blood_lily": "@foliage", - "tfc:plant/raspberry_bush": "@foliage", - "tfc:plant/leafy_kelp_plant": "@foliage", - "tfc:plant/orange_branch": "@foliage", - "tfc:plant/allium": "@foliage", - "tfc:plant/lotus": "@foliage", - "tfc:plant/strelitzia": "@foliage", - "tfc:plant/peach_sapling": "@foliage", - "tfc:plant/red_algae": "@foliage", - "tfc:plant/dead_berry_bush": "@foliage", - "tfc:plant/bur_reed": "@foliage", - "tfc:plant/cherry_growing_branch": "@foliage", - "tfc:plant/pulsatilla": "@foliage", - "tfc:plant/orange_leaves": "@foliage", - "tfc:plant/sea_palm": "@foliage", - "tfc:plant/silver_spurflower": "@foliage", - "tfc:plant/coontail": "@foliage", - "tfc:plant/sapphire_tower": "@foliage", - "tfc:plant/scutch_grass": "@foliage", - "tfc:plant/sago": "@foliage", - "tfc:plant/winged_kelp_plant": "@foliage", - "tfc:plant/aspen_krummholz": "@foliage", - "tfc:plant/raspberry_bush_cane": "@foliage", - "tfc:plant/timothy_grass": "@foliage", - "tfc:plant/cobblestone_lichen": "@foliage", - "tfc:plant/snapdragon_pink": "@foliage", - "tfc:plant/red_apple_leaves": "@foliage", - "tfc:plant/winged_kelp": "@foliage", - "tfc:plant/saguaro_plant": "@foliage", - "tfc:plant/sargassum": "@foliage", - "tfc:plant/artists_conk": "@foliage", - "tfc:plant/black_orchid": "@foliage", - "tfc:plant/dry_phragmite_plant": "@foliage", - "tfc:plant/tree_fern_plant": "@foliage", - "tfc:plant/oxeye_daisy": "@foliage", - "tfc:plant/vriesea": "@foliage", - "tfc:plant/toquilla_palm": "@foliage", - "tfc:plant/badderlocks": "@foliage", - "tfc:plant/grape_hyacinth": "@foliage", - "tfc:plant/red_sealing_wax_palm": "@foliage", - "tfc:plant/lemon_sapling": "@foliage", - "tfc:plant/spanish_moss_plant": "@foliage", - "tfc:plant/blueberry_bush_cane": "@foliage", - "tfc:plant/bluegrass": "@foliage", - "tfc:plant/spruce_krummholz": "@foliage", - "tfc:plant/heliconia": "@foliage", - "tfc:plant/water_taro": "@foliage", - "tfc:plant/green_apple_branch": "@foliage", - "tfc:plant/dry_phragmite": "@foliage", - "tfc:plant/barrel_cactus": "@foliage", - "tfc:plant/rose": "@foliage", - "tfc:plant/houstonia": "@foliage", - "tfc:plant/labrador_tea": "@foliage", - "tfc:plant/nasturtium": "@foliage", - "tfc:plant/leafy_kelp": "@foliage", - "tfc:plant/moss": "@foliage", - "tfc:plant/yucca": "@foliage", - "tfc:plant/lemon_leaves": "@foliage", - "tfc:plant/snowberry_bush": "@foliage", - "tfc:plant/orchard_grass": "@foliage", - "tfc:plant/morning_glory": "@foliage", - "tfc:plant/hanging_vines": "@foliage", - "tfc:plant/water_lily": "@foliage", - "tfc:plant/blueberry_bush": "@foliage", - "tfc:plant/blue_orchid": "@foliage", - "tfc:plant/banana_plant": "@foliage", - "tfc:plant/blackberry_bush_cane": "@foliage", - "tfc:plant/reindeer_lichen": "@foliage", - "tfc:plant/athyrium_fern": "@foliage", - "tfc:plant/trillium": "@foliage", - "tfc:plant/white_cedar_krummholz": "@foliage", - "tfc:plant/turtle_grass": "@foliage", - "tfc:plant/arrowhead": "@foliage", - "tfc:plant/blackberry_bush": "@foliage", - "tfc:plant/tall_fescue_grass": "@foliage", - "tfc:plant/blue_ginger": "@foliage", - "tfc:plant/arundo": "@foliage", - "tfc:plant/sacred_datura": "@foliage", - "tfc:plant/tree_fern": "@foliage", - "tfc:plant/heather": "@foliage", - "tfc:plant/foxglove": "@foliage", - "tfc:plant/liana": "@foliage", - "tfc:plant/douglas_fir_krummholz": "@foliage", - "tfc:plant/lemon_branch": "@foliage", - "tfc:plant/giant_kelp_flower": "@foliage", - "tfc:plant/meads_milkweed": "@foliage", - "tfc:plant/tulip_orange": "@foliage", - "tfc:plant/arundo_plant": "@foliage", - "tfc:plant/olive_leaves": "@foliage", - "tfc:plant/pistia": "@foliage", - "tfc:plant/snapdragon_red": "@foliage", - "tfc:plant/water_canna": "@foliage", - "tfc:plant/ryegrass": "@foliage", - "tfc:plant/fountain_grass": "@foliage", - "tfc:plant/bunchberry_bush": "@foliage", - "tfc:plant/lady_fern": "@foliage", - "tfc:plant/dandelion": "@foliage", - "tfc:plant/tulip_white": "@foliage", - "tfc:plant/cherry_leaves": "@foliage", - "tfc:plant/cherry_sapling": "@foliage", - "tfc:plant/orange_growing_branch": "@foliage", - "tfc:plant/dead_banana_plant": "@foliage", - "tfc:plant/star_grass": "@foliage", - "tfc:plant/desert_flame": "@foliage", - "tfc:plant/eel_grass": "@foliage", - "tfc:plant/wintergreen_berry_bush": "@foliage", - "tfc:plant/beachgrass": "@foliage", - "tfc:plant/milfoil": "@foliage", - "tfc:plant/pickerelweed": "@foliage", - "tfc:plant/primrose": "@foliage", - "tfc:plant/sea_lavender": "@foliage", - "tfc:plant/marigold": "@foliage", - "tfc:plant/tropical_milkweed": "@foliage", - "tfc:plant/pampas_grass": "@foliage", - "tfc:plant/ostrich_fern": "@foliage", - "tfc:plant/green_algae": "@foliage", - "tfc:plant/liana_plant": "@foliage", - "tfc:plant/hibiscus": "@foliage", - "tfc:plant/green_apple_leaves": "@foliage", - "tfc:plant/jungle_vines": "@foliage", - "tfc:plant/dead_cane": "@foliage", - "tfc:plant/red_apple_sapling": "@foliage", - "tfc:plant/calendula": "@foliage", - "tfc:plant/plum_growing_branch": "@foliage", - "tfc:plant/snapdragon_white": "@foliage", - "tfc:plant/cherry_branch": "@foliage", - "tfc:plant/plum_branch": "@foliage", - "tfc:plant/lilac": "@foliage", - -//TFC leaves - "tfc:wood/leaves/willow": "@foliage", - "tfc:wood/leaves/acacia": "@foliage", - "tfc:wood/leaves/maple": "@foliage", - "tfc:wood/leaves/douglas_fir": "@foliage", - "tfc:wood/leaves/chestnut": "@foliage", - "tfc:wood/leaves/kapok": "@foliage", - "tfc:wood/leaves/blackwood": "@foliage", - "tfc:wood/leaves/oak": "@foliage", - "tfc:wood/leaves/sequoia": "@foliage", - "tfc:wood/leaves/mangrove": "@foliage", - "tfc:wood/leaves/white_cedar": "@foliage", - "tfc:wood/leaves/ash": "@foliage", - "tfc:wood/leaves/hickory": "@foliage", - "tfc:wood/leaves/birch": "@foliage", - "tfc:wood/leaves/rosewood": "@foliage", - "tfc:wood/leaves/spruce": "@foliage", - "tfc:wood/leaves/palm": "@foliage", - "tfc:wood/leaves/aspen": "@foliage", - "tfc:wood/leaves/pine": "@foliage", - "tfc:wood/leaves/sycamore": "@foliage", - -//TFC fallen leaves - "tfc:wood/fallen_leaves/willow": "@foliage", - "tfc:wood/fallen_leaves/acacia": "@foliage", - "tfc:wood/fallen_leaves/maple": "@foliage", - "tfc:wood/fallen_leaves/douglas_fir": "@foliage", - "tfc:wood/fallen_leaves/chestnut": "@foliage", - "tfc:wood/fallen_leaves/kapok": "@foliage", - "tfc:wood/fallen_leaves/blackwood": "@foliage", - "tfc:wood/fallen_leaves/oak": "@foliage", - "tfc:wood/fallen_leaves/sequoia": "@foliage", - "tfc:wood/fallen_leaves/mangrove": "@foliage", - "tfc:wood/fallen_leaves/white_cedar": "@foliage", - "tfc:wood/fallen_leaves/ash": "@foliage", - "tfc:wood/fallen_leaves/hickory": "@foliage", - "tfc:wood/fallen_leaves/birch": "@foliage", - "tfc:wood/fallen_leaves/rosewood": "@foliage", - "tfc:wood/fallen_leaves/spruce": "@foliage", - "tfc:wood/fallen_leaves/palm": "@foliage", - "tfc:wood/fallen_leaves/aspen": "@foliage", - "tfc:wood/fallen_leaves/pine": "@foliage", - "tfc:wood/fallen_leaves/sycamore": "@foliage" +{ +//TFC plants + "tfc:peat_grass": "@grass", + "tfc:kaolin_clay_grass": "@grass", + "tfc:grass/silt": "@grass", + "tfc:clay_grass/silt": "@grass", + "tfc:grass/loam": "@grass", + "tfc:clay_grass/loam": "@grass", + "tfc:grass/sandy": "@grass", + "tfc:clay_grass/sandy": "@grass", + "tfc:grass/silty_loam": "@grass", + "tfc:clay_grass/silty_loam": "@grass", + "tfc:grass/sandy_loam": "@grass", + "tfc:clay_grass/sandy_loam": "@grass", + "tfc:plant/sagebrush": "@foliage", + "tfc:plant/cordgrass": "@foliage", + "tfc:plant/guzmania": "@foliage", + "tfc:plant/pine_krummholz": "@foliage", + "tfc:plant/king_fern": "@foliage", + "tfc:plant/perovskia": "@foliage", + "tfc:plant/gooseberry_bush": "@foliage", + "tfc:plant/saguaro_fruit": "@foliage", + "tfc:plant/olive_growing_branch": "@foliage", + "tfc:plant/manatee_grass": "@foliage", + "tfc:plant/spanish_moss": "@foliage", + "tfc:plant/hanging_vines_plant": "@foliage", + "tfc:plant/philodendron": "@foliage", + "tfc:plant/maiden_pink": "@foliage", + "tfc:plant/switchgrass": "@foliage", + "tfc:plant/red_apple_branch": "@foliage", + "tfc:plant/lily_of_the_valley": "@foliage", + "tfc:plant/licorice_fern": "@foliage", + "tfc:plant/cloudberry_bush": "@foliage", + "tfc:plant/ivy": "@foliage", + "tfc:plant/peach_branch": "@foliage", + "tfc:plant/plum_leaves": "@foliage", + "tfc:plant/cattail": "@foliage", + "tfc:plant/butterfly_milkweed": "@foliage", + "tfc:plant/saguaro": "@foliage", + "tfc:plant/laminaria": "@foliage", + "tfc:plant/poppy": "@foliage", + "tfc:plant/snapdragon_yellow": "@foliage", + "tfc:plant/plum_sapling": "@foliage", + "tfc:plant/olive_sapling": "@foliage", + "tfc:plant/tulip_pink": "@foliage", + "tfc:plant/dead_bush": "@foliage", + "tfc:plant/peach_leaves": "@foliage", + "tfc:plant/canna": "@foliage", + "tfc:plant/green_apple_sapling": "@foliage", + "tfc:plant/orange_sapling": "@foliage", + "tfc:plant/strawberry_bush": "@foliage", + "tfc:plant/raddia_grass": "@foliage", + "tfc:plant/bromegrass": "@foliage", + "tfc:plant/kangaroo_paw": "@foliage", + "tfc:plant/green_apple_growing_branch": "@foliage", + "tfc:plant/gutweed": "@foliage", + "tfc:plant/phragmite": "@foliage", + "tfc:plant/tulip_red": "@foliage", + "tfc:plant/banana_sapling": "@foliage", + "tfc:plant/sword_fern": "@foliage", + "tfc:plant/lemon_growing_branch": "@foliage", + "tfc:plant/elderberry_bush_cane": "@foliage", + "tfc:plant/red_apple_growing_branch": "@foliage", + "tfc:plant/anthurium": "@foliage", + "tfc:plant/goldenrod": "@foliage", + "tfc:plant/peach_growing_branch": "@foliage", + "tfc:plant/elderberry_bush": "@foliage", + "tfc:plant/duckweed": "@foliage", + "tfc:plant/cranberry_bush": "@foliage", + "tfc:plant/field_horsetail": "@foliage", + "tfc:plant/olive_branch": "@foliage", + "tfc:plant/giant_kelp_plant": "@foliage", + "tfc:plant/blood_lily": "@foliage", + "tfc:plant/raspberry_bush": "@foliage", + "tfc:plant/leafy_kelp_plant": "@foliage", + "tfc:plant/orange_branch": "@foliage", + "tfc:plant/allium": "@foliage", + "tfc:plant/lotus": "@foliage", + "tfc:plant/strelitzia": "@foliage", + "tfc:plant/peach_sapling": "@foliage", + "tfc:plant/red_algae": "@foliage", + "tfc:plant/dead_berry_bush": "@foliage", + "tfc:plant/bur_reed": "@foliage", + "tfc:plant/cherry_growing_branch": "@foliage", + "tfc:plant/pulsatilla": "@foliage", + "tfc:plant/orange_leaves": "@foliage", + "tfc:plant/sea_palm": "@foliage", + "tfc:plant/silver_spurflower": "@foliage", + "tfc:plant/coontail": "@foliage", + "tfc:plant/sapphire_tower": "@foliage", + "tfc:plant/scutch_grass": "@foliage", + "tfc:plant/sago": "@foliage", + "tfc:plant/winged_kelp_plant": "@foliage", + "tfc:plant/aspen_krummholz": "@foliage", + "tfc:plant/raspberry_bush_cane": "@foliage", + "tfc:plant/timothy_grass": "@foliage", + "tfc:plant/cobblestone_lichen": "@foliage", + "tfc:plant/snapdragon_pink": "@foliage", + "tfc:plant/red_apple_leaves": "@foliage", + "tfc:plant/winged_kelp": "@foliage", + "tfc:plant/saguaro_plant": "@foliage", + "tfc:plant/sargassum": "@foliage", + "tfc:plant/artists_conk": "@foliage", + "tfc:plant/black_orchid": "@foliage", + "tfc:plant/dry_phragmite_plant": "@foliage", + "tfc:plant/tree_fern_plant": "@foliage", + "tfc:plant/oxeye_daisy": "@foliage", + "tfc:plant/vriesea": "@foliage", + "tfc:plant/toquilla_palm": "@foliage", + "tfc:plant/badderlocks": "@foliage", + "tfc:plant/grape_hyacinth": "@foliage", + "tfc:plant/red_sealing_wax_palm": "@foliage", + "tfc:plant/lemon_sapling": "@foliage", + "tfc:plant/spanish_moss_plant": "@foliage", + "tfc:plant/blueberry_bush_cane": "@foliage", + "tfc:plant/bluegrass": "@foliage", + "tfc:plant/spruce_krummholz": "@foliage", + "tfc:plant/heliconia": "@foliage", + "tfc:plant/water_taro": "@foliage", + "tfc:plant/green_apple_branch": "@foliage", + "tfc:plant/dry_phragmite": "@foliage", + "tfc:plant/barrel_cactus": "@foliage", + "tfc:plant/rose": "@foliage", + "tfc:plant/houstonia": "@foliage", + "tfc:plant/labrador_tea": "@foliage", + "tfc:plant/nasturtium": "@foliage", + "tfc:plant/leafy_kelp": "@foliage", + "tfc:plant/moss": "@foliage", + "tfc:plant/yucca": "@foliage", + "tfc:plant/lemon_leaves": "@foliage", + "tfc:plant/snowberry_bush": "@foliage", + "tfc:plant/orchard_grass": "@foliage", + "tfc:plant/morning_glory": "@foliage", + "tfc:plant/hanging_vines": "@foliage", + "tfc:plant/water_lily": "@foliage", + "tfc:plant/blueberry_bush": "@foliage", + "tfc:plant/blue_orchid": "@foliage", + "tfc:plant/banana_plant": "@foliage", + "tfc:plant/blackberry_bush_cane": "@foliage", + "tfc:plant/reindeer_lichen": "@foliage", + "tfc:plant/athyrium_fern": "@foliage", + "tfc:plant/trillium": "@foliage", + "tfc:plant/white_cedar_krummholz": "@foliage", + "tfc:plant/turtle_grass": "@foliage", + "tfc:plant/arrowhead": "@foliage", + "tfc:plant/blackberry_bush": "@foliage", + "tfc:plant/tall_fescue_grass": "@foliage", + "tfc:plant/blue_ginger": "@foliage", + "tfc:plant/arundo": "@foliage", + "tfc:plant/sacred_datura": "@foliage", + "tfc:plant/tree_fern": "@foliage", + "tfc:plant/heather": "@foliage", + "tfc:plant/foxglove": "@foliage", + "tfc:plant/liana": "@foliage", + "tfc:plant/douglas_fir_krummholz": "@foliage", + "tfc:plant/lemon_branch": "@foliage", + "tfc:plant/giant_kelp_flower": "@foliage", + "tfc:plant/meads_milkweed": "@foliage", + "tfc:plant/tulip_orange": "@foliage", + "tfc:plant/arundo_plant": "@foliage", + "tfc:plant/olive_leaves": "@foliage", + "tfc:plant/pistia": "@foliage", + "tfc:plant/snapdragon_red": "@foliage", + "tfc:plant/water_canna": "@foliage", + "tfc:plant/ryegrass": "@foliage", + "tfc:plant/fountain_grass": "@foliage", + "tfc:plant/bunchberry_bush": "@foliage", + "tfc:plant/lady_fern": "@foliage", + "tfc:plant/dandelion": "@foliage", + "tfc:plant/tulip_white": "@foliage", + "tfc:plant/cherry_leaves": "@foliage", + "tfc:plant/cherry_sapling": "@foliage", + "tfc:plant/orange_growing_branch": "@foliage", + "tfc:plant/dead_banana_plant": "@foliage", + "tfc:plant/star_grass": "@foliage", + "tfc:plant/desert_flame": "@foliage", + "tfc:plant/eel_grass": "@foliage", + "tfc:plant/wintergreen_berry_bush": "@foliage", + "tfc:plant/beachgrass": "@foliage", + "tfc:plant/milfoil": "@foliage", + "tfc:plant/pickerelweed": "@foliage", + "tfc:plant/primrose": "@foliage", + "tfc:plant/sea_lavender": "@foliage", + "tfc:plant/marigold": "@foliage", + "tfc:plant/tropical_milkweed": "@foliage", + "tfc:plant/pampas_grass": "@foliage", + "tfc:plant/ostrich_fern": "@foliage", + "tfc:plant/green_algae": "@foliage", + "tfc:plant/liana_plant": "@foliage", + "tfc:plant/hibiscus": "@foliage", + "tfc:plant/green_apple_leaves": "@foliage", + "tfc:plant/jungle_vines": "@foliage", + "tfc:plant/dead_cane": "@foliage", + "tfc:plant/red_apple_sapling": "@foliage", + "tfc:plant/calendula": "@foliage", + "tfc:plant/plum_growing_branch": "@foliage", + "tfc:plant/snapdragon_white": "@foliage", + "tfc:plant/cherry_branch": "@foliage", + "tfc:plant/plum_branch": "@foliage", + "tfc:plant/lilac": "@foliage", + +//TFC leaves + "tfc:wood/leaves/willow": "@foliage", + "tfc:wood/leaves/acacia": "@foliage", + "tfc:wood/leaves/maple": "@foliage", + "tfc:wood/leaves/douglas_fir": "@foliage", + "tfc:wood/leaves/chestnut": "@foliage", + "tfc:wood/leaves/kapok": "@foliage", + "tfc:wood/leaves/blackwood": "@foliage", + "tfc:wood/leaves/oak": "@foliage", + "tfc:wood/leaves/sequoia": "@foliage", + "tfc:wood/leaves/mangrove": "@foliage", + "tfc:wood/leaves/white_cedar": "@foliage", + "tfc:wood/leaves/ash": "@foliage", + "tfc:wood/leaves/hickory": "@foliage", + "tfc:wood/leaves/birch": "@foliage", + "tfc:wood/leaves/rosewood": "@foliage", + "tfc:wood/leaves/spruce": "@foliage", + "tfc:wood/leaves/palm": "@foliage", + "tfc:wood/leaves/aspen": "@foliage", + "tfc:wood/leaves/pine": "@foliage", + "tfc:wood/leaves/sycamore": "@foliage", + +//TFC fallen leaves + "tfc:wood/fallen_leaves/willow": "@foliage", + "tfc:wood/fallen_leaves/acacia": "@foliage", + "tfc:wood/fallen_leaves/maple": "@foliage", + "tfc:wood/fallen_leaves/douglas_fir": "@foliage", + "tfc:wood/fallen_leaves/chestnut": "@foliage", + "tfc:wood/fallen_leaves/kapok": "@foliage", + "tfc:wood/fallen_leaves/blackwood": "@foliage", + "tfc:wood/fallen_leaves/oak": "@foliage", + "tfc:wood/fallen_leaves/sequoia": "@foliage", + "tfc:wood/fallen_leaves/mangrove": "@foliage", + "tfc:wood/fallen_leaves/white_cedar": "@foliage", + "tfc:wood/fallen_leaves/ash": "@foliage", + "tfc:wood/fallen_leaves/hickory": "@foliage", + "tfc:wood/fallen_leaves/birch": "@foliage", + "tfc:wood/fallen_leaves/rosewood": "@foliage", + "tfc:wood/fallen_leaves/spruce": "@foliage", + "tfc:wood/fallen_leaves/palm": "@foliage", + "tfc:wood/fallen_leaves/aspen": "@foliage", + "tfc:wood/fallen_leaves/pine": "@foliage", + "tfc:wood/fallen_leaves/sycamore": "@foliage" } \ No newline at end of file diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt index 4d9acd900..0cd2b7618 100644 --- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt +++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt @@ -1288,21 +1288,6 @@ x: -2.0d y: -9.0d } - { - dependencies: ["25007C5E43D28DB2"] - description: ["{quests.ae2.stock_bridge.desc}"] - id: "0E54B3BCBBA34A00" - optional: true - shape: "heart" - tasks: [{ - id: "1F8D81C524CE694A" - item: "createstockbridge:ae_bridge" - type: "item" - }] - title: "{quests.ae2.stock_bridge.title}" - x: 5.0d - y: -8.0d - } ] subtitle: ["{quests.ae2.subtitle}"] title: "{quests.ae2}" diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index a736b2b47..bae9c8d80 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -19,8 +19,8 @@ { id: "0D951ADFB3AF2E74" linked_quest: "7B2EE67E37809269" - x: 4.5d - y: 0.0d + x: 8.5d + y: -1.0d } { id: "0E76B952D3BA3BDA" @@ -32,7 +32,7 @@ id: "66960076A74E9B79" linked_quest: "0CA5B715B76E4A5B" shape: "diamond" - x: 15.5d + x: 16.0d y: 2.5d } { @@ -44,7 +44,7 @@ { id: "49FB3507B0FB3000" linked_quest: "155F421FC2F39C3C" - x: 12.0d + x: 11.5d y: 4.0d } { @@ -52,21 +52,34 @@ linked_quest: "4B1F957EB41A5E9B" shape: "octagon" size: 1.5d - x: 5.5d - y: 5.5d + x: 5.25d + y: 2.0d } { id: "7B380A243C2C39FA" linked_quest: "13F2929C1C303A0B" - x: -1.0d - y: -5.0d + x: 4.25d + y: -3.5d } { id: "2151F8AA263F1D6E" linked_quest: "6ECAD339C91EF194" shape: "heart" - x: 4.0d - y: -5.5d + x: 17.5d + y: 8.0d + } + { + icon: { + Count: 1 + id: "tfg:tbu_232_rod" + tag: { + Damage: 0 + } + } + id: "2DD8555DDAA44979" + linked_quest: "0ABD326DC2551CBD" + x: 24.5d + y: 9.0d } ] quests: [ @@ -92,6 +105,7 @@ { dependencies: [ "601088B7920140B2" + "3FBDC8552F7D8008" "3B18DE7395776B41" ] description: ["{quests.extreme_voltage.t2_rocket.desc}"] @@ -140,25 +154,17 @@ { dependencies: ["2931F887548A4A64"] description: ["{quests.extreme_voltage.tungsten.desc}"] - icon: "gtceu:tungsten_ingot" + icon: "gtceu:tungsten_dust" id: "5EC5566546591DEE" subtitle: "{quests.extreme_voltage.tungsten.subtitle}" - tasks: [ - { - id: "017BC39C681F5335" - item: "gtceu:tungsten_dust" - optional_task: true - type: "item" - } - { - id: "3A60698FD28B0CC5" - item: "gtceu:tungsten_ingot" - type: "item" - } - ] + tasks: [{ + id: "017BC39C681F5335" + item: "gtceu:tungsten_dust" + type: "item" + }] title: "{quests.extreme_voltage.tungsten.title}" - x: 7.5d - y: -2.0d + x: 7.0d + y: -4.5d } { dependencies: [ @@ -185,8 +191,8 @@ } ] title: "{quests.extreme_voltage.tunsgten_line_step_1.title}" - x: -2.0d - y: -2.0d + x: -3.75d + y: -4.5d } { dependencies: ["4EA8888B12D75BF1"] @@ -321,8 +327,8 @@ item: "gtceu:alloy_blast_smelter" type: "item" }] - x: 10.0d - y: 1.5d + x: 13.0d + y: 1.0d } { dependencies: ["4EA8888B12D75BF1"] @@ -338,13 +344,14 @@ type: "item" }] title: "{quests.extreme_voltage.ev_mixer.title}" - x: 0.0d + x: 5.25d y: 0.0d } { dependencies: [ "61D5055F344DDFAD" "42C2B749B61B1FBE" + "5EC5566546591DEE" ] description: ["{quests.extreme_voltage.rtm.desc}"] icon: "gtceu:rtm_alloy_ingot" @@ -364,7 +371,7 @@ } ] title: "{quests.extreme_voltage.rtm.title}" - x: 1.5d + x: 7.0d y: 0.0d } { @@ -372,6 +379,7 @@ "37B7342CD1B3B76D" "601088B7920140B2" "6B08799BCFD01D3D" + "5CF70AC24D269279" ] description: ["{quests.extreme_voltage.rtm_coil.desc}"] id: "7F4E529627AD9148" @@ -381,8 +389,8 @@ item: "gtceu:rtm_alloy_coil_block" type: "item" }] - x: 1.5d - y: 1.5d + x: 10.0d + y: 3.0d } { dependencies: ["7F4E529627AD9148"] @@ -436,8 +444,8 @@ } ] title: "{quests.extreme_voltage.gcym_alloys.title}" - x: 8.5d - y: 1.5d + x: 10.0d + y: 1.0d } { dependencies: ["7B2EE67E37809269"] @@ -471,7 +479,7 @@ } ] title: "{quests.extreme_voltage.ruthenium.title}" - x: 3.0d + x: 8.5d y: 0.0d } { @@ -484,8 +492,8 @@ item: "gtceu:large_centrifuge" type: "item" }] - x: 17.0d - y: 1.5d + x: 17.5d + y: 1.0d } { dependencies: [ @@ -510,14 +518,14 @@ } ] title: "{quests.extreme_voltage.tungsten_steel.title}" - x: 0.0d - y: -4.0d + x: 5.25d + y: -2.5d } { dependencies: [ - "2979AFD231E5B37B" - "5EC5566546591DEE" "0E2E93BE3364722D" + "4AD96212525517CD" + "37B7342CD1B3B76D" ] dependency_requirement: "one_completed" description: ["{quests.extreme_voltage.nuclear_fuel_factory.desc}"] @@ -529,7 +537,7 @@ type: "item" }] title: "{quests.extreme_voltage.nuclear_fuel_factory.title}" - x: 7.5d + x: 7.0d y: 7.0d } { @@ -547,7 +555,9 @@ y: 6.0d } { + dependencies: ["2979AFD231E5B37B"] description: ["{quests.extreme_voltage.heavy_water.desc}"] + hide_dependency_lines: true icon: "tfg:heavy_water_bucket" id: "4AD41E9FA7814EA1" subtitle: "{quests.extreme_voltage.heavy_water.subtitle}" @@ -582,6 +592,8 @@ "{quests.extreme_voltage.thorium_rod.desc.2}" "{@pagebreak}" "{quests.extreme_voltage.thorium_rod.desc.3}" + "{@pagebreak}" + "{quests.extreme_voltage.thorium_rod.desc.4}" ] id: "77CB4AE5B3AF5263" subtitle: "{quests.extreme_voltage.thorium_rod.subtitle}" @@ -703,8 +715,12 @@ y: 8.0d } { - dependencies: ["00004BE1D77EA003"] + dependencies: [ + "00004BE1D77EA003" + "4EA8888B12D75BF1" + ] description: ["{quests.extreme_voltage.uraninite_dust.desc}"] + hide_dependency_lines: true icon: "gtceu:uraninite_dust" id: "2814C6FA71B07C95" subtitle: "{quests.extreme_voltage.uraninite_dust.subtitle}" @@ -766,6 +782,8 @@ item: "gtceu:machine_controller_cover" type: "item" }] + shape: "octagon" + size: 1.5d subtitle: "{quests.extreme_voltage.heat_exchanger.subtitle}" tasks: [{ id: "67CB661D4F20EC3A" @@ -777,7 +795,9 @@ y: 5.5d } { + dependencies: ["4EA8888B12D75BF1"] description: ["{quests.extreme_voltage.ammonium_formate.desc}"] + hide_dependency_lines: true icon: "gtceu:ammonium_formate_bucket" id: "075434DAB3D9F0EA" subtitle: "{quests.extreme_voltage.ammonium_formate.subtitle}" @@ -801,7 +821,7 @@ } ] title: "{quests.extreme_voltage.ammonium_formate.title}" - x: 13.5d + x: 12.5d y: 5.5d } { @@ -824,7 +844,7 @@ } ] title: "{quests.extreme_voltage.formamide.title}" - x: 15.5d + x: 16.0d y: 5.5d } { @@ -857,7 +877,7 @@ } ] title: "{quests.extreme_voltage.nuclear_residue_dust.title}" - x: 17.0d + x: 17.5d y: 5.5d } { @@ -883,11 +903,13 @@ } ] title: "{quests.extreme_voltage.martian_sludge.title}" - x: 17.0d + x: 17.5d y: 3.5d } { + dependencies: ["4EA8888B12D75BF1"] description: ["{quests.extreme_voltage.hexafluorosilic_acid.desc}"] + hide_dependency_lines: true icon: "gtceu:dirty_hexafluorosilicic_acid_bucket" id: "05FED2FF1BEA05F1" subtitle: "{quests.extreme_voltage.hexafluorosilic_acid.subtitle}" @@ -911,7 +933,7 @@ } ] title: "{quests.extreme_voltage.hexafluorosilic_acid.title}" - x: 18.5d + x: 19.0d y: 3.5d } { @@ -928,7 +950,7 @@ item: "tfg:oxidized_nuclear_residue_dust" type: "item" }] - x: 18.5d + x: 19.0d y: 5.5d } { @@ -941,7 +963,7 @@ item: "tfg:refined_nuclear_residue_dust" type: "item" }] - x: 18.5d + x: 19.0d y: 7.0d } { @@ -967,7 +989,7 @@ } type: "item" }] - x: 18.5d + x: 19.0d y: 10.5d } { @@ -990,7 +1012,7 @@ } ] title: "{quests.extreme_voltage.radioactive_concoction.title}" - x: 21.5d + x: 22.0d y: 5.5d } { @@ -1013,7 +1035,7 @@ } ] title: "{quests.extreme_voltage.tritiated_water.title}" - x: 16.0d + x: 12.5d y: 10.5d } { @@ -1226,10 +1248,10 @@ type: "item" }] x: 1.5d - y: -5.5d + y: -2.5d } { - dependencies: ["2C000B45C23752D0"] + dependencies: ["2B666F65B5F196E6"] description: ["{quests.extreme_voltage.ev_superconductor.desc}"] icon: "gtceu:uranium_triplatinum_single_wire" id: "2BE373381980C85F" @@ -1255,8 +1277,8 @@ } ] title: "{quests.extreme_voltage.ev_superconductor.title}" - x: 13.5d - y: 8.0d + x: 17.5d + y: 7.0d } { dependencies: ["017019EB38F7A18C"] @@ -1479,8 +1501,8 @@ type: "item" }] title: "{quests.extreme_voltage.me_part.title}" - x: 5.5d - y: 3.0d + x: 2.5d + y: 1.0d } { dependencies: ["70ABD1E3FC1CA672"] @@ -1505,8 +1527,8 @@ type: "item" }] title: "{quests.extreme_voltage.building_gadgets.title}" - x: 4.5d - y: 4.0d + x: 1.5d + y: 1.0d } { dependencies: ["70ABD1E3FC1CA672"] @@ -1534,8 +1556,8 @@ } ] title: "{quests.ae2.wireless_access.title}" - x: 5.5d - y: 4.0d + x: 3.5d + y: 2.0d } { dependencies: ["601088B7920140B2"] @@ -1548,8 +1570,8 @@ type: "checkmark" }] title: "{quests.extreme_voltage.new_qol.title}" - x: 4.5d - y: 3.0d + x: 1.5d + y: 2.0d } { dependencies: ["55FB2776B724FB63"] @@ -1594,28 +1616,43 @@ } ] title: "{quests.extreme_voltage.plutonium.title}" - x: 18.5d + x: 19.0d y: 9.0d } { - dependencies: ["617CF3335584DC8D"] + dependencies: ["26AA29016BA23396"] description: ["{quests.extreme_voltage.ostrum_linear.desc}"] + icon: "tfg:ostrum_linear_accelerator" id: "691A36800DC755C1" shape: "octagon" size: 2.0d subtitle: "{quests.extreme_voltage.ostrum_linear.subtitle}" - tasks: [{ - id: "130FE3E2CE8735F8" - item: "tfg:ostrum_linear_accelerator" - type: "item" - }] - x: 21.5d + tasks: [ + { + id: "130FE3E2CE8735F8" + item: "tfg:ostrum_linear_accelerator" + type: "item" + } + { + id: "5D1A52502962C948" + item: "deafission:battery_heat_port_ev" + type: "item" + } + { + id: "0FEF42CB8A6DC0F6" + item: "deafission:heat_input_hatch_ev" + type: "item" + } + ] + x: 22.0d y: 9.0d } { dependencies: ["691A36800DC755C1"] + description: ["{quests.extreme_voltage.ostrum_vapor.desc}"] icon: "gtceu:ostrum_vapor_bucket" id: "58264E007C2D7CC6" + subtitle: "{quests.extreme_voltage.ostrum_vapor.subtitle}" tasks: [ { id: "5399332E050D8560" @@ -1629,13 +1666,20 @@ type: "checkmark" } ] - x: 21.5d - y: 12.5d + title: "{quests.extreme_voltage.ostrum_vapor.title}" + x: 20.5d + y: 9.0d } { - dependencies: ["691A36800DC755C1"] + dependencies: [ + "691A36800DC755C1" + "3E0ABDFCC0FC6928" + ] + dependency_requirement: "one_completed" + description: ["{quests.extreme_voltage.light_ostrum_vapor.desc}"] icon: "gtceu:lightweight_ostrum_vapor_bucket" id: "4F647D6A4949EDF7" + subtitle: "{quests.extreme_voltage.light_ostrum_vapor.subtitle}" tasks: [ { id: "3529CF130C73746E" @@ -1649,16 +1693,16 @@ type: "checkmark" } ] - x: 22.5d - y: 12.5d + title: "{quests.extreme_voltage.light_ostrum_vapor.title}" + x: 22.0d + y: 12.0d } { - dependencies: [ - "691A36800DC755C1" - "3E0ABDFCC0FC6928" - ] + dependencies: ["691A36800DC755C1"] + description: ["{quests.extreme_voltage.dense_ostrum_vapor.desc}"] icon: "gtceu:dense_ostrum_vapor_bucket" id: "4C29DDE89AE8D6EE" + subtitle: "{quests.extreme_voltage.dense_ostrum_vapor.subtitle}" tasks: [ { id: "24641F2651FFBE44" @@ -1672,21 +1716,33 @@ type: "checkmark" } ] - x: 20.5d - y: 12.5d + title: "{quests.extreme_voltage.dense_ostrum_vapor.title}" + x: 23.5d + y: 9.0d } { dependencies: ["4F647D6A4949EDF7"] id: "6ABD72F1C1971EE3" + optional: true shape: "heart" tasks: [ { - id: "02963B7E2699E185" - item: "gtceu:tricalcium_phosphate_dust" + id: "500E6AD918D6F37A" + item: "gtceu:thorium_dust" type: "item" } { - id: "0202E05696C78841" + id: "3F961A11EFDFA246" + item: "gtceu:pitchblende_dust" + type: "item" + } + { + id: "02A251EBEF64897C" + item: "gtceu:aluminium_dust" + type: "item" + } + { + id: "1CDA9E72C0CF6707" item: { Count: 1 ForgeCaps: { @@ -1700,26 +1756,7 @@ type: "item" } { - id: "07372F88634076C6" - item: "gtceu:pitchblende_dust" - type: "item" - } - ] - x: 22.5d - y: 13.5d - } - { - dependencies: ["58264E007C2D7CC6"] - id: "27804B847EE2CFF2" - shape: "heart" - tasks: [ - { - id: "19277D14081DE23B" - item: "gtceu:aluminium_dust" - type: "item" - } - { - id: "552DAD2E001E8D83" + id: "1F2D23F66866AFB4" item: { Count: 1 ForgeCaps: { @@ -1733,46 +1770,13 @@ type: "item" } { - id: "6AFCA6EE597B7F67" - item: "gtceu:beryllium_dust" + id: "4D619272F96C7EF6" + item: "gtceu:tricalcium_phosphate_dust" type: "item" } ] - x: 21.5d - y: 13.5d - } - { - dependencies: ["4C29DDE89AE8D6EE"] - id: "09A85FAD0786E667" - shape: "heart" - tasks: [ - { - id: "06B67B195C0429D5" - item: "gtceu:thorium_dust" - type: "item" - } - { - id: "0496A5C65EA6EA17" - item: "gtceu:uraninite_dust" - type: "item" - } - { - id: "43E02B6BE521142B" - item: { - Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "gtceu:hematite_dust" - } - type: "item" - } - ] - x: 20.5d - y: 13.5d + x: 22.0d + y: 13.0d } { dependencies: ["3A2E442E4D84C891"] @@ -1863,18 +1867,27 @@ y: 9.0d } { - dependencies: ["601088B7920140B2"] + dependencies: ["58264E007C2D7CC6"] description: ["{quests.extreme_voltage.refrigerant_pellet.desc}"] - hide_dependency_lines: true + icon: "tfg:terrafirmaguard_pa6" id: "08195E9FA1396936" + shape: "hexagon" subtitle: "{quests.extreme_voltage.refrigerant_pellet.subtitle}" - tasks: [{ - id: "1B4C7B8C2EDFE595" - item: "tfg:refrigerant_pellet" - type: "item" - }] + tasks: [ + { + id: "1B4C7B8C2EDFE595" + item: "tfg:refrigerant_pellet" + optional_task: true + type: "item" + } + { + id: "0AEA0612B833D029" + item: "tfg:terrafirmaguard_pa6" + type: "item" + } + ] title: "{quests.extreme_voltage.refrigerant_pellet.title}" - x: 19.5d + x: 20.5d y: 10.5d } { @@ -1947,8 +1960,8 @@ type: "item" }] title: "{quests.extreme_voltage.large_miner.title}" - x: 7.5d - y: -3.5d + x: 10.0d + y: -4.5d } { dependencies: ["2979AFD231E5B37B"] @@ -1973,7 +1986,9 @@ y: 8.0d } { + dependencies: ["4EA8888B12D75BF1"] description: ["{quests.extreme_voltage.dense_lead.desc}"] + hide_dependency_lines: true id: "0E2E93BE3364722D" shape: "circle" subtitle: "{quests.extreme_voltage.dense_lead.subtitle}" @@ -1983,7 +1998,7 @@ type: "item" }] title: "{quests.extreme_voltage.dense_lead.title}" - x: 6.5d + x: 6.0d y: 8.0d } { @@ -2011,25 +2026,6 @@ x: 14.5d y: 4.0d } - { - dependencies: ["691A36800DC755C1"] - description: [ - "In a future update coming before Venus, the recipes within the Linear Accelerator will be change. Expect your recipes to break." - "" - "The multiblock itself won't so you are safe to use it for now." - ] - icon: "createdeco:decal_warning" - id: "3F59CD5ABE4E7510" - size: 1.5d - tasks: [{ - id: "2CCA527404CECA8C" - title: "Okay I understand this will break" - type: "checkmark" - }] - title: "Breaking changes in next update" - x: 24.0d - y: 9.0d - } { dependencies: ["04682CD04FE0A56E"] description: [ @@ -2058,8 +2054,8 @@ } ] title: "{quests.extreme_voltage.tunsgten_line_step.title}" - x: -2.0d - y: -3.0d + x: -3.75d + y: -5.5d } { dependencies: ["04682CD04FE0A56E"] @@ -2072,8 +2068,8 @@ type: "item" }] title: "{quests.extreme_voltage.tunsgten_line_step_2.title}" - x: -1.0d - y: -2.0d + x: -2.75d + y: -4.5d } { dependencies: ["3A2E442E4D84C891"] @@ -2128,6 +2124,7 @@ y: 5.5d } { + dependencies: ["2979AFD231E5B37B"] description: [ "{quests.extreme_voltage.radiation.desc.1}" "{@pagebreak}" @@ -2171,12 +2168,16 @@ type: "item" }] title: "{quests.extreme_voltage.advanced_fluid_rig.title}" - x: 9.0d - y: -2.0d + x: 7.0d + y: -6.0d } { dependencies: ["5CF58F7CBE255585"] - description: ["{quests.extreme_voltage.large_generators.desc}"] + description: [ + "{quests.extreme_voltage.large_generators.desc}" + "" + "{ \"text\": \"▶▶▶▶▶▶▶\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"2CDB9778C7A30044\" } }" + ] disable_toast: true id: "40CBACE41B71C011" shape: "octagon" @@ -2239,8 +2240,8 @@ type: "item" }] title: "{quests.extreme_voltage.btx_catalyser.title}" - x: -4.0d - y: -4.5d + x: -5.5d + y: -6.0d } { dependencies: ["3EC1D337D9FC3F1B"] @@ -2256,8 +2257,52 @@ item: "gtceu:rhenium_dust" type: "item" }] - x: -4.0d - y: -5.5d + x: -5.5d + y: -7.0d + } + { + dependencies: ["617CF3335584DC8D"] + description: ["{quests.extreme_voltage.heat_battery.desc}"] + id: "26AA29016BA23396" + shape: "octagon" + size: 1.5d + subtitle: "{quests.extreme_voltage.heat_battery.subtitle}" + tasks: [{ + id: "5C9A37E905A4030F" + item: "tfg:heat_battery_mk1" + type: "item" + }] + x: 22.0d + y: 7.0d + } + { + dependencies: ["155F421FC2F39C3C"] + description: ["{quests.extreme_voltage.nichromium_iode.desc}"] + icon: "tfg:nichromium_iodomethylate_bucket" + id: "5CF70AC24D269279" + subtitle: "{quests.extreme_voltage.nichromium_iode.subtitle}" + tasks: [ + { + id: "29015E8328231929" + item: "tfg:iodomethane_bucket" + optional_task: true + type: "item" + } + { + id: "195713F766EF130A" + item: "tfg:nichromium_iodomethylate_bucket" + optional_task: true + type: "item" + } + { + id: "20D7CE8211E091A6" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] + title: "{quests.extreme_voltage.nichromium_iode.title}" + x: 11.5d + y: 3.0d } ] subtitle: ["{quests.extreme_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index e52987dc3..06f8c624a 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -232,7 +232,7 @@ dependencies: [ "60FF9249376DF9BD" "05E2F203DA46A5E8" - "3EC8D58DB73CEFE5" + "2BE373381980C85F" ] dependency_requirement: "one_completed" description: ["{quests.gregtech_energy.transformer.desc}"] @@ -1016,8 +1016,8 @@ } { dependencies: [ - "0AF286AA540A82E6" "0C718329245D9619" + "4C620105AAC49381" ] description: [ "{quests.medium_voltage.mv_diesel.desc.1}" @@ -1034,8 +1034,8 @@ type: "item" }] title: "{quests.medium_voltage.mv_diesel.title}" - x: -9.0d - y: -5.0d + x: -8.5d + y: -7.0d } { dependencies: ["7AF726555D721DFC"] @@ -1089,7 +1089,7 @@ type: "item" }] title: "{quests.low_voltage.lv_biodiesel.title}" - x: -9.0d + x: -9.5d y: -7.0d } { @@ -1236,16 +1236,65 @@ "05E2F203DA46A5E8" "0ABD326DC2551CBD" ] - description: ["{quests.gregtech_energy.smr.desc.1}"] + description: [ + "{quests.gregtech_energy.smr.desc.1}" + "{@pagebreak}" + "{quests.gregtech_energy.smr.desc.2}" + "{@pagebreak}" + "{quests.gregtech_energy.smr.desc.3}" + ] + icon: "tfg:smr_generator" id: "4659447C85CDC058" subtitle: "{quests.gregtech_energy.smr.subtitle}" - tasks: [{ - id: "1D02468DD9869C72" - item: "deafission:fission_reactor_smr1" - type: "item" - }] + tasks: [ + { + id: "1D02468DD9869C72" + item: "deafission:fission_reactor_smr1" + type: "item" + } + { + id: "4DA2451D673DABE3" + item: "tfg:smr_generator" + type: "item" + } + { + id: "7647ABCBC805E3B3" + item: "tfg:uv_smr_fluid_import_hatch" + type: "item" + } + { + id: "4BDA2F8B0D5B310D" + item: "gtceu:lubricant_bucket" + optional_task: true + type: "item" + } + { + id: "5C5003050BCE8601" + item: "tfg:polyalkylene_lubricant_bucket" + optional_task: true + type: "item" + } + { + id: "79126D47F1236F45" + item: "tfg:ozone_bucket" + optional_task: true + type: "item" + } + { + id: "5075B6C62A7AB675" + item: "tfg:cyclohex_diperoxide_bucket" + optional_task: true + type: "item" + } + { + id: "28AAB372882C8996" + item: "tfg:ticl4_doped_supercritical_co2_bucket" + optional_task: true + type: "item" + } + ] title: "{quests.gregtech_energy.smr.title}" - x: -7.5d + x: -7.0d y: 1.0d } { @@ -1266,21 +1315,64 @@ y: -7.0d } { - dependencies: ["4512E5DE7A84F809"] - description: ["{quests.gregtech_energy.fission_rod.desc.1}"] + dependencies: [ + "4512E5DE7A84F809" + "4C29DDE89AE8D6EE" + ] + dependency_requirement: "one_completed" + description: [ + "{quests.gregtech_energy.fission_rod.desc.1}" + "{@pagebreak}" + "{quests.gregtech_energy.fission_rod.desc.2}" + "{@pagebreak}" + "{quests.gregtech_energy.fission_rod.desc.3}" + ] + icon: { + Count: 1 + id: "tfg:tbu_232_rod" + tag: { + Damage: 0 + } + } id: "0ABD326DC2551CBD" subtitle: "{quests.gregtech_energy.fission_rod.subtitle}" - tasks: [{ - id: "68E3EE04F4931EFE" - item: { - Count: 1 - id: "tfg:tbu_232_rod" - tag: { - Damage: 0 + tasks: [ + { + id: "68E3EE04F4931EFE" + item: { + Count: 1 + id: "tfg:tbu_232_rod" + tag: { + Damage: 0 + } } + type: "item" } - type: "item" - }] + { + id: "21383A5C0CF976DD" + item: { + Count: 1 + id: "tfg:americium_241_rod" + tag: { + Damage: 0 + } + } + optional_task: true + type: "item" + } + { + id: "5B22DEC6694CDCCB" + item: { + Count: 1 + id: "tfg:neptunium_237_rod" + tag: { + Damage: 0 + } + } + optional_task: true + type: "item" + } + ] title: "{quests.gregtech_energy.fission_rod.title}" x: -7.5d y: 0.0d @@ -1320,6 +1412,41 @@ x: -9.0d y: -1.0d } + { + dependencies: [ + "05E2F203DA46A5E8" + "0ABD326DC2551CBD" + ] + description: [ + "{quests.gregtech_energy.cooling_tower.desc.1}" + "{@pagebreak}" + "{quests.gregtech_energy.cooling_tower.desc.2}" + ] + icon: "tfg:cooling_tower" + id: "7F2F435C727C7AB3" + subtitle: "{quests.gregtech_energy.cooling_tower.subtitle}" + tasks: [ + { + id: "0347D107FEC9761B" + item: "tfg:cooling_tower" + type: "item" + } + { + id: "7CD0D40C08CC42D2" + item: "tfg:boron_enriched_coolant_bucket" + optional_task: true + type: "item" + } + { + id: "23C1F8FEFBD23A5C" + item: "tfg:warm_water_bucket" + optional_task: true + type: "item" + } + ] + x: -8.0d + y: 1.0d + } ] subtitle: ["{quests.gregtech_energy.subtitle}"] title: "{quests.gregtech_energy}" diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 92974c4a4..949f23310 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1698,6 +1698,21 @@ x: -2.25d y: -11.0d } + { + dependencies: ["41D32C5178760F47"] + description: ["{quests.high_voltage.multi_structure_terminal.desc}"] + id: "3FC6D346B3EE4A92" + optional: true + shape: "heart" + subtitle: "{quests.high_voltage.multi_structure_terminal.subtitle}" + tasks: [{ + id: "32C53F040A2F0AD8" + item: "gtceuterminal:multi_structure_manager" + type: "item" + }] + x: 5.0d + y: 1.0d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index c22390137..6e5b94f55 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -245,7 +245,7 @@ ] icon: "gtceu:storage_cover" id: "1C767009F505A813" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.cover_behaviour.subtitle}" tasks: [{ @@ -399,7 +399,7 @@ }] title: "{quests.low_voltage.lbb.title}" x: 0.0d - y: -5.5d + y: -6.0d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -1711,7 +1711,7 @@ } { id: "34153032225B76BB" - item: "gtceu:light_fuel_bucket" + item: "gtceu:diesel_bucket" optional_task: true type: "item" } diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index 19b934cac..e41e02230 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1325,7 +1325,7 @@ }] title: "{quests.medium_voltage.mv_jetpack_2.title}" x: 1.5d - y: 5.0d + y: 4.5d } { dependencies: [ @@ -1700,6 +1700,21 @@ x: -5.0d y: 4.0d } + { + dependencies: ["75F38905DEA60F15"] + description: ["{quests.medium_voltage.terminal_dismantler.desc}"] + id: "0053E98892F910BF" + shape: "heart" + subtitle: "{quests.medium_voltage.terminal_dismantler.subtitle}" + tasks: [{ + id: "6AE4D07F675A23D0" + item: "gtceuterminal:dismantler" + type: "item" + }] + title: "{quests.medium_voltage.terminal_dismantler.title}" + x: 1.5d + y: 5.5d + } ] subtitle: ["{quests.medium_voltage.subtitle}"] title: "{quests.medium_voltage}" diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png index 8cca66fc9..922607cf6 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta index 33611385b..c5d457f93 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta @@ -1,45 +1,5 @@ { "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 1 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png index 382800137..465c2a975 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta index 33611385b..c5d457f93 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta @@ -1,45 +1,5 @@ { "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 1 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png index 608ba1eb2..e07a4eaae 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta index 33611385b..c5d457f93 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta @@ -1,45 +1,5 @@ { "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 1 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png index c97f8bf25..e2bd21213 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta index 52c527b88..7e77c6485 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta @@ -1,69 +1,5 @@ { "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 30, - 29, - 28, - 27, - 26, - 25, - 24, - 23, - 22, - 21, - 20, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 2 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png new file mode 100644 index 000000000..ac4f4a457 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png index af5d59697..73eed58e6 100644 Binary files a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png and b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta index 744a3d54c..7e77c6485 100644 --- a/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta @@ -1,87 +1,5 @@ { "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 39, - 38, - 37, - 36, - 35, - 34, - 33, - 32, - 31, - 30, - 29, - 28, - 27, - 26, - 25, - 24, - 23, - 22, - 21, - 20, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] + "frametime": 2 } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/heat_battery_mk1.json b/kubejs/assets/tfg/blockstates/heat_battery_mk1.json new file mode 100644 index 000000000..122553097 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/heat_battery_mk1.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/heat_battery_mk1", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/heat_battery_mk1" + }, + "facing=south": { + "model": "tfg:block/machines/heat_battery_mk1", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/heat_battery_mk1", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_smr_fluid_import_hatch.json b/kubejs/assets/tfg/blockstates/uv_smr_fluid_import_hatch.json new file mode 100644 index 000000000..1a0c17c0a --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_smr_fluid_import_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "x": 90 + }, + "facing=east": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch" + }, + "facing=south": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "x": 270 + }, + "facing=west": { + "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/heat_battery_mk1.json b/kubejs/assets/tfg/models/block/machines/heat_battery_mk1.json new file mode 100644 index 000000000..192e82a14 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/heat_battery_mk1.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:heat_battery_mk1", + "texture_overrides": { + "all": "tfg:block/casings/machine_casing_mars" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_mars", + "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/ports/uv_smr_fluid_import_hatch.json b/kubejs/assets/tfg/models/block/machines/ports/uv_smr_fluid_import_hatch.json new file mode 100644 index 000000000..e98f3a5bb --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/ports/uv_smr_fluid_import_hatch.json @@ -0,0 +1,60 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_smr_fluid_import_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], +"variants": { + "is_formed=false,is_painted=false": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + }, + "is_formed=false,is_painted=true": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive_color_ring", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + }, + "is_formed=true,is_painted=false": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + }, + "is_formed=true,is_painted=true": { + "model": { + "parent": "gtceu:block/machine/template/part/hatch_machine_emissive_color_ring", + "textures": { + "bottom": "tfg:block/casings/machine_casing_desh_ptfe", + "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input", + "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", + "side": "tfg:block/casings/machine_casing_desh_ptfe", + "top": "tfg:block/casings/machine_casing_desh_ptfe" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/smr_generator.json b/kubejs/assets/tfg/models/block/machines/smr_generator.json index bc0f0fd56..c93ec18d9 100644 --- a/kubejs/assets/tfg/models/block/machines/smr_generator.json +++ b/kubejs/assets/tfg/models/block/machines/smr_generator.json @@ -11,8 +11,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive" } } }, @@ -21,8 +21,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive" } } }, @@ -31,8 +31,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } }, @@ -41,8 +41,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } }, @@ -51,8 +51,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive" } } }, @@ -61,8 +61,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive" } } }, @@ -71,8 +71,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } }, @@ -81,8 +81,8 @@ "parent": "gtceu:block/machine/template/cube_all/sided", "textures": { "all": "tfg:block/casings/machine_casing_desh_ptfe", - "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active", - "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive" + "overlay_front": "tfg:block/machines/smr/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive" } } } diff --git a/kubejs/assets/tfg/models/item/americium_241_rod.json b/kubejs/assets/tfg/models/item/americium_241_rod.json new file mode 100644 index 000000000..5647785ec --- /dev/null +++ b/kubejs/assets/tfg/models/item/americium_241_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/americium_241_rod" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/californium_252_rod.json b/kubejs/assets/tfg/models/item/californium_252_rod.json new file mode 100644 index 000000000..c7dec0bc9 --- /dev/null +++ b/kubejs/assets/tfg/models/item/californium_252_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/californium_252_rod" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_americium_241_rod.json b/kubejs/assets/tfg/models/item/depleted_americium_241_rod.json new file mode 100644 index 000000000..0c53012b8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_americium_241_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/americium_241_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_californium_252_rod.json b/kubejs/assets/tfg/models/item/depleted_californium_252_rod.json new file mode 100644 index 000000000..8685f9431 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_californium_252_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/californium_252_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_neptunium_237_rod.json b/kubejs/assets/tfg/models/item/depleted_neptunium_237_rod.json new file mode 100644 index 000000000..c3858803d --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_neptunium_237_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/neptunium_237_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_plutonium_rod.json b/kubejs/assets/tfg/models/item/depleted_plutonium_rod.json new file mode 100644 index 000000000..c2e5668d3 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_plutonium_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/plutonium_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_tbu_232_rod.json b/kubejs/assets/tfg/models/item/depleted_tbu_232_rod.json new file mode 100644 index 000000000..975acd1c4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_tbu_232_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/tbu_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_thorium_rod.json b/kubejs/assets/tfg/models/item/depleted_thorium_rod.json new file mode 100644 index 000000000..9736a7e92 --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_thorium_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/thorium_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/depleted_uranium_rod.json b/kubejs/assets/tfg/models/item/depleted_uranium_rod.json new file mode 100644 index 000000000..ed7c2f49d --- /dev/null +++ b/kubejs/assets/tfg/models/item/depleted_uranium_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/uranium_rod_depleted" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/empty_rod.json b/kubejs/assets/tfg/models/item/empty_rod.json index 0c82848b7..6f86608cf 100644 --- a/kubejs/assets/tfg/models/item/empty_rod.json +++ b/kubejs/assets/tfg/models/item/empty_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_empty" + "layer0": "tfg:item/fission_rod/fuel_rod_empty" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/heat_battery_mk1.json b/kubejs/assets/tfg/models/item/heat_battery_mk1.json new file mode 100644 index 000000000..7139bdd09 --- /dev/null +++ b/kubejs/assets/tfg/models/item/heat_battery_mk1.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/heat_battery_mk1" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/neptunium_237_rod.json b/kubejs/assets/tfg/models/item/neptunium_237_rod.json new file mode 100644 index 000000000..7ece2461b --- /dev/null +++ b/kubejs/assets/tfg/models/item/neptunium_237_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/fission_rod/neptunium_237_rod" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/plutonium_rod.json b/kubejs/assets/tfg/models/item/plutonium_rod.json index 76dd6a707..3cfe34120 100644 --- a/kubejs/assets/tfg/models/item/plutonium_rod.json +++ b/kubejs/assets/tfg/models/item/plutonium_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_p_1" + "layer0": "tfg:item/fission_rod/plutonium_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tbu_232_rod.json b/kubejs/assets/tfg/models/item/tbu_232_rod.json index 241ac0772..c90b8cc85 100644 --- a/kubejs/assets/tfg/models/item/tbu_232_rod.json +++ b/kubejs/assets/tfg/models/item/tbu_232_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_t_1" + "layer0": "tfg:item/fission_rod/tbu_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/thorium_rod.json b/kubejs/assets/tfg/models/item/thorium_rod.json index e2c341ca3..5dc1c3346 100644 --- a/kubejs/assets/tfg/models/item/thorium_rod.json +++ b/kubejs/assets/tfg/models/item/thorium_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_tbu_1" + "layer0": "tfg:item/fission_rod/thorium_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uranium_rod.json b/kubejs/assets/tfg/models/item/uranium_rod.json index 38ff09542..b7c271b05 100644 --- a/kubejs/assets/tfg/models/item/uranium_rod.json +++ b/kubejs/assets/tfg/models/item/uranium_rod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "tfg:item/fuel_rod_u_1" + "layer0": "tfg:item/fission_rod/uranium_rod" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_smr_fluid_import_hatch.json b/kubejs/assets/tfg/models/item/uv_smr_fluid_import_hatch.json new file mode 100644 index 000000000..195e11671 --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_smr_fluid_import_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/ports/uv_smr_fluid_import_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png new file mode 100644 index 000000000..3298cf862 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png new file mode 100644 index 000000000..9cb8b9334 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png new file mode 100644 index 000000000..09b1be1b5 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png new file mode 100644 index 000000000..2557a2a77 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png new file mode 100644 index 000000000..6c6b8a81c Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png new file mode 100644 index 000000000..bed9acfb9 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png new file mode 100644 index 000000000..75e4810f9 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png new file mode 100644 index 000000000..cb395e53b Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png new file mode 100644 index 000000000..caa9486f4 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png new file mode 100644 index 000000000..953666c32 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png new file mode 100644 index 000000000..90182bea6 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png new file mode 100644 index 000000000..c642b4d56 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png new file mode 100644 index 000000000..fe0d8baa2 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png differ diff --git a/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png.mcmeta b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png.mcmeta new file mode 100644 index 000000000..c5d457f93 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front.png new file mode 100644 index 000000000..c8c8cb394 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png new file mode 100644 index 000000000..f57aa76ce Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png.mcmeta new file mode 100644 index 000000000..7e77c6485 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_paused.png b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_paused.png new file mode 100644 index 000000000..690c4d1ff Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/smr/overlay_front_paused.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png new file mode 100644 index 000000000..4a5e30105 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png new file mode 100644 index 000000000..07b5a7391 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png new file mode 100644 index 000000000..2863308b1 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png new file mode 100644 index 000000000..a6bfa1a0c Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_empty.png b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_empty.png rename to kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty.png diff --git a/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t2.png b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t2.png new file mode 100644 index 000000000..3d64d1165 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t2.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t3.png b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t3.png new file mode 100644 index 000000000..f2738e5c9 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/fuel_rod_empty_t3.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png new file mode 100644 index 000000000..f6ac41254 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png new file mode 100644 index 000000000..8c815ec20 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_1.png rename to kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png new file mode 100644 index 000000000..271d22fe1 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png new file mode 100644 index 000000000..b1e4cacbb Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/tbu_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png new file mode 100644 index 000000000..2204301ea Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png rename to kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/thorium_rod.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png new file mode 100644 index 000000000..0822e8bbf Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_p_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_p_4.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_t_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_t_4.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_1.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_2.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_tbu_4.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_2.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_4.png.mcmeta rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_2.png.mcmeta diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_4.png rename to kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png diff --git a/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/unused/fuel_rod_u_4.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png similarity index 100% rename from kubejs/assets/tfg/textures/item/fuel_rod_u_1.png rename to kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png diff --git a/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png new file mode 100644 index 000000000..498d4f5eb Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png differ diff --git a/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png.mcmeta b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png.mcmeta new file mode 100644 index 000000000..cc8a1f3c9 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fission_rod/uranium_rod_depleted.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png b/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png deleted file mode 100644 index a351e0e9a..000000000 Binary files a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png new file mode 100644 index 000000000..5badacb27 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png differ diff --git a/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png.mcmeta b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/kubejs/assets/tfg/textures/item/terrafirmaguard_pa6.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index c4f97d7d6..9800c0024 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -382,6 +382,9 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:refrigerant_pellet'], (item, advanced, text) => { text.add(1, Text.translate("tfg.tooltip.component.refrigerant_pellet")) }) + event.addAdvanced(['tfg:terrafirmaguard_pa6'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.component.refrigerant_pellet")) + }) event.addAdvanced(['tfg:nuclear_turbine'], (item, advanced, text) => { text.add(1, Text.translate("tfg.tooltip.component.nuclear_turbine_1")); diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 1af670f68..6436c7d05 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -79,7 +79,9 @@ const registerGTCEURecipes = (event) => { //#endregion - // #region Move MV superconductor to mid-late MV instead of post-vac freezer + // #region Superconductor + + // Move MV superconductor to mid-late MV instead of post-vac freezer event.remove({ id: 'gtceu:shaped/mv_chemical_bath' }) event.shaped('gtceu:mv_chemical_bath', [ @@ -111,6 +113,28 @@ const registerGTCEURecipes = (event) => { .duration(400) .EUt(GTValues.VA[GTValues.MV]) + // Move EV to after Uranium Reactor + + event.remove({ id: 'gtceu:mixer/uranium_triplatinum' }) + event.recipes.gtceu.mixer('tfg:uranium_triplatinum') + .itemInputs(Item.of('gtceu:uranium_dust', 1), Item.of('gtceu:platinum_dust', 3)) + .inputFluids(Fluid.of('gtceu:radon', 10)) + .itemOutputs(Item.of('gtceu:uranium_triplatinum_dust', 4)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(4) + + // Move Superconductor to EV and make them cheap + + event.remove({ id: 'gtceu:assembler/laser_cable' }) + event.recipes.gtceu.assembler('tfg:laser_cable') + .itemInputs(Item.of('gtceu:laminated_glass', 1), Item.of('2x #forge:foils/ostrum_iodide', 2)) + .itemOutputs(Item.of('gtceu:normal_laser_pipe', 16)) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144)) + .duration(20*5) + .EUt(GTValues.VA[GTValues.EV]) + .cleanroom(CleanroomType.CLEANROOM) + // #endregion //#region Voiding covers @@ -425,4 +449,5 @@ const registerGTCEURecipes = (event) => { event.shapeless('gtceu:magnetic_iron_ingot', ['#forge:ingots/iron', '8x minecraft:redstone']) event.shapeless('gtceu:magnetic_iron_plate', ['#forge:plates/iron', '8x minecraft:redstone']) event.shapeless('gtceu:magnetic_iron_bolt', ['#forge:bolts/iron', '2x minecraft:redstone']) + } diff --git a/kubejs/server_scripts/gtceu_terminal/recipes.js b/kubejs/server_scripts/gtceu_terminal/recipes.js new file mode 100644 index 000000000..80f8b792a --- /dev/null +++ b/kubejs/server_scripts/gtceu_terminal/recipes.js @@ -0,0 +1,50 @@ +function registerGTCEUTerminal(event) { + + + // Gregtech CEu Terminals Integration + + //event.remove({ id : 'gtceuterminal:dismantler' }) + event.shaped('1x gtceuterminal:dismantler', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:mv_sensor', + B: 'gtceu:mv_emitter', + C: '#gtceu:circuits/mv', + D: 'gtceu:computer_monitor_cover', + E: 'gtceu:mv_voltage_coil', + F: '#forge:plates/aluminium' + }).id(`tfg:shaped/dismantler`) + + event.remove({ id : 'gtceuterminal:multi_structure_manager' }) + event.shaped('1x gtceuterminal:multi_structure_manager', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:hv_sensor', + B: 'gtceu:hv_emitter', + C: '#gtceu:circuits/hv', + D: 'gtceu:terminal', + E: '#gtceu:batteries/hv', + F: '#forge:plates/stainless_steel' + }).id(`tfg:shaped/multi_structure_manager`) + + event.remove({ id : 'gtceuterminal:schematic_interface' }) + /* Broken for now as it can duplicate resources in the I/O Ports + event.shaped('1x gtceuterminal:schematic_interface', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:iv_sensor', + B: 'gtceu:iv_emitter', + C: '#gtceu:circuits/iv', + D: 'gtceu:terminal', + E: '#gtceu:batteries/iv', + F: '#forge:plates/tungsten_steel' + }).id(`tfg:shaped/schematic_interface`) + */ + + } \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index f29efde72..7ce704580 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -255,6 +255,7 @@ ServerEvents.recipes(event => { registerGrapplingHookRecipes(event); registerGreateRecipes(event) registerGTCEURecipes(event); + registerGTCEUTerminal(event) registerHandGliderRecipes(event) registerHotOrNotRecipes(event) registerImmersiveAircraftRecipes(event) diff --git a/kubejs/server_scripts/tfg/machines/recipes.casings.js b/kubejs/server_scripts/tfg/machines/recipes.casings.js index b240e469f..199fa44a9 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.casings.js +++ b/kubejs/server_scripts/tfg/machines/recipes.casings.js @@ -131,7 +131,7 @@ function registerTFGCasingRecipes(event) { // Ostrum Linear Acclerator event.recipes.gtceu.assembler('tfg:casings/machine_casing_mars') .itemInputs('gtceu:clean_machine_casing', '4x #forge:double_wires/kanthal') - .inputFluids(Fluid.of('gtceu:polybenzimidazole', 288)) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288)) .itemOutputs('tfg:casings/machine_casing_mars') .circuit(6) .duration(2.5 * 20) @@ -145,6 +145,34 @@ function registerTFGCasingRecipes(event) { .duration(2.5 * 20) .EUt(GTValues.VA[GTValues.HV]) + // Heat Battery deafission:battery_heat_port_ev + + event.recipes.gtceu.assembler('tfg:battery_heat_port_ev') + .itemInputs(Item.of('gtceu:iv_machine_hull', 1), Item.of('gtceu:rtm_alloy_coil_block'), Item.of('gtceu:silicon_plate', 6)) + .inputFluids(Fluid.of('gtceu:mercury', 4000)) + .itemOutputs('deafission:battery_heat_port_ev') + //.circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.EV]) + + // Small Modular Turbine + + event.recipes.gtceu.assembler('tfg:machine_casing_desh_ptfe') + .itemInputs('4x #forge:dense_plates/desh', '2x #forge:dense_plates/lead', Item.of('gtceu:hsla_steel_frame')) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288)) + .itemOutputs('tfg:casings/machine_casing_desh_ptfe') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('tfg:uv_smr_fluid_import_hatch') + .itemInputs('4x #forge:dense_plates/desh', '2x #forge:dense_plates/lead', Item.of('gtceu:iv_input_hatch', 1)) + .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288)) + .itemOutputs('tfg:uv_smr_fluid_import_hatch') + //.circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.EV]) + // Vacuum Intake event.shaped('tfg:casings/machine_casing_vacuum_engine_intake', [ 'USU', diff --git a/kubejs/server_scripts/tfg/machines/recipes.coils.js b/kubejs/server_scripts/tfg/machines/recipes.coils.js index 850945e8d..44a47b9e5 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.coils.js +++ b/kubejs/server_scripts/tfg/machines/recipes.coils.js @@ -74,4 +74,21 @@ function registerTFGCoilRecipes(event) { .addMaterialInfo(true, true) // #endregion + + // #region RTM Coil + + event.remove({ id : 'gtceu:assembler/coil_rtm_alloy' }) + event.recipes.gtceu.assembler('tfg:coil_rtm_alloy') + .itemInputs('8x #forge:double_wires/rtm_alloy', '8x #forge:foils/vanadium_steel', '#forge:insulation_t2/sheet') + .inputFluids('tfg:nichromium_iodomethylate 244') + .itemOutputs('gtceu:rtm_alloy_coil_block') + .duration(20 * 25) + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true, true) + + event.recipes.gtceu.mixer('tfg:nichromium_iodomethylate') + .inputFluids(Fluid.of('gtceu:nichrome', 144), Fluid.of('tfg:iodomethane', 100)) + .outputFluids('tfg:nichromium_iodomethylate 244') + .duration(20 * 8) + .EUt(GTValues.VA[GTValues.HV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 3b40a47da..b5a1d9298 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -120,13 +120,26 @@ function registerTFGMultiblockRecipes(event) { 'PTP' ], { S: 'tfg:casings/machine_casing_vacuum_engine_intake', - Z: 'gtceu:iv_machine_hull', - W: '#gtceu:circuits/iv', + Z: 'gtceu:ev_machine_hull', + W: '#gtceu:circuits/ev', U: '#forge:double_plates/stellite_100', - T: '#forge:single_cables/platinum', - P: 'gtceu:iv_electric_pump' + T: '#forge:single_cables/aluminium', + P: 'gtceu:ev_electric_pump' }).addMaterialInfo().id('tfg:shaped/ostrum_linear_accelerator') + event.recipes.gtceu.shaped('tfg:heat_battery_mk1', [ + 'USU', + 'WZW', + 'PTP' + ], { + S: 'tfg:casings/heat_pipe_casing', + Z: 'gtceu:ev_machine_hull', + W: '#gtceu:circuits/ev', + U: '#forge:dense_plates/silicon', + T: '#forge:single_cables/aluminium', + P: 'gtceu:hv_field_generator' + }).addMaterialInfo().id('tfg:shaped/heat_battery_mk1') + event.recipes.gtceu.assembler('tfg:ostrum_harvester') .itemInputs( '1x gtceu:ev_machine_hull', @@ -175,6 +188,28 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull' }).addMaterialInfo().id('tfg:shaped/fission_reactor_mk1') + event.recipes.gtceu.shaped('deafission:fission_reactor_smr1', [ + 'TUT', + 'WZW', + 'TUT' + ], { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/iv', + U: 'gtceu:ev_field_generator', + Z: 'gtceu:iv_machine_hull' + }).addMaterialInfo().id('tfg:shaped/fission_reactor_smr1') + + event.recipes.gtceu.shaped('tfg:smr_generator', [ + 'TUT', + 'WZW', + 'TUT' + ], { + T: 'tfg:casings/machine_casing_desh_ptfe', + W: '#gtceu:circuits/iv', + U: 'gtceu:ev_field_generator', + Z: 'gtceu:iv_machine_hull' + }).addMaterialInfo().id('tfg:shaped/smr_generator') + event.recipes.gtceu.shaped('gtceu:nuclear_fuel_factory', [ 'TUT', 'WZW', @@ -227,8 +262,8 @@ function registerTFGMultiblockRecipes(event) { event.remove({output: 'gtceu:active_transformer'}) event.recipes.gtceu.assembler('tfg:active_power_transformer') - .itemInputs('1x gtceu:iv_transformer_1a', '1x #gtceu:circuits/iv', '8x gtceu:uranium_triplatinum_single_wire', - '2x gtceu:hpic_chip') + .itemInputs('1x gtceu:ev_transformer_1a', '1x #gtceu:circuits/ev', '8x gtceu:uranium_triplatinum_single_wire', + '2x gtceu:mpic_chip') .inputFluids(Fluid.of('gtceu:ostrum_iodide', 288)) .itemOutputs('tfg:active_power_transformer') .duration(300) diff --git a/kubejs/server_scripts/tfg/mars/recipes.ostrum.js b/kubejs/server_scripts/tfg/mars/recipes.ostrum.js index 7aa0cdffd..bf4ff9dbc 100644 --- a/kubejs/server_scripts/tfg/mars/recipes.ostrum.js +++ b/kubejs/server_scripts/tfg/mars/recipes.ostrum.js @@ -2,8 +2,8 @@ function registerTFGMarsOstrumRecipes(event) { - var $HeatRecipeCapability = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatRecipeCapability"); - var $HeatIngredient = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatIngredient"); + const $HeatRecipeCapability = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatRecipeCapability"); + const $HeatIngredient = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatIngredient"); const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') // Ostrum Harvester @@ -18,7 +18,7 @@ function registerTFGMarsOstrumRecipes(event) { .EUt(GTValues.VA[GTValues.LV]); // Ostrum Linear Accelerator Recipes - +/* event.recipes.gtceu.ostrum_linear_accelerator('tfg:ostrum_transformation') .inputFluids('gtceu:residual_radioactive_concoction 100') .itemInputs('32x #forge:dusts/ostrum') @@ -62,13 +62,13 @@ function registerTFGMarsOstrumRecipes(event) { .dimension('ad_astra:mars') .duration(20 * 5) .EUt(GTValues.VA[GTValues.IV]); - +*/ // Ostrum Linear Accelerator Recipes // .input($HeatRecipeCapability.CAP, new $HeatIngredient(X, Y)) where X is Minimal Temperature to run and where Y is HU consummed per craft - /* + event.recipes.gtceu.ostrum_linear_accelerator('tfg:ostrum_transformation') - .inputFluids('gtceu:residual_radioactive_concoction 100') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) .itemInputs('32x #forge:dusts/ostrum') .chancedFluidOutputLogic($ChanceLogic.XOR) .chancedFluidOutput('gtceu:lightweight_ostrum_vapor', 6000, 0) @@ -77,46 +77,49 @@ function registerTFGMarsOstrumRecipes(event) { .dimension('ad_astra:mars') .duration(20 * 5) .EUt(GTValues.VA[GTValues.EV]); + + //#region Light Ostrum Vapor event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t1') .perTick(true) - .inputFluids('gtceu:residual_radioactive_concoction 1') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) .perTick(false) .inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000)) .inputFluids(Fluid.of('gtceu:radon', 10)) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10) - .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 10) - //.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 5) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 2) + .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 2) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 2) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 5) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100)) .dimension('ad_astra:mars') - .duration(20 * 20) + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.EV]) .circuit(1); event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t2') .perTick(true) - .inputFluids('gtceu:residual_radioactive_concoction 1') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) .inputFluids(Fluid.of('tfg:semiheavy_water', 1)) .perTick(false) .inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000)) .inputFluids(Fluid.of('gtceu:radon', 10)) .inputFluids(Fluid.of('gtceu:krypton', 10)) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 10, 20) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10) - .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 3) + .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 3) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 3) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 3) .itemOutputsRanged(Item.of('gtceu:dusty_raw_pitchblende'), 1, 10) - //.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100)) .dimension('ad_astra:mars') - .duration(20 * 20) - .EUt(GTValues.VA[GTValues.IV]) + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.EV]) .circuit(2); event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t3') .perTick(true) - .inputFluids('gtceu:residual_radioactive_concoction 1') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) .inputFluids(Fluid.of('tfg:semiheavy_water', 1)) .perTick(false) .inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000)) @@ -124,17 +127,108 @@ function registerTFGMarsOstrumRecipes(event) { .inputFluids(Fluid.of('gtceu:krypton', 10)) .inputFluids(Fluid.of('gtceu:tritiated_water', 10)) .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 10, 20) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10) - .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10) - .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 10, 10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 5) + .itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 5) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 5) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 5) .itemOutputsRanged(Item.of('gtceu:dusty_raw_pitchblende'), 10, 20) - .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100)) .dimension('ad_astra:mars') - .duration(20 * 20) - .EUt(GTValues.VA[GTValues.IV]) + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.EV]) .circuit(3); - */ + //#endregion + //#region Ostrum Vapor + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:polyalkylene_lubricant') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000)) + .inputFluids(Fluid.of('gtceu:ethylene', 1000)) + .inputFluids(Fluid.of('gtceu:lubricant', 1000)) + .outputFluids(Fluid.of('tfg:polyalkylene_lubricant', 1000)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 1500)) + .dimension('ad_astra:mars') + .duration(20 * 150) + .EUt(GTValues.VA[GTValues.IV]) + //.circuit(3); + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:caesium_137') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000)) + .inputFluids(Fluid.of('gtceu:radon', 1000)) + .itemInputs(Item.of('gtceu:caesium_dust', 64)) + .itemOutputs(Item.of('#forge:dusts/caesium_137')) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 1500)) + .dimension('ad_astra:mars') + .duration(20 * 150) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:terrafirmaguard_pa6') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000)) + .itemInputs(Item.of('tfg:polycaprolactam_fabric', 64)) + .itemInputs(Item.of('tfg:refrigerant_pellet', 8)) + .itemInputs(Item.of('gtceu:iodine_dust', 1)) + .itemOutputs(Item.of('tfg:terrafirmaguard_pa6', 32)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 100)) + .dimension('ad_astra:mars') + .duration(20 * 120) + .EUt(GTValues.VA[GTValues.IV]) + + //#endregion + + //#region Dense Ostrum Vapor + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:radioactive_effluent') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000)) + .itemInputs(Item.of('#forge:dusts/caesium_137', 1)) + .itemInputs(Item.of('gtceu:cobalt_dust', 8)) + .outputFluids(Fluid.of('tfg:radioactive_effluent', 512)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(500, 1600)) + .dimension('ad_astra:mars') + .duration(20 * 240) + .EUt(GTValues.VA[GTValues.LuV]) + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:tbu_232_rod_ola') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000)) + .inputFluids(Fluid.of('gtceu:radioactive_waste', 128000)) + .inputFluids(Fluid.of('gtceu:tritiated_water', 41472)) + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs('16x #forge:rods/long/thorium_230') + .itemInputs(Item.of('tfg:empty_rod_t2', 1)) + .itemOutputs(Item.of('tfg:tbu_232_rod', 1)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500)) + .dimension('ad_astra:mars') + .duration(20 * 640) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.ostrum_linear_accelerator('tfg:dense_to_light') + .perTick(true) + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1)) + .perTick(false) + .inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000)) + .outputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor', 1000)) + .input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 100)) + .dimension('ad_astra:mars') + .duration(20 * 240) + .EUt(GTValues.VA[GTValues.IV]) + .circuit(4) + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js index 46cf556da..5bee23fd5 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.components.js @@ -33,9 +33,11 @@ function registerTFGNuclearComponentsRecipes(event) { component("HEAT", "tfg:aes_insulation_frame", 1); component("HEAT", "tfg:moderate_core_frame", 10); component("HEAT", "tfg:impure_moderate_core_frame", 5); -/* - componentThermal('THERMAL', 'minecraft:sand', 1000, 25); - componentThermal('THERMAL', 'tfg:impure_moderate_core_frame', 2000, 50); - componentThermal('THERMAL', 'minecraft:bedrock', 9001, 1e5); -*/ + //component("HEAT", "minecraft:bedrock", 1000); + + //componentThermal('THERMAL', '#forge:sand', 1000, 1); + componentThermal('THERMAL', 'tfg:impure_moderate_core_frame', 2000, 10); + componentThermal('THERMAL', 'tfg:moderate_core_frame', 4000, 10); + //componentThermal('THERMAL', 'minecraft:bedrock', 9001, 10); + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index fca0005e1..28e2af5be 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -30,47 +30,132 @@ function registerTFGNuclearRecipes(event) { //#region Nuclear Pellet - event.recipes.gtceu.nuclear_fuel_factory('tfg:thorium_pellet') - .itemInputs('16x #forge:rods/thorium_230', '32x #forge:rods/thorium_232', - '32x #forge:rods/thorium_232', '32x #forge:rods/thorium_232', '32x #forge:rods/thorium_232', - 'tfg:empty_rod') - .itemOutputs('tfg:thorium_rod') - .duration(20*200) - .EUt(GTValues.VA[GTValues.HV]) - .dimension('ad_astra:mars') + const nuclearFuelRecipes = [ + { + id: 'tfg:thorium_pellet', + itemInputs: [ + '16x #forge:rods/thorium_230', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + 'tfg:empty_rod' + ], + itemOutputs: 'tfg:thorium_rod', + duration: 20 * 200, + eut: GTValues.VA[GTValues.HV] + }, - event.recipes.gtceu.nuclear_fuel_factory('tfg:uranium_pellet') - .inputFluids(Fluid.of('gtceu:radioactive_waste', 10000)) - .itemInputs('16x #forge:rods/uranium_235', '32x #forge:rods/uranium', '32x #forge:rods/uranium', - '32x #forge:rods/uranium', '32x #forge:rods/uranium', 'tfg:empty_rod') - .itemOutputs('tfg:uranium_rod') - .duration(20*600) - .EUt(GTValues.VA[GTValues.HV]) - .dimension('ad_astra:mars') + { + id: 'tfg:uranium_pellet', + itemInputs: [ + '16x #forge:rods/uranium_235', + '32x #forge:rods/uranium', + '32x #forge:rods/uranium', + '32x #forge:rods/uranium', + '32x #forge:rods/uranium', + 'tfg:empty_rod' + ], + inputFluids: Fluid.of('gtceu:radioactive_waste', 10000), + itemOutputs: 'tfg:uranium_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.HV] + }, - event.recipes.gtceu.nuclear_fuel_factory('tfg:plutonium_pellet') - .itemInputs('32x #forge:rods/plutonium', '32x #forge:rods/plutonium', '32x #forge:rods/plutonium', - '32x #forge:rods/plutonium', 'tfg:empty_rod') - .inputFluids(Fluid.of('gtceu:radon', 100)) - .itemOutputs('tfg:plutonium_rod') - .duration(20*600) - .EUt(GTValues.VA[GTValues.EV]) - .dimension('ad_astra:mars') -/* - event.recipes.gtceu.nuclear_fuel_factory('tfg:tbu_232_rod') - .inputFluids(Fluid.of('gtceu:nuclear_waste', 32000)) - .itemInputs('2x #forge:rods/thorium_232', 'tfg:empty_rod') - .itemOutputs('tfg:tbu_232_rod') - .duration(20*300) - .EUt(GTValues.V[GTValues.IV]) + { + id: 'tfg:plutonium_pellet', + itemInputs: [ + '32x #forge:rods/plutonium', + '32x #forge:rods/plutonium', + '32x #forge:rods/plutonium', + '32x #forge:rods/plutonium', + 'tfg:empty_rod' + ], + inputFluids: Fluid.of('gtceu:radon', 100), + itemOutputs: 'tfg:plutonium_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.EV] + }, + + { + id: 'tfg:americium_pellet', + itemInputs: [ + '32x #forge:rods/americium_241', + '32x #forge:rods/americium_241', + 'tfg:empty_rod_t2' + ], + inputFluids: Fluid.of('gtceu:radon', 100), + itemOutputs: 'tfg:americium_241_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.IV] + }, + + { + id: 'tfg:neptunium_pellet', + itemInputs: [ + '32x #forge:rods/neptunium_237', + '32x #forge:rods/neptunium_237', + 'tfg:empty_rod_t2' + ], + inputFluids: Fluid.of('gtceu:radon', 100), + itemOutputs: 'tfg:neptunium_237_rod', + duration: 20 * 600, + eut: GTValues.VA[GTValues.IV] + }, + + { + id: 'tfg:tbu_232_rod_recycle', + itemInputs: [ + '16x #forge:rods/long/thorium_230', + '16x #forge:rods/long/thorium_230', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + '32x #forge:rods/thorium_232', + 'tfg:empty_rod_t2' + ], + inputFluids: Fluid.of('tfg:tbu_waste', 8000), + itemOutputs: 'tfg:tbu_232_rod', + duration: 20 * 300, + eut: GTValues.VA[GTValues.IV] + } + ] + + nuclearFuelRecipes.forEach(r => { + let recipe = event.recipes.gtceu.nuclear_fuel_factory(r.id) + .itemInputs(r.itemInputs) + .itemOutputs(r.itemOutputs) + .duration(r.duration) + .EUt(r.eut) + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(recipe, true) + + if (r.inputFluids) { + recipe.inputFluids(r.inputFluids) + } + }) + + + event.recipes.gtceu.assembler('tfg:empty_rod') + .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/maraging_steel_300') + .itemOutputs('tfg:empty_rod') + .duration(20*15) + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) + + event.recipes.gtceu.assembler('tfg:empty_rod_t2') + .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/beryllium') + .itemOutputs('tfg:empty_rod_t2') + .duration(20*15) + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) +/* HIDE UNTIL VENUS IV - COMMENT OUT + event.recipes.gtceu.assembler('tfg:empty_rod_t3') + .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/zirconium') + .itemOutputs('tfg:empty_rod_t3') + .duration(20*15) + .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) */ - event.recipes.gtceu.assembler('tfg:empty_rod') - .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '3x gtceu:lead_huge_fluid_pipe') - .itemOutputs('tfg:empty_rod') - .duration(20*15) - .EUt(GTValues.VA[GTValues.HV]) - .addMaterialInfo(true) - //#endregion //#region Processing Fuels @@ -181,24 +266,24 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.heat_exchanger('plutonium_steam') .perTick(true) .inputFluids(Fluid.of('minecraft:water', 10)) - .inputFluids(Fluid.of('gtceu:irradiated_steam', 1600)) - .outputFluids(Fluid.of('gtceu:dense_steam', 1600)) + .inputFluids(Fluid.of('gtceu:irradiated_steam', 3200)) + .outputFluids(Fluid.of('gtceu:dense_steam', 6400)) .perTick(false) .duration(20*5) .EUt(1) .dimension('ad_astra:mars') // Heat Exchanger for Energy - +/* event.recipes.gtceu.heat_exchanger('flibe_cooling') - .inputFluids(Fluid.of('gtceu:hot_flibe', 10)) + .inputFluids(Fluid.of('tfg:hot_flibe', 10)) .inputFluids(Fluid.of('gtceu:distilled_water', 10)) .chancedFluidInput(Fluid.of('gtceu:hastelloy_c_276', 10), 5000, 0) - .chancedFluidOutput(Fluid.of('gtceu:flibe', 10), 9500, 0) + .chancedFluidOutput(Fluid.of('tfg:flibe', 10), 9500, 0) .outputFluids(Fluid.of('gtceu:dense_steam', 10)) .duration(20*10) .EUt(1) - +*/ //#endregion //#region Fission Reactor @@ -206,15 +291,15 @@ function registerTFGNuclearRecipes(event) { // Thorium Fission event.recipes.deafission.fission_reactor_fuel('tfg:thorium') - .itemInputs(Item.of('tfg:thorium_rod')) - .outputFluids(Fluid.of('gtceu:radioactive_waste', 2500)) - .itemOutputs(Item.of('tfg:empty_rod')) - .dimension('ad_astra:mars') - .hideDuration(true) - .dimension('ad_astra:mars') + .itemInputs(Item.of('tfg:thorium_rod')) + .itemOutputs(Item.of('tfg:depleted_thorium_rod')) + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(5000 / 0.4 / 0.7) + .dimension('ad_astra:mars'); event.recipes.deafission.fission_reactor_coolant('tfg:thorium_coolant') - .notConsumable(Item.of('tfg:thorium_rod')) + .itemInputs(Item.of('tfg:thorium_rod')) .perTick(true) .inputFluids(Fluid.of('tfg:heavy_water', 2)) .outputFluids(Fluid.of('gtceu:dense_steam', 480)) @@ -226,14 +311,15 @@ function registerTFGNuclearRecipes(event) { // Uranium Fission event.recipes.deafission.fission_reactor_fuel('tfg:uranium') - .itemInputs(Item.of('tfg:uranium_rod')) - .outputFluids(Fluid.of('gtceu:uranium_waste', 50000)) - .itemOutputs(Item.of('tfg:empty_rod')) - .hideDuration(true) - .dimension('ad_astra:mars') + .itemInputs(Item.of('tfg:uranium_rod')) + .itemOutputs(Item.of('tfg:depleted_uranium_rod')) + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(20000 / 0.4 / 2.2) + .dimension('ad_astra:mars'); event.recipes.deafission.fission_reactor_coolant('tfg:uranium_coolant') - .notConsumable(Item.of('tfg:uranium_rod')) + .itemInputs(Item.of('tfg:uranium_rod')) .perTick(true) .inputFluids(Fluid.of('tfg:heavy_water', 20)) .outputFluids(Fluid.of('gtceu:radioactive_steam', 1600)) @@ -245,42 +331,257 @@ function registerTFGNuclearRecipes(event) { // Plutonium Fission event.recipes.deafission.fission_reactor_fuel('tfg:plutonium') - .itemInputs(Item.of('tfg:plutonium_rod')) - .outputFluids(Fluid.of('gtceu:tritiated_water', 5184)) - .itemOutputs(Item.of('tfg:empty_rod')) - .hideDuration(true) - .dimension('ad_astra:mars') + .itemInputs(Item.of('tfg:plutonium_rod')) + .itemOutputs(Item.of('tfg:depleted_plutonium_rod')) + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(30000 / 0.4 / 3) + .dimension('ad_astra:mars'); event.recipes.deafission.fission_reactor_coolant('tfg:plutonium_coolant') - .notConsumable(Item.of('tfg:plutonium_rod')) + .itemInputs(Item.of('tfg:plutonium_rod')) .perTick(true) .inputFluids(Fluid.of('tfg:heavy_water', 25)) - .outputFluids(Fluid.of('gtceu:irradiated_steam', 6400)) + .outputFluids(Fluid.of('gtceu:irradiated_steam', 3200)) .perTick(false) .addData("coolant_heat_per_tick", 1) .duration(1) .dimension('ad_astra:mars') // TBU Fission -/* event.recipes.deafission.fission_reactor_fuel('kubejs:fuelcell_custom_x1') .itemInputs('tfg:tbu_232_rod') - .itemOutputs('minecraft:dirt') + .itemOutputs('tfg:depleted_tbu_232_rod') // Mandatory by GT; no real impact. Use this as a convention: // durability / const / heatValue .duration(10000 / 0.4 / 2) .dimension('ad_astra:mars'); - +/* event.recipes.deafission.fission_reactor_coolant('tfg:tbu_coolant') .itemInputs(Ingredient.of([ 'tfg:tbu_232_rod'])) .inputFluids(Fluid.of('tfg:heavy_water', 100)) .outputFluids(Fluid.of('gtceu:dense_steam', 100)) .addData("coolant_heat_per_tick", 12.34) - .duration(1000); -*/ + .duration(1000);*/ + + event.recipes.deafission.fission_reactor_coolant('tfg:tbu_coolant') + .itemInputs(Ingredient.of([ + 'tfg:tbu_232_rod'])) + .perTick(true) + .inputFluids(Fluid.of('tfg:heavy_water', 20)) + .outputFluids(Fluid.of('gtceu:dense_steam', 1200)) + .perTick(false) + .addData("coolant_heat_per_tick", 1) + .duration(1) + .dimension('ad_astra:mars') + + // Neptunium-237 Rod Fission + event.recipes.deafission.fission_reactor_fuel('tfg:neptunium_237') + .itemInputs('tfg:neptunium_237_rod') + .itemOutputs('tfg:depleted_neptunium_237_rod') + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(100000 / 0.4 / 2); + + event.recipes.deafission.fission_reactor_coolant('tfg:boron_enriched_coolant') + .itemInputs( + Ingredient.of(['tfg:neptunium_237_rod', 'tfg:americium_241_rod', 'tfg:californium_252_rod'])) + .inputFluids(Fluid.of('tfg:boron_enriched_coolant', 10*64)) + .outputFluids(Fluid.of('tfg:hot_boron_enriched_coolant', 10*64)) + .addData("coolant_heat_per_tick", 1) + .duration(1); + + // Americium-241 Rod Fission + event.recipes.deafission.fission_reactor_fuel('tfg:americium_241') + .itemInputs('tfg:americium_241_rod') + .itemOutputs('tfg:depleted_americium_241_rod') + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(1000000 / 0.4 / 0.5); + + event.recipes.deafission.fission_reactor_coolant_smr('tfg:americium_241_coolant') + .itemInputs(Ingredient.of([ + 'tfg:americium_241_rod'])) + .inputFluids(Fluid.of('tfg:ticl4_doped_supercritical_co2', 80)) + .outputFluids(Fluid.of('tfg:spent_ticl4_doped_supercritical_co2', 80)) + .addData("coolant_heat_per_tick", 1) + .duration(1); + + // Neptunium-237 Rod Fission + event.recipes.deafission.fission_reactor_fuel('tfg:californium_252_rod') + .itemInputs('tfg:californium_252_rod') + .itemOutputs('tfg:depleted_californium_252_rod') + // Mandatory by GT; no real impact. Use this as a convention: + // durability / const / heatValue + .duration(500000 / 0.4 / 4); + + event.recipes.deafission.fission_reactor_coolant('tfg:flibe_coolant') + .itemInputs( + Ingredient.of(['tfg:californium_252_rod'])) + .inputFluids(Fluid.of('tfg:flibe', 10*64)) + .outputFluids(Fluid.of('tfg:hot_flibe', 10*64)) + .addData("coolant_heat_per_tick", 1) + .duration(1); + //#endregion + //#region Fission Rod Processing + + let a; + + a = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_thorium_rod') + .inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.lt("avgHeat", 800)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:radioactive_waste', 2500)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "799") + TFGRecipeSchemaBindings.isOxygenated(a, true) + + a = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_thorium_rod_average') + .inputItemNbtPredicate('tfg:depleted_thorium_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 800), + NBTPredicates.lt("avgHeat", 3000) + ])) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:radioactive_waste', 1000)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "800") + .addDataString("avgHeat2", "2999") + TFGRecipeSchemaBindings.isOxygenated(a, true) + + a = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_thorium_rod_bad') + .inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 3000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:radioactive_waste', 100)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "3000") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(a, true) + + // Uranium + let b; + + b = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_uranium_rod') + .inputItemNbtPredicate(Item.of('tfg:depleted_uranium_rod'), NBTPredicates.lt("avgHeat", 2000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:uranium_waste', 50000)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "1999") + TFGRecipeSchemaBindings.isOxygenated(b, true) + + b = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_uranium_rod_average') + .inputItemNbtPredicate('tfg:depleted_uranium_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 2000), + NBTPredicates.lt("avgHeat", 3000) + ])) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:uranium_waste', 10000)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "2000") + .addDataString("avgHeat2", "2999") + TFGRecipeSchemaBindings.isOxygenated(b, true) + + b = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_uranium_rod_bad') + .inputItemNbtPredicate(Item.of('tfg:depleted_uranium_rod'), NBTPredicates.gte("avgHeat", 3000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:uranium_waste', 500)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "3000") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(b, true); + + // Plutonium + let c; + + c = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_plutonium_rod') + .inputItemNbtPredicate(Item.of('tfg:depleted_plutonium_rod'), NBTPredicates.lt("avgHeat", 1000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:tritiated_water', 5184)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "999") + TFGRecipeSchemaBindings.isOxygenated(c, true); + + c = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_plutonium_rod_average') + .inputItemNbtPredicate('tfg:depleted_plutonium_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 1000), + NBTPredicates.lt("avgHeat", 3000) + ])) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:tritiated_water', 576)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "1000") + .addDataString("avgHeat2", "2999") + TFGRecipeSchemaBindings.isOxygenated(c, true) + + c = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_plutonium_rod_bad') + .inputItemNbtPredicate(Item.of('tfg:depleted_plutonium_rod'), NBTPredicates.gte("avgHeat", 3000)) + .itemOutputs(Item.of('tfg:empty_rod')) + .outputFluids(Fluid.of('gtceu:tritiated_water', 144)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "3000") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(c, true); + + // Americium - Neptunium - Californium + + let g = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_americium_241_rod') + //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) + .itemInputs(Item.of('tfg:americium_241_rod')) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + //.addDataString("avgHeat1", "5000") + //.addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(g, true); + + let h = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_neptunium_237_rod') + //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) + .itemInputs(Item.of('tfg:neptunium_237_rod')) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + //.addDataString("avgHeat1", "5000") + //.addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(h, true); + + let i = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_californium_252_rod') + //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) + .itemInputs(Item.of('tfg:californium_252_rod')) + .itemOutputs(Item.of('tfg:empty_rod_t3')) + .EUt(GTValues.VA[GTValues.HV]) + .duration(20*16) + .dimension('ad_astra:mars') + //.addDataString("avgHeat1", "5000") + //.addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(i, true); + //#region Fission Recipes for cooling event.recipes.deafission.fission_reactor_processing('tfg:dry_ice') @@ -291,6 +592,12 @@ function registerTFGNuclearRecipes(event) { event.recipes.deafission.fission_reactor_processing('tfg:refrigerant_pellet') .itemInputs('tfg:refrigerant_pellet') + .blastFurnaceTemp(100) + .addData("heat_per_tick", 5) + .duration(20*10) + + event.recipes.deafission.fission_reactor_processing('tfg:terrafirmaguard_pa6') + .itemInputs('tfg:terrafirmaguard_pa6') .blastFurnaceTemp(100) .addData("heat_per_tick", 40) .duration(20*30) @@ -420,17 +727,30 @@ function registerTFGNuclearRecipes(event) { //#endregion - //#region Power Generation + //#region Power Gen event.recipes.gtceu.nuclear_turbine('dense_steam') .inputFluids(Fluid.of('gtceu:dense_steam', 160)) + .outputFluids(Fluid.of('tfg:warm_water', 40)) .EUt(-(32)) .duration(20*1.5) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.smr_generator('tfg:boron_smr') + .inputFluids(Fluid.of('tfg:spent_ticl4_doped_supercritical_co2', 50)) + .outputFluids(Fluid.of('tfg:ticl4_doped_supercritical_co2', 50)) + .EUt(-(32)) + .duration(20) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') //#endregion //#region Cooling Tower - + event.recipes.gtceu.assembler('tfg:ostrum_carbon_casing') .itemInputs('2x #forge:plates/ostrum', '2x #forge:plates/titanium_carbide', '#forge:dense_plates/hsla_steel', '#forge:frames/black_steel') .itemOutputs('2x tfg:casings/machine_casing_ostrum_carbon') @@ -438,7 +758,6 @@ function registerTFGNuclearRecipes(event) { .duration(20 * (2.5)) .EUt(GTValues.VH[GTValues.LV]) .addMaterialInfo(true) - /* event.recipes.gtceu.mixer('tfg:thermally_conductive_fluid') .itemInputs('7x #forge:dusts/gallium', '2x #forge:dusts/tin', '#forge:dusts/zinc') @@ -452,11 +771,9 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('tfg:thermally_conductive_fluid', 1000)) .itemOutputs('tfg:casings/heat_pipe_casing') .circuit(6) - .EUt(GTValues.VA[GTValues.IV] * 2) + .EUt(GTValues.VA[GTValues.IV]) .duration(20*4) - */ - /* event.shaped('tfg:cooling_tower', [ 'ABA', 'CDC', @@ -468,61 +785,338 @@ function registerTFGNuclearRecipes(event) { D: 'gtceu:iv_machine_hull', E: 'gtceu:iv_fluid_regulator' }).id('tfg:shaped/cooling_tower') - */ + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_1') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 1000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 1000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(1) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_2') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 5000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 5000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(2) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_3') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 10000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 10000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(3) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_4') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 50000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 50000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(4) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') + + event.recipes.gtceu.cooling_tower('tfg:warm_into_distilled_5') + .perTick(true) + .inputFluids(Fluid.of('tfg:warm_water', 100000)) + .outputFluids(Fluid.of('gtceu:distilled_water', 100000)) + .perTick(false) + .EUt(1) + .duration(20*60) + .circuit(5) + .dimension('minecraft:overworld') + .dimension('ad_astra:mars') + //.dimension('ad_astra:glacio') //#endregion - /* + + //#region Heat Battery + + event.recipes.deafission.hb_import('tfg:boron_coolant') + .inputFluids(Fluid.of('tfg:hot_boron_enriched_coolant', 3600)) + .outputFluids(Fluid.of('tfg:boron_enriched_coolant', 3600)) + .blastFurnaceTemp(2000) + .addData("hb_energy", 30) +/* + event.recipes.deafission.hb_export('tfg:boron_coolant_to_dense_steam') + .inputFluids(Fluid.of('gtceu:distilled_water', 7200)) + .outputFluids(Fluid.of('gtceu:dense_steam', 28800)) + .blastFurnaceTemp(1000) + .addData("hb_energy", 10) + .circuit(1) +*/ + event.recipes.deafission.hb_export('tfg:boron_coolant_to_dense_steam') + .inputFluids(Fluid.of('gtceu:distilled_water', 28800)) + .outputFluids(Fluid.of('gtceu:dense_steam', 115200)) + .blastFurnaceTemp(1000) + .addData("hb_energy", 40) + //.circuit(2) + event.recipes.deafission.hb_import('tfg:dense_steam') - .inputFluids(Fluid.of('gtceu:dense_steam', 100)) - .outputFluids(Fluid.of('minecraft:water', 10)) - .blastFurnaceTemp(4000) - .addData("hb_energy", 100) - */ + .inputFluids(Fluid.of('gtceu:dense_steam', 20)) + .outputFluids(Fluid.of('minecraft:water', 20)) + .blastFurnaceTemp(1000) + .addData("hb_energy", 20) + + //#endregion + + //#region Processing Depleted TBU + + let j = event.recipes.gtceu.nuclear_fuel_factory('tfg:americium_300_t1') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 0), + NBTPredicates.lte("avgHeat", 100) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('12x gtceu:tiny_americium_241_dust'), 2500, 0) + .chancedOutput(Item.of('16x gtceu:tiny_americium_241_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "0") + .addDataString("avgHeat2", "100") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(j, true); + + let k = event.recipes.gtceu.nuclear_fuel_factory('tfg:americium_300_t2') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 101), + NBTPredicates.lte("avgHeat", 200) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('4x gtceu:tiny_americium_241_dust'), 2500, 0) + .chancedOutput(Item.of('8x gtceu:tiny_americium_241_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "101") + .addDataString("avgHeat2", "200") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(k, true); + + let l = event.recipes.gtceu.nuclear_fuel_factory('tfg:americium_30_t3') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 201), + NBTPredicates.lte("avgHeat", 300) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('1x gtceu:tiny_americium_241_dust'), 2500, 0) + .chancedOutput(Item.of('2x gtceu:tiny_americium_241_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "201") + .addDataString("avgHeat2", "300") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(l, true); + + let m = event.recipes.gtceu.nuclear_fuel_factory('tfg:neptunium_t1') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 301), + NBTPredicates.lte("avgHeat", 400) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('1x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .chancedOutput(Item.of('2x gtceu:tiny_neptunium_237_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "301") + .addDataString("avgHeat2", "400") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(m, true); + + let n = event.recipes.gtceu.nuclear_fuel_factory('tfg:neptunium_t2') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 401), + NBTPredicates.lte("avgHeat", 500) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('4x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .chancedOutput(Item.of('8x gtceu:tiny_neptunium_237_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "401") + .addDataString("avgHeat2", "500") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(n, true); + + let o = event.recipes.gtceu.nuclear_fuel_factory('tfg:neptunium_t3') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 501), + NBTPredicates.lte("avgHeat", 599) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('12x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .chancedOutput(Item.of('16x gtceu:tiny_neptunium_237_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "501") + .addDataString("avgHeat2", "599") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(o, true); + + let p = event.recipes.gtceu.nuclear_fuel_factory('tfg:californium_t1') + .inputFluids(Fluid.of('tfg:high_grade_isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 800), + NBTPredicates.lte("avgHeat", 899) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('gtceu:tiny_californium_252_dust'), 2500, 0) + .chancedOutput(Item.of('2x gtceu:tiny_californium_252_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_high_grade_isotopic_solvent', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "800") + .addDataString("avgHeat2", "899") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(p, true); + + let q = event.recipes.gtceu.nuclear_fuel_factory('tfg:californium_t2') + .inputFluids(Fluid.of('tfg:high_grade_isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 900), + NBTPredicates.lte("avgHeat", 999) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('4x gtceu:tiny_californium_252_dust'), 2500, 0) + .chancedOutput(Item.of('8x gtceu:tiny_californium_252_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_high_grade_isotopic_solvent', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "900") + .addDataString("avgHeat2", "999") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(q, true); + + let r = event.recipes.gtceu.nuclear_fuel_factory('tfg:californium_t3') + .inputFluids(Fluid.of('tfg:high_grade_isotopic_solvent', 64000)) + .inputItemNbtPredicate('tfg:depleted_tbu_232_rod', + NBTPredicates.all([ + NBTPredicates.gte("avgHeat", 1000), + NBTPredicates.lte("avgHeat", 1100) + ])) + .chancedItemOutputLogic($ChanceLogic.OR) + .chancedOutput(Item.of('12x gtceu:tiny_californium_252_dust'), 2500, 0) + .chancedOutput(Item.of('16x gtceu:tiny_californium_252_dust'), 7500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_high_grade_isotopic_solvent', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 8000)) + .duration(20*3) + .EUt(GTValues.VA[GTValues.IV]) + .addDataString("avgHeat1", "1000") + .addDataString("avgHeat2", "1100") + .dimension('ad_astra:mars') + TFGRecipeSchemaBindings.isOxygenated(r, true); + + let s = event.recipes.gtceu.nuclear_fuel_factory('tfg:tbu_overheated') + .inputFluids(Fluid.of('tfg:isotopic_solvent', 64000)) + .inputItemNbtPredicate(Item.of('tfg:depleted_tbu_232_rod'), NBTPredicates.gte("avgHeat", 1101)) + .chancedOutput(Item.of('1x gtceu:tiny_neptunium_237_dust'), 2500, 0) + .itemOutputs(Item.of('tfg:empty_rod_t2')) + .outputFluids(Fluid.of('tfg:degraded_solvent_stream', 64000)) + .outputFluids(Fluid.of('tfg:tbu_waste', 4000)) + .EUt(GTValues.VA[GTValues.IV]) + .duration(20*16) + .dimension('ad_astra:mars') + .addDataString("avgHeat1", "1101") + .addDataString("avgHeat2", "∞") + TFGRecipeSchemaBindings.isOxygenated(s, true); + //#region FLiBe Line - SCRAP FROM MARS TO VENUS - - /* - +/* event.recipes.gtceu.evaporation_tower('raw_rich_brine_earth') .inputFluids(Fluid.of('tfc:spring_water', 20000)) - .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .outputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.evaporation_tower('raw_rich_brine_mars') .inputFluids(Fluid.of('tfg:heavy_ammoniacal_water', 20000)) - .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .outputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.chemical_reactor('hydrogen_iodide_to_hot_iodine_brine') .inputFluids(Fluid.of('gtceu:hydrogen_iodide', 1000)) - .inputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .inputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .outputFluids(Fluid.of('gtceu:sodium_potassium', 1000)) - .outputFluids(Fluid.of('gtceu:hot_iodine_brine', 1000)) + .outputFluids(Fluid.of('tfg:hot_iodine_brine', 1000)) .duration(20*24) .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.large_chemical_reactor('basic_bromine_exhaust_to_hot_iodine_brine') - .inputFluids(Fluid.of('gtceu:basic_bromine_exhaust', 1000)) - .inputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .inputFluids(Fluid.of('tfg:basic_bromine_exhaust', 1000)) + .inputFluids(Fluid.of('tfg:raw_rich_brine', 1000)) .outputFluids(Fluid.of('gtceu:sodium_potassium', 1000)) - .outputFluids(Fluid.of('gtceu:hot_iodine_brine', 1000)) + .outputFluids(Fluid.of('tfg:hot_iodine_brine', 1000)) .outputFluids(Fluid.of('gtceu:steam', 1000)) .duration(20*30) .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.evaporation_tower('brominated_iodine_vapor') - .inputFluids(Fluid.of('gtceu:hot_iodine_brine', 10000)) + .inputFluids(Fluid.of('tfg:hot_iodine_brine', 10000)) .itemOutputs('#forge:dusts/magnesium_chloride') - .outputFluids(Fluid.of('gtceu:brominated_iodine_vapor', 1000)) + .outputFluids(Fluid.of('tfg:brominated_iodine_vapor', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.chemical_reactor('lithium_carbonate') - .inputFluids(Fluid.of('gtceu:brominated_iodine_vapor', 1000)) + .inputFluids(Fluid.of('tfg:brominated_iodine_vapor', 1000)) .itemInputs('#forge:dusts/sodium_hydroxide') .itemOutputs('#forge:dusts/lithium_carbonate') - .outputFluids(Fluid.of('gtceu:basic_bromine_exhaust', 1000)) + .outputFluids(Fluid.of('tfg:basic_bromine_exhaust', 1000)) .duration(20*54) .EUt(GTValues.VA[GTValues.HV]) @@ -549,24 +1143,119 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('minecraft:water', 1000)) .itemInputs('#forge:gems/lithium_fluoride') .itemInputs('#forge:gems/tetrafluoroberyllate') - .outputFluids(Fluid.of('gtceu:dirty_flibe', 1000)) + .outputFluids(Fluid.of('tfg:dirty_flibe', 1000)) .blastFurnaceTemp(3600) .duration(20*36) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.electrolyzer('flibe') - .inputFluids(Fluid.of('gtceu:dirty_flibe', 1000)) - .outputFluids(Fluid.of('gtceu:flibe', 1000)) + .inputFluids(Fluid.of('tfg:dirty_flibe', 1000)) + .outputFluids(Fluid.of('tfg:flibe', 1000)) .itemOutputs('#forge:dusts/chromium') .itemOutputs('gtceu:nickel_dust') .itemOutputs('gtceu:iron_dust') .duration(20*36) .EUt(GTValues.VA[GTValues.IV]) - - */ - +*/ //#endregion + //#region Isotopic Solvent and degradated + + event.recipes.gtceu.chemical_reactor('tfg:copper_trace_catalyst') + .itemInputs('#forge:dusts/copper') + .itemInputs('2x #forge:dusts/salt') + .itemInputs('#forge:dusts/magnesium') + .inputFluids(Fluid.of('gtceu:hydrofluoric_acid', 1000)) + .inputFluids(Fluid.of('gtceu:sulfuric_acid', 1000)) + .inputFluids(Fluid.of('gtceu:oxygen', 3000)) + .itemOutputs('13x tfg:copper_trace_catalyst_dust') + .outputFluids(Fluid.of('minecraft:water', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:trace_catalyst_salt_e') + .itemInputs('13x tfg:copper_trace_catalyst_dust') + .inputFluids(Fluid.of('gtceu:ethanol', 1000)) + .inputFluids(Fluid.of('gtceu:distilled_water', 1000)) + .itemOutputs('25x tfg:trace_catalyst_salt_e_dust') + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:organic_stabilizer') + .itemInputs('2x #forge:dusts/ammonium_chloride') + .inputFluids(Fluid.of('gtceu:phenol', 1000)) + .inputFluids(Fluid.of('gtceu:ethanol', 2000)) + .inputFluids(Fluid.of('gtceu:toluene', 3000)) + .itemOutputs('8x tfg:organic_stabilizer_dust') + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:sodium_fluoride') + .itemInputs('#forge:dusts/sodium') + .inputFluids(Fluid.of('gtceu:fluorine', 1000)) + .itemOutputs('2x tfg:sodium_fluoride_dust') + .duration(20 * 10) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:isotopic_solvent') + .itemInputs('25x tfg:trace_catalyst_salt_e_dust') + .itemInputs('8x tfg:organic_stabilizer_dust') + .itemInputs('2x tfg:sodium_fluoride_dust') + .inputFluids(Fluid.of('gtceu:argon', 1000)) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .outputFluids(Fluid.of('tfg:isotopic_solvent', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + // Degraded solvent + + event.recipes.gtceu.centrifuge('tfg:centrifuge_degraded_solvent') + .inputFluids(Fluid.of('tfg:degraded_solvent_stream', 1000)) + .itemOutputs('tfg:inert_dust_fraction_dust') + .outputFluids(Fluid.of('tfg:residual_sludge', 1000)) + .outputFluids(Fluid.of('tfg:gas_fraction', 1000)) + .outputFluids(Fluid.of('tfg:organic_degradation_slurry', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.centrifuge('tfg:centrifuge_gas_fraction') + .inputFluids(Fluid.of('tfg:gas_fraction', 1000)) + .outputFluids(Fluid.of('gtceu:argon', 500)) + .outputFluids(Fluid.of('gtceu:radon', 500)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.distillation_tower('tfg:distill_organic_degradation_slurry') + .inputFluids(Fluid.of('tfg:organic_degradation_slurry', 1000)) + .outputFluids(Fluid.of('gtceu:ethanol', 3000)) + .outputFluids(Fluid.of('gtceu:toluene', 3000)) + .outputFluids(Fluid.of('gtceu:dichlorobenzene', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.autoclave('tfg:mixed_radioactive_fluid') + .itemInputs('tfg:inert_dust_fraction_dust') + .inputFluids(Fluid.of('tfg:residual_sludge', 1000)) + .itemOutputs('tfg:recovered_ionic_complex_dust') + .outputFluids(Fluid.of('tfg:mixed_radioactive_fluid', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.electrolyzer('tfg:electrolyze_recovered_ionic_complex') + .itemInputs('tfg:recovered_ionic_complex_dust') + .itemOutputs('2x #forge:dusts/sodium') + .itemOutputs('#forge:dusts/magnesium') + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.centrifuge('tfg:centrifuge_mixed_radioactive_fluid') + .inputFluids(Fluid.of('tfg:mixed_radioactive_fluid', 1000)) + .outputFluids(Fluid.of('gtceu:sulfuric_copper_solution', 1000)) + .outputFluids(Fluid.of('gtceu:fluorine', 2000)) + .outputFluids(Fluid.of('gtceu:hydrogen', 1000)) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.IV]) + //#region Epoxidized Isosorbide Linolenate event.recipes.gtceu.distillery('tfg:linolenic_from_seed') @@ -647,7 +1336,46 @@ function registerTFGNuclearRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.IV]) - //#endregion + //#region Boron Coolant + + event.recipes.gtceu.chemical_reactor('tfg:boron_trichloride') + .inputFluids(Fluid.of('gtceu:chlorine', 2000)) + .itemInputs(Item.of('gtceu:boron_dust', 1)) + .outputFluids(Fluid.of('tfg:boron_thrichloride')) + .circuit(2) + .duration(20*36) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.centrifuge('tfg:enriched_boron_trichloride') + .inputFluids(Fluid.of('tfg:boron_thrichloride', 1000)) + .outputFluids(Fluid.of('tfg:enriched_boron_thrichloride', 10)) + .duration(20*62) + .EUt(GTValues.VHA[GTValues.HV]) + + event.recipes.gtceu.chemical_reactor('tfg:boron_10_hydroxide') + .inputFluids(Fluid.of('tfg:enriched_boron_thrichloride', 1000), Fluid.of('minecraft:water', 6000) ) + .itemOutputs(Item.of('tfg:boron_10_hydroxide_dust')) + .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 1000)) + .circuit(2) + .duration(20*8) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:boron_enriched_coolant') + .inputFluids(Fluid.of('gtceu:nitrogen', 2000)) + .itemInputs(Item.of('tfg:boron_10_hydroxide_dust'), Item.of('tfg:sodium_deuteroxide_dust')) + .outputFluids(Fluid.of('tfg:boron_enriched_coolant', 1500)) + .circuit(2) + .duration(20*14) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_reactor('tfg:boron_10') + .inputFluids(Fluid.of('tfg:heavy_water', 1000)) + .itemInputs(Item.of('gtceu:sodium_dust')) + .itemOutputs(Item.of('tfg:sodium_deuteroxide_dust', 1)) + .circuit(2) + .duration(20*14) + .EUt(GTValues.VA[GTValues.EV]) + } diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js index 97fe73b6c..aacbef8fd 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/tags.nuclear.js @@ -8,6 +8,13 @@ const registerTFGItemTagsNuclear = (event) => { event.add('deafission:fuels', 'tfg:plutonium_rod') event.add('tfg:fission_rods', '#deafission:fuels') + let FISSION_ROD_TAG = 'tfg:fission_rods'; + + event.add(FISSION_ROD_TAG, 'tfg:tbu_232_rod'); + event.add(FISSION_ROD_TAG, 'tfg:americium_241_rod'); + event.add(FISSION_ROD_TAG, 'tfg:neptunium_237_rod'); + event.add(FISSION_ROD_TAG, 'tfg:californium_252_rod'); + } const registerTFGBlockTagsNuclear = (event) => { @@ -39,14 +46,28 @@ 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 //#endregion + } //#endregion //#region Fluids const registerTFGFluidTagsNuclear = (event) => { + // Fluid allowed for the SMR Hatch + + let SMR_FLUIDS = 'tfg:smr_fluids'; + + event.add(SMR_FLUIDS, 'gtceu:lubricant'); + event.add(SMR_FLUIDS, 'tfg:polyalkylene_lubricant'); + event.add(SMR_FLUIDS, 'tfg:spent_ticl4_doped_supercritical_co2'); + event.add(SMR_FLUIDS, 'tfg:ozone'); + event.add(SMR_FLUIDS, 'tfg:cyclohex_diperoxide'); + event.add(SMR_FLUIDS, 'tfg:booster_t3'); + + //#endregion + } diff --git a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js index a6826317b..e979f098e 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js @@ -169,13 +169,13 @@ function registerTFGEarlyGasRecipes(event) { .inputFluids(Fluid.of('tfg:reformed_aromatic_feedstock', 2000), Fluid.of('gtceu:steam', 4000)) .outputFluids(Fluid.of('tfg:reformate_gas', 8000)) .outputFluids(Fluid.of('tfg:cracker_off_gas', 1000)) - .duration(20*30) + .duration(20*16) .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:reformate_gas') .inputFluids(Fluid.of('tfg:reformed_aromatic_feedstock', 2000), Fluid.of('gtceu:steam', 1000)) .outputFluids(Fluid.of('tfg:reformate_gas', 3000)) - .duration(20*30) + .duration(20*16) .EUt(GTValues.VA[GTValues.MV]) // Recycling @@ -190,11 +190,12 @@ function registerTFGEarlyGasRecipes(event) { // Modify Recipe to balance new line event.remove({ id: 'gtceu:extractor/charcoal_extraction' }) + /* event.recipes.gtceu.extractor('tfg:charcoal_extraction') .itemInputs(Item.of('minecraft:charcoal')) .outputFluids(Fluid.of('gtceu:wood_tar', 100)) .duration(20*6.4) - .EUt(GTValues.VA[GTValues.MV]) + .EUt(GTValues.VA[GTValues.MV])*/ //#endregion @@ -235,7 +236,7 @@ function registerTFGEarlyGasRecipes(event) { event.recipes.gtceu.gas_turbine('tfg:btx_fuel') // Gas Turbine .inputFluids(Fluid.of('tfg:btx_fuel', 1)) .EUt(-(32)) - .duration(20*2.6) + .duration(20*2.86) .dimension('minecraft:overworld') .dimension('minecraft:the_nether') @@ -246,7 +247,7 @@ function registerTFGEarlyGasRecipes(event) { event.recipes.gtceu.chemical_reactor('tfg:electrolyze_syngas') .notConsumable(Item.of('gtceu:copper_dust', 1)) .inputFluids(Fluid.of('tfg:syngas', 1000)) - .outputFluids(Fluid.of('gtceu:methanol', 4000), Fluid.of('minecraft:water', 2000)) + .outputFluids(Fluid.of('gtceu:methanol', 3000), Fluid.of('minecraft:water', 2000)) .duration(20*12) .EUt(GTValues.VA[GTValues.MV]) @@ -273,7 +274,7 @@ function registerTFGEarlyGasRecipes(event) { .inputFluids(Fluid.of('gtceu:ammonia', 1000), Fluid.of('gtceu:ethanol', 1000)) .outputFluids(Fluid.of('tfg:tpaoh', 1000)) .duration(20*8) - .EUt(GTValues.VA[GTValues.EV]) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:zsm_5_gel') .itemInputs(Item.of('#forge:dusts/sodium_aluminium')) @@ -303,6 +304,7 @@ function registerTFGEarlyGasRecipes(event) { .itemInputs(Item.of('tfg:catalyser_pt_re_zsm')) .inputFluids(Fluid.of('tfg:reformate_gas', 8000)) .inputFluids(Fluid.of('gtceu:propene', 2000)) + .itemOutputs(Item.of('tfg:used_catalyser', 1)) .outputFluids(Fluid.of('tfg:crude_mixed_gas', 10000)) .duration(20*240) .EUt(GTValues.VA[GTValues.LV]) @@ -312,8 +314,7 @@ function registerTFGEarlyGasRecipes(event) { .inputFluids(Fluid.of('gtceu:benzene', 20000)) .inputFluids(Fluid.of('gtceu:toluene', 6000)) .inputFluids(Fluid.of('gtceu:dimethylbenzene', 12000)) - .itemOutputs(Item.of('tfg:used_catalyser', 1)) - .outputFluids(Fluid.of('tfg:btx_fuel', 48000)) + .outputFluids(Fluid.of('tfg:btx_fuel', 54000)) .duration(20*6) .EUt(GTValues.VA[GTValues.IV]) .circuit(24) @@ -328,7 +329,7 @@ function registerTFGEarlyGasRecipes(event) { event.recipes.gtceu.chemical_reactor('tfg:clean_powder') .itemInputs(Item.of('tfg:catalyser_powder_dust', 1)) - .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 2000)) + .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 200)) .itemOutputs(Item.of('tfg:clean_powder_dust', 1), Item.of('gtceu:sodium_dust', 1)) .duration(20*14) .EUt(GTValues.VA[GTValues.MV]) diff --git a/kubejs/server_scripts/tfg/powergen/recipes.power_gen_balance.js b/kubejs/server_scripts/tfg/powergen/recipes.power_gen_balance.js new file mode 100644 index 000000000..ae4171c2f --- /dev/null +++ b/kubejs/server_scripts/tfg/powergen/recipes.power_gen_balance.js @@ -0,0 +1,101 @@ +function registerTFGPowerGenBalance(event) { + + //#region Buff fuels + + event.remove({ id: 'gtceu:combustion_generator/cetane_diesel' }) + event.recipes.gtceu.combustion_generator('tfg:cetane_boosted_diesel') + .inputFluids(Fluid.of('gtceu:cetane_boosted_diesel', 1)) + .duration(20*1.6) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + + //#endregion + + //#region Nerf/Removed +/* COMMENT OUT UNTIL WE WANT TO ENABLE THE NERF + event.remove({ id: 'gtceu:gas_turbine/benzene' }) + event.recipes.gtceu.gas_turbine('tfg:benzene') + .inputFluids(Fluid.of('gtceu:benzene', 1)) + .duration(20*0.2) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + + event.remove({ id: 'gtceu:gas_turbine/nitrobenzene' }) + event.recipes.gtceu.gas_turbine('tfg:nitrobenzene') + .inputFluids(Fluid.of('gtceu:nitrobenzene', 1)) + .duration(20*0.5) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') +*/ + // Remove Light fuel ability as a fuel + + event.remove({ id: 'gtceu:combustion_generator/sulfuric_light_fuel' }) + event.remove({ id: 'gtceu:combustion_generator/light_fuel' }) + + + // Make Diesel available at ULV and balance power gen + + event.remove({ id: 'gtceu:combustion_generator/diesel' }) + event.recipes.gtceu.combustion_generator('tfg:diesel') + .inputFluids(Fluid.of('gtceu:diesel', 1)) + .duration(20*0.6) + .EUt(-32) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + + event.remove({ id: 'gtceu:mixer/diesel' }) + event.recipes.gtceu.mixer('tfg:diesel') + .inputFluids(Fluid.of('gtceu:light_fuel', 5000), Fluid.of('gtceu:heavy_fuel', 1000)) + .outputFluids(Fluid.of('gtceu:diesel', 6000)) + .duration(20*1.6) + .EUt(GTValues.VA[GTValues.LV]) + + // Oil to Light Fuel + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:light_fuel', 250), [Fluid.of('gtceu:oil', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/light_fuel_from_oil') + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:light_fuel', 50), [Fluid.of('gtceu:oil_light', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/light_fuel_from_light_oil') + + // Raw Oil to Naphtha + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:naphtha', 500), [Fluid.of('gtceu:oil_raw', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/light_fuel_from_raw_oil') + + // Heavy oil to Heavy Fuel + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:heavy_fuel', 750), [Fluid.of('gtceu:oil_heavy', 1000)]) + .secondaryFluidOutput(0) + .processingTime(500) + .heated() + .id('tfg:vi/vacuumizing/heavy_fuel_from_heavy_oil') + + // Switch HOG to require IV Energy Hatch + + event.remove({ id: 'gtceu:large_chemical_reactor/high_octane_gasoline' }) + event.recipes.gtceu.large_chemical_reactor('tfg:high_octane_gasoline') + .inputFluids( + Fluid.of('gtceu:gasoline', 20000), + Fluid.of('gtceu:octane', 2000), + Fluid.of('gtceu:nitrous_oxide', 2000), + Fluid.of('gtceu:toluene', 1000), + Fluid.of('gtceu:ethyl_tertbutyl_ether', 1000)) + .outputFluids(Fluid.of('gtceu:high_octane_gasoline', 32000)) + .duration(20*1.5) + .EUt(GTValues.VA[GTValues.LuV]) + .circuit(24) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index eec9b4a7a..25f4720d9 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -67,6 +67,7 @@ const registerTFGRecipes = (event) => { registerTFGNuclearComponentsRecipes(event) registerTFGSolarRecipes(event) registerTFGCoalRecipes(event) + registerTFGPowerGenBalance(event) registerTFGZirconiumRecipes(event) registerTFGBromineRecipes(event) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index ad5bc65a4..f80d3b1b6 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -177,5 +177,52 @@ function registerTFGMiscellaneousRecipes(event) { .duration(5*20) .EUt(GTValues.VA[GTValues.LV]) .addMaterialInfo(true); + + // Gregtech CEu Terminals Integration + + //event.remove({ id : 'gtceuterminal:dismantler' }) + event.shaped('1x gtceuterminal:dismantler', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:mv_sensor', + B: 'gtceu:mv_emitter', + C: '#gtceu:circuits/mv', + D: 'gtceu:computer_monitor_cover', + E: 'gtceu:mv_voltage_coil', + F: '#forge:plates/aluminium' + }).id(`tfg:shaped/dismantler`) + + event.remove({ id : 'gtceuterminal:multi_structure_manager' }) + event.shaped('1x gtceuterminal:multi_structure_manager', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:hv_sensor', + B: 'gtceu:hv_emitter', + C: '#gtceu:circuits/hv', + D: 'gtceu:terminal', + E: '#gtceu:batteries/hv', + F: '#forge:plates/stainless_steel' + }).id(`tfg:shaped/multi_structure_manager`) + + event.remove({ id : 'gtceuterminal:schematic_interface' }) + /* Broken for now as it can duplicate resources in the I/O Ports + event.shaped('1x gtceuterminal:schematic_interface', [ + 'ABA', + 'CDC', + 'FEF' + ], { + A: 'gtceu:iv_sensor', + B: 'gtceu:iv_emitter', + C: '#gtceu:circuits/iv', + D: 'gtceu:terminal', + E: '#gtceu:batteries/iv', + F: '#forge:plates/tungsten_steel' + }).id(`tfg:shaped/schematic_interface`) + */ + } diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 20241104f..dfd7a176b 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -207,6 +207,7 @@ const registerGTCEuMachines = (event) => { .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setPreviewCount(1)) .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)) .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS).setPreviewCount(1)) .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setExactLimit(1)) .or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))) .where('#', Predicates.air()) @@ -380,7 +381,7 @@ const registerGTCEuMachines = (event) => { .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setPreviewCount(1))) .where('C', Predicates.blocks('gtceu:solid_machine_casing') .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS).setPreviewCount(2)) - .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setExactLimit(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(2)) .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) .where('D', Predicates.blocks('create:metal_girder')) .where('E', Predicates.blocks('gtceu:steam_machine_casing')) diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index 10ed98e61..025b563f5 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -316,10 +316,16 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.RTMAlloy.addFlags(GENERATE_DENSE, GENERATE_SPRING); GTMaterials.Lead.addFlags(GENERATE_DENSE); + GTMaterials.Beryllium.addFlags(GENERATE_DENSE); + GTMaterials.MaragingSteel300.addFlags(GENERATE_DENSE); + GTMaterials.Quartzite.addFlags(GENERATE_ROD); GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD); + GTMaterials.Cadmium.addFlags(GENERATE_PLATE); + GTMaterials.Cadmium.setProperty(PropertyKey.INGOT, new $INGOT_PROPERTY()); + // Hide ore processing tab for plutonium GTMaterials.Plutonium239.addFlags(GENERATE_ROD, GENERATE_LONG_ROD, NO_ORE_PROCESSING_TAB, NO_ORE_SMELTING) GTMaterials.Thorium.addFlags(NO_ORE_SMELTING) @@ -328,7 +334,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Zirconium.setProperty(PropertyKey.DUST, new $DUST_PROPERTY()); GTMaterials.Zirconium.setProperty(PropertyKey.INGOT, new $INGOT_PROPERTY()); GTMaterials.Zirconium.setProperty(PropertyKey.BLAST, new $BLAST_PROPERTY(4200, 'mid', GTValues.VA[GTValues.EV], 1300, GTValues.VA[GTValues.HV], 14.7*20)); - GTMaterials.Zirconium.addFlags(GENERATE_FINE_WIRE, GENERATE_PLATE, NO_ORE_SMELTING); + GTMaterials.Zirconium.addFlags(GENERATE_FINE_WIRE, GENERATE_PLATE, GENERATE_DENSE, NO_ORE_SMELTING); // Tools GTMaterials.Stone.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(1.2, 1.0, 8, 1, [ diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 3cffd2c81..849baf9e7 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -20,15 +20,15 @@ const registerGTCEuRecipeTypes = (event) => { .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) - +/* event.create('nuclear_fuel_factory') .category('nuclear_fuel_factory') .setEUIO('in') - .setMaxIOSize(6, 1, 1, 0) + .setMaxIOSize(6, 1, 1, 1) .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) .setProgressBar(GuiTextures.PROGRESS_BAR_LATHE, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.CUT) - +*/ event.create('heat_exchanger') .category('heat_exchanger') .setEUIO('in') diff --git a/kubejs/startup_scripts/tfg/element.js b/kubejs/startup_scripts/tfg/element.js index b71cadcb5..e7fa697bf 100644 --- a/kubejs/startup_scripts/tfg/element.js +++ b/kubejs/startup_scripts/tfg/element.js @@ -4,10 +4,42 @@ const registerTFGElement = (event) => { event.create("thorium_230") .protons(90) - .neutrons(230) + .neutrons(140) .symbol("Th²³⁰") + event.create("thorium_232") .protons(90) - .neutrons(232) + .neutrons(142) .symbol("Th²³²") + + event.create("boron_10") + .protons(5) + .neutrons(6) + .symbol("B¹⁰") + + event.create("americium_241") + .protons(95) + .neutrons(146) + .symbol("Am²⁴¹") + + event.create("neptunium_237") + .protons(93) + .neutrons(144) + .symbol("Np²³⁷") + + event.create("californium_252") + .protons(98) + .neutrons(154) + .symbol("Ca²⁵²") + + event.create("unknown") + .protons(75) + .neutrons(75) + .symbol("?") + + event.create("caesium_137") + .protons(55) + .neutrons(82) + .symbol("Cs¹³⁷") + } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index 3f9cadb31..87bba4564 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -28,5 +28,10 @@ const registerTFGFluids = (event) => { .noBlock() // Venus + event.create('tfg:supercritical_co2') + .thinTexture(0x3deb96) + .bucketColor(0x08733f) + .temperature(236) + .noBlock() } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/mars/materials.mars.js b/kubejs/startup_scripts/tfg/mars/materials.mars.js index e048876ce..fb53dba15 100644 --- a/kubejs/startup_scripts/tfg/mars/materials.mars.js +++ b/kubejs/startup_scripts/tfg/mars/materials.mars.js @@ -22,6 +22,11 @@ function registerTFGMarsMaterials(event) { event.create('residual_radioactive_concoction') .liquid(new GTFluidBuilder().customStill().temperature(450)) + // New OLA Materials + + event.create('tfg:radioactive_effluent') + .liquid(new GTFluidBuilder().customStill().temperature(293)) + // Atmosphere event.create('tfg:mars_air') @@ -100,7 +105,7 @@ function registerTFGMarsMaterials(event) { .components('2x ostrum', 'iodine') .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) .iconSet(GTMaterialIconSet.getByName('cereal_box')) - .flags(GTMaterialFlags.GENERATE_GEAR) + .flags(GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_FOIL) .color(0xc696f2) .secondaryColor(0x9b99ff) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index ad21a71ba..158fb7185 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -241,4 +241,14 @@ const registerTFGMaterials = (event) => { .flags(GTMaterialFlags.GENERATE_PLATE) // #endregion + + //#region Material for Coils + + event.create('tfg:nichromium_iodomethylate') + .liquid(new GTFluidBuilder().temperature(1818)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('4x nickel', '1x chromium', '1x carbon', '3x hydrogen', '1x iodine') + .color(0xe7a2fc) + + } diff --git a/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js index 33d19dcb9..50304d7cb 100644 --- a/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/items.nuclear.js @@ -5,8 +5,18 @@ function registerTFGNuclearItems(event) { // Empty Fission Rod event.create('tfg:empty_rod') - .translationKey('item.tfg.empty_road') - .texture('tfg:item/fuel_rod_empty') + .translationKey('item.tfg.empty_rod') + .texture('tfg:item/fission_rod/fuel_rod_empty') + .tag('tfg:fission_rods') + + event.create('tfg:empty_rod_t2') + .translationKey('item.tfg.empty_rod_t2') + .texture('tfg:item/fission_rod/fuel_rod_empty_t2') + .tag('tfg:fission_rods') + + event.create('tfg:empty_rod_t3') + .translationKey('item.tfg.empty_rod_t3') + .texture('tfg:item/fission_rod/fuel_rod_empty_t3') .tag('tfg:fission_rods') event.create('tfg:refrigerant_pellet') @@ -14,6 +24,11 @@ function registerTFGNuclearItems(event) { .texture('tfg:item/refrigerant_pellet') .tag('tfg:fission_coolant') + event.create('tfg:terrafirmaguard_pa6') + .translationKey('item.tfg.terrafirmaguard_pa6') + .texture('tfg:item/terrafirmaguard_pa6') + .tag('tfg:fission_coolant') + // Moderator Line event.create('tfg:graphite_compound') diff --git a/kubejs/startup_scripts/tfg/nuclear/machine.js b/kubejs/startup_scripts/tfg/nuclear/machine.js new file mode 100644 index 000000000..837ae36ab --- /dev/null +++ b/kubejs/startup_scripts/tfg/nuclear/machine.js @@ -0,0 +1,8 @@ +// priority: 0 +"use strict"; + +GTCEuStartupEvents.registry('gtceu:machine', _ => { + const $FrComponents = Java.loadClass("fi.dea.mc.deafission.core.c2.fr.FrComponents"); + const $ReactorBaseStats = Java.loadClass("fi.dea.mc.deafission.core.ReactorBaseStats"); + $ReactorBaseStats.Smr1 = new $FrComponents(200, 0, 0); +}) \ 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 c78078fb4..04a1dd43c 100644 --- a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js @@ -50,10 +50,16 @@ const registerTFGNuclearMaterials = (event) => { .components('1x water', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - // Coolant + //#region Coolant + + event.create('tfg:warm_water') + .liquid(new GTFluidBuilder().temperature(313)) + .components('2x hydrogen', '1x oxygen') + .color(0x8de3fc) + .secondaryColor(0x81FFF9) event.create('tfg:heavy_water') - .liquid(new GTFluidBuilder().temperature(236)) + .liquid(new GTFluidBuilder().customStill().temperature(236)) .components('2x deuterium', '1x oxygen') .color(0xB5B9FF) .secondaryColor(0x81FFF9) @@ -65,16 +71,24 @@ const registerTFGNuclearMaterials = (event) => { .secondaryColor(0x81FFF9) event.create('tfg:boron_enriched_coolant') - .liquid(new GTFluidBuilder().temperature(213)) + .liquid(new GTFluidBuilder().customStill().temperature(213)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0x43D6E4) - .secondaryColor(0x2C9AAF) event.create('tfg:hot_boron_enriched_coolant') - .liquid(new GTFluidBuilder().temperature(2000)) + .liquid(new GTFluidBuilder().customStill().temperature(2000)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xFF715B) - .secondaryColor(0xFF9D6E) + + event.create('tfg:ticl4_doped_supercritical_co2') + .liquid(new GTFluidBuilder().customStill().temperature(500)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x titanium', '4x chlorine', '1x carbon', '2x oxygen') + + event.create('tfg:spent_ticl4_doped_supercritical_co2') + .liquid(new GTFluidBuilder().customStill().temperature(2000)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x titanium', '4x chlorine', '1x carbon', '2x oxygen') + + //#endregion // Fision Waste @@ -84,7 +98,7 @@ const registerTFGNuclearMaterials = (event) => { .color(0xB5B9FF) .secondaryColor(0x81FFF9) - event.create('nuclear_waste') + event.create('tfg:tbu_waste') .liquid(new GTFluidBuilder().customStill().temperature(3850)) .components('1x thorium', '1x uranium', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) @@ -114,7 +128,7 @@ const registerTFGNuclearMaterials = (event) => { .secondaryColor(0xfc5e03) event.create('tritiated_water') - .fluid() + .liquid(new GTFluidBuilder().customStill()) .components('2x tritium', '1x oxygen') .color(0xb2c3e7) @@ -136,39 +150,81 @@ const registerTFGNuclearMaterials = (event) => { // FLiBe Line - event.create('raw_rich_brine') - .liquid(new GTFluidBuilder().customStill().temperature(293)) + event.create('tfg:raw_rich_brine') + .liquid(new GTFluidBuilder().temperature(293)) + .color(0xf2b257) + .secondaryColor(0xcd8dbc) - event.create('hot_iodine_brine') - .liquid(new GTFluidBuilder().customStill().temperature(293)) + event.create('tfg:hot_iodine_brine') + .liquid(new GTFluidBuilder().temperature(293)) .components('1x hydrogen', '1x iodine', '1x magnesium', '1x chlorine', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xf26c57) + .secondaryColor(0xcd8dbc) - event.create('brominated_iodine_vapor') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(412)) + event.create('tfg:brominated_iodine_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(412)) .components('1x hydrogen', '1x iodine', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xf5f1b5) + .secondaryColor(0xcd8dbc) - event.create('basic_bromine_exhaust') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(406)) + event.create('tfg:basic_bromine_exhaust') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(406)) .components('1x bromine', '1x unknown') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xf5bbb5) + .secondaryColor(0xcd8dbc) - event.create('flibe') + event.create('tfg:flibe') .liquid(new GTFluidBuilder().customStill().temperature(293)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .components('1x fluorine', '1x lithium', '1x beryllium') - event.create('dirty_flibe') - .liquid(new GTFluidBuilder().customStill().temperature(293)) + event.create('tfg:dirty_flibe') + .liquid(new GTFluidBuilder().temperature(293)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .components('1x flibe', '1x unknown') + .color(0xdaffd6) + .secondaryColor(0xcd8dbc) - event.create('hot_flibe') + event.create('tfg:hot_flibe') .liquid(new GTFluidBuilder().customStill().temperature(3293)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .components('1x flibe') + // Material Fission Earth + + event.create('boron_10') + .dust() + .element(GTElements.get("boron_10")) + .iconSet(GTMaterialIconSet.DULL) + .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES) + .color(0xf8a8c0) + .secondaryColor(0xcd8dbc) + + event.create('caesium_137') + .dust() + .element(GTElements.get("caesium_137")) + .iconSet(GTMaterialIconSet.METALLIC) + .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES) + .color(0xB6FF00) + .secondaryColor(0x9FAFB2) + + event.create('tfg:boron_thrichloride') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).attribute(GTFluidAttributes.ACID).temperature(380)) + .components('1x boron', '3x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xb3fcb9) + //.secondaryColor(0x9FAFB2) + + event.create('tfg:enriched_boron_thrichloride') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).attribute(GTFluidAttributes.ACID).temperature(480)) + .components("boron_10", '3x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x65db6f) + .secondaryColor(0x9FAFB2) + //#endregion //#region Dust @@ -199,6 +255,23 @@ const registerTFGNuclearMaterials = (event) => { .secondaryColor('0xffffff') .iconSet(GTMaterialIconSet.RADIOACTIVE) + event.create('tfg:boron_10_hydroxide') + .dust() + .components('boron_10', '2x oxygen', '1x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x8ee8a6) + .secondaryColor('0xffffff') + .iconSet(GTMaterialIconSet.RADIOACTIVE) + + event.create('tfg:sodium_deuteroxide') + .dust() + .components('1x sodium', '2x deuterium', '1x oxygen') + .formula('NaOD') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xfef8f6) + .secondaryColor('0xffffff') + .iconSet(GTMaterialIconSet.NETHERSTAR) + // FLiBe Dusts event.create('lithium_carbonate') @@ -233,7 +306,7 @@ const registerTFGNuclearMaterials = (event) => { .ingot() .element(GTElements.get("thorium_230")) .iconSet(GTMaterialIconSet.RADIOACTIVE) - .flags(GTMaterialFlags.GENERATE_ROD) + .flags(GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_LONG_ROD) .color(0xf8a8c0) .secondaryColor(0xcd8dbc) .radioactiveHazard(1000000) @@ -242,35 +315,35 @@ const registerTFGNuclearMaterials = (event) => { .ingot() .element(GTElements.get("thorium_232")) .iconSet(GTMaterialIconSet.RADIOACTIVE) - .flags(GTMaterialFlags.GENERATE_ROD) + .flags(GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_LONG_ROD) .color(0x694c66) .radioactiveHazard(1000) - event.create('tfg:americium_241') + event.create('americium_241') .ingot() .element(GTElements.get("americium_241")) .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) - .color(0x0600ff) - .secondaryColor(0x1b1d36) + .color(0x10B193) + .secondaryColor(0x66ff00) .radioactiveHazard(1000000) - event.create('tfg:neptunium_237') + event.create('neptunium_237') .ingot() .element(GTElements.get("neptunium_237")) .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) .color(0x00df98) - .secondaryColor(0xffffff) + .secondaryColor(0x66ff00) .radioactiveHazard(5000000) - event.create('tfg:californium_252') + event.create('californium_252') .ingot() .element(GTElements.get("californium_252")) .iconSet(GTMaterialIconSet.RADIOACTIVE) .flags(GTMaterialFlags.GENERATE_ROD) .color(0xffba00) - .secondaryColor(0xdfffff) + .secondaryColor(0x66ff00) .radioactiveHazard(10000000) //#endregion @@ -324,73 +397,73 @@ const registerTFGNuclearMaterials = (event) => { //#region Isotopic Solvent - // Organic Stabilizer + // Organic Stabilizer event.create('tfg:organic_stabilizer') - .dust() - .components('49x carbon', '64x hydrogen', '6x oxygen', '1x nitrogen', '1x chlorine') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xd8c9b5) - .secondaryColor(0xb8a896) + .dust() + .components('31x carbon', '46x hydrogen', '3x oxygen', '1x nitrogen', '1x chlorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xd8c9b5) + .secondaryColor(0xb8a896) .iconSet(GTMaterialIconSet.BRIGHT) // Trace Catalyst Salt - E event.create('tfg:trace_catalyst_salt_e') - .dust() - .components( - '2x carbon', - '9x hydrogen', - '8x oxygen', - '1x copper', - '1x sodium', - '1x chlorine', - '1x magnesium', - '1x fluorine', - '1x sulfur') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xcad4cf) - .secondaryColor(0x9eb1a9) + .dust() + .components( + '2x carbon', + '9x hydrogen', + '8x oxygen', + '1x copper', + '1x sodium', + '1x chlorine', + '1x magnesium', + '1x fluorine', + '1x sulfur') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xcad4cf) + .secondaryColor(0x9eb1a9) .iconSet(GTMaterialIconSet.EMERALD) // Sodium Fluoride event.create('tfg:sodium_fluoride') - .dust() - .components('1x sodium', '1x fluorine') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xffffff) - .secondaryColor(0xb7b9bd) + .dust() + .components('1x sodium', '1x fluorine') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xffffff) + .secondaryColor(0xb7b9bd) .iconSet(GTMaterialIconSet.ROUGH) // Copper Trace Catalyst Dust - event.create('tfg:copper_trace_catalyst_dust') - .dust() - .components('1x copper', '1x sodium', '1x chlorine', '1x magnesium', '1x fluorine', '1x sulfur', '6x oxygen', '1x hydrogen') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0x4a2e1a) - .secondaryColor(0x7a5c47) + event.create('tfg:copper_trace_catalyst') + .dust() + .components('1x copper', '1x sodium', '1x chlorine', '1x magnesium', '1x fluorine', '1x sulfur', '6x oxygen', '1x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0x4a2e1a) + .secondaryColor(0x7a5c47) .iconSet(GTMaterialIconSet.FINE) // Isotopic Solvent event.create('tfg:isotopic_solvent') - .liquid(new GTFluidBuilder().temperature(320)) - .components( - '51x carbon', - '75x hydrogen', - '15x oxygen', - '1x nitrogen', - '2x chlorine', - '2x sodium', - '2x fluorine', - '1x copper', - '1x magnesium', - '1x sulfur', - '1x argon') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xd4b464) - .secondaryColor(0xa88e55) + .liquid(new GTFluidBuilder().customStill().temperature(320)) + .components( + '33x carbon', + '57x hydrogen', + '12x oxygen', + '1x nitrogen', + '2x chlorine', + '2x sodium', + '2x fluorine', + '1x copper', + '1x magnesium', + '1x sulfur', + '1x argon') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xd4b464) + .secondaryColor(0xa88e55) // Degraded Solvent Stream event.create('tfg:degraded_solvent_stream') - .liquid(new GTFluidBuilder().temperature(350)) + .liquid(new GTFluidBuilder().customStill().temperature(350)) .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0x8b4513) .secondaryColor(0xd2b48c) @@ -440,6 +513,19 @@ const registerTFGNuclearMaterials = (event) => { .color(0xff4500) .secondaryColor(0xff6347) + // High Grade + + event.create('tfg:high_grade_isotopic_solvent') + .liquid(new GTFluidBuilder().customStill().temperature(300)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xfc7303) + .secondaryColor(0xfcf403) + + event.create('tfg:degraded_high_grade_isotopic_solvent') + .liquid(new GTFluidBuilder().customStill().temperature(300)) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xfc7303) + .secondaryColor(0xfcf403) }; @@ -485,12 +571,14 @@ StartupEvents.registry("item", (event) => { } }; - fuel("thorium_rod", 5000, 1, 0.7, false); // Max Heat 139 - 1 Fuel - fuel("uranium_rod", 20000, 1, 2.2, false); // Max Heat 435 - 1 Fuel - fuel("plutonium_rod", 30000, 4, 3, false); // Max Heat 595 - 1 Fuel - fuel("tbu_232_rod", 10000, 1, 2); // Max Heat 396 - 1 Fuel + fuel("thorium_rod", 5000, 1, 0.7); // Max Heat 139 - 1 Fuel + fuel("uranium_rod", 20000, 1, 2.2); // Max Heat 435 - 1 Fuel + fuel("plutonium_rod", 30000, 1, 3); // Max Heat 595 - 1 Fuel + + fuel("tbu_232_rod", 5000, 1, 2); // Max Heat 396 - 1 Fuel + + fuel("americium_241_rod", 5000000, 1, 0.5); // Max Heat 99 - 1 Fuel + fuel("neptunium_237_rod", 100000, 1, 2); // Max Heat 396 - 1 Fuel + fuel("californium_252_rod", 500000, 1, 4); // Max Heat 792 - 1 Fuel - fuel("americium_241_rod", 1000000, 1, 0.5); - fuel("neptunium_237_rod", 50000, 1, 2); - fuel("californium_252_rod", 500000, 1, 4); });