diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png new file mode 100644 index 000000000..d73ae13b2 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png new file mode 100644 index 000000000..79398a232 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png new file mode 100644 index 000000000..c2602b5a6 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png new file mode 100644 index 000000000..915dedcc4 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png new file mode 100644 index 000000000..c72ea40ed Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png differ diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta new file mode 100644 index 000000000..6439dab8e --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta @@ -0,0 +1,67 @@ +{ + "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, + 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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png new file mode 100644 index 000000000..19fa4c874 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png new file mode 100644 index 000000000..d516c7ec4 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta new file mode 100644 index 000000000..6439dab8e --- /dev/null +++ b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta @@ -0,0 +1,67 @@ +{ + "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, + 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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_secondary.png new file mode 100644 index 000000000..592b1febe Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_secondary.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png new file mode 100644 index 000000000..cda7194b0 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta new file mode 100644 index 000000000..f96626000 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png new file mode 100644 index 000000000..8072b8fb4 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta new file mode 100644 index 000000000..f96626000 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} diff --git a/kubejs/assets/tfg/textures/block/sand_spice.png b/kubejs/assets/tfg/textures/block/sand_spice.png new file mode 100644 index 000000000..2989871e6 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/sand_spice.png differ diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 2e7b72e49..60a4f168d 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -1154,7 +1154,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:logic_processor', 'ae2:engineering_processor', 'ae2:calculation_processor', - '#gtceu:circuits/iv', + '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') .inputFluids(Fluid.of('tfg:fluix', 144*5)) .itemOutputs('ae2:crafting_unit') @@ -1167,7 +1167,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:logic_processor', 'ae2:engineering_processor', 'ae2:calculation_processor', - '#gtceu:circuits/iv', + '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*5)) .itemOutputs('2x ae2:crafting_unit') @@ -1255,57 +1255,57 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { event.recipes.gtceu.assembler('ae2:interface_mv') .itemInputs( 'gtceu:mv_conveyor_module', - '8x #forge:plates/glass', + '2x #tfc:workbenches', '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:interface') - .duration(200) + .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) - // HV Moon Only - event.recipes.gtceu.assembler('ae2:interface_hv_moon') + // MV Moon Only + event.recipes.gtceu.assembler('ae2:interface_mv_moon') .itemInputs( - 'gtceu:hv_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/stainless_steel', + 'gtceu:mv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .duration(20*10) + .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - // EV - event.recipes.gtceu.assembler('ae2:interface_ev') + // IV + event.recipes.gtceu.assembler('ae2:interface_iv') .itemInputs( - 'gtceu:ev_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/titanium', + 'gtceu:iv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 1152)) - .itemOutputs('8x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.EV]) + .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .itemOutputs('16x ae2:interface') + .duration(20*20) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV - event.recipes.gtceu.assembler('ae2:interface_luv') + // IV Moon Only + event.recipes.gtceu.assembler('ae2:interface_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/rhodium_plated_palladium', - '32x ae2:annihilation_core', - '32x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 4608)) + 'gtceu:iv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/tungsten_steel', + '16x ae2:annihilation_core', + '16x ae2:formation_core') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('32x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + .duration(20*10) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') //#endregion @@ -1322,51 +1322,51 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:pattern_provider') - .duration(800) + .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) - // HV Moon Only + // MV Moon Only event.recipes.gtceu.assembler('ae2:pattern_provider_hv_moon') .itemInputs( - 'gtceu:hv_robot_arm', + 'gtceu:mv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/stainless_steel', + '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:pattern_provider') - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .duration(20*10) + .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - // EV + // IV event.recipes.gtceu.assembler('ae2:pattern_provider_ev') .itemInputs( - 'gtceu:ev_robot_arm', + 'gtceu:iv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/titanium', + '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 1152)) - .itemOutputs('8x ae2:pattern_provider') - .duration(800) - .EUt(GTValues.VA[GTValues.EV]) + .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .itemOutputs('16x ae2:pattern_provider') + .duration(20*20) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV + // IV Moon Only event.recipes.gtceu.assembler('ae2:pattern_provider_luv') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/rhodium_plated_palladium', - '32x ae2:annihilation_core', - '32x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 4608)) + '4x #forge:plates/tungsten_steel', + '16x ae2:annihilation_core', + '16x ae2:formation_core') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('32x ae2:pattern_provider') - .duration(800) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + .duration(20*10) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') //#endregion @@ -2152,24 +2152,38 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '8x ae2:engineering_processor', '14x gtceu:iv_sensor', 'ae2:logic_processor') - .inputFluids(Fluid.of('gtceu:titanium', 1440)) + .inputFluids(Fluid.of('tfg:fluix', 144*200)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*150)) .itemOutputs('ae2:quantum_ring') .duration(900) - .EUt(8300) + .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) // Quantum Link Chamber event.recipes.gtceu.assembly_line('ae2:quantum_link') .itemInputs( '8x ae2:fluix_pearl', - '6x ae2:quartz_vibrant_glass', - '8x ae2:engineering_processor', - '14x gtceu:iv_sensor', - '2x gtceu:hv_lithium_battery') - .inputFluids(Fluid.of('gtceu:titanium', 1088)) + 'gtceu:fusion_glass', + '32x megacells:accumulation_processor', + '32x megacells:accumulation_processor', + '32x ae2:engineering_processor', + '32x ae2:engineering_processor', + '32x ae2:logic_processor', + '32x ae2:logic_processor', + '32x ae2:calculation_processor', + '32x ae2:calculation_processor', + 'gtceu:ruthenium_trinium_americium_neutronate_hex_wire', + '32x gtceu:uv_sensor', + '32x gtceu:uv_emitter', + '8x gtceu:uv_field_generator', + 'gtceu:max_battery') + .inputFluids(Fluid.of('tfg:fluix', 144*2000)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*1500)) + .stationResearch(b => b.researchStack(Item.of('minecraft:glass')).EUt(GTValues.VA[GTValues.UV]).CWUt(256)) + .dimension('ad_astra:moon') .itemOutputs('ae2:quantum_link') .duration(700) - .EUt(8300) + .EUt(GTValues.VA[GTValues.UHV]) .cleanroom(CleanroomType.CLEANROOM) // Chemical Reactor diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js index 2b7119994..6c6842bac 100644 --- a/kubejs/server_scripts/extended_ae2/recipes.js +++ b/kubejs/server_scripts/extended_ae2/recipes.js @@ -14,58 +14,79 @@ const registerExtendedAE2Recipes = (event) => { //#region Ext Interface - // IV + // IV - event.recipes.gtceu.assembler('expatternprovider:ex_interface_iv') + event.recipes.gtceu.assembler('tfg:ex_interface_iv') .itemInputs( 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:interface') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:ex_interface') .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:ex_interface_luv_moon') + event.recipes.gtceu.assembler('tfg:ex_interface_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', + 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:interface') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:ex_interface') .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(1) // ZPM - event.recipes.gtceu.assembler('expatternprovider:ex_interface_zpm') + event.recipes.gtceu.assembler('tfg:ex_interface_zpm') .itemInputs( 'gtceu:zpm_conveyor_module', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '16x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:ex_interface') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:ex_interface') .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // Extended Interface Upgrade + // ZPM Moon Only + + event.recipes.gtceu.assembler('tfg:ex_interface_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:interface') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:ex_interface') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) + + // Interface Upgrade // IV @@ -73,34 +94,34 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', - '#ae2:interface') + '2x megacells:accumulation_processor', + '1x #ae2:interface') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:interface_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_luv_moon') + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', + 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor') + '2x megacells:accumulation_processor') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:interface_upgrade') .duration(300) - .circuit(4) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(2) // ZPM @@ -109,16 +130,33 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:zpm_conveyor_module', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '8x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:interface_upgrade') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:interface_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:interface_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) //#endregion @@ -126,106 +164,143 @@ const registerExtendedAE2Recipes = (event) => { // IV - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_luv') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv') .itemInputs( '4x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', 'gtceu:iv_robot_arm', 'gtceu:iv_fluid_regulator', '4x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/iv') + '#gtceu:circuits/luv') .inputFluids(Fluid.of('tfg:fluix', 144*9)) .itemOutputs("expatternprovider:oversize_interface") .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV + // IV Moon - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv_moon') .itemInputs( '4x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', - 'gtceu:luv_robot_arm', - 'gtceu:luv_fluid_regulator', - '4x #forge:dense_plates/rhodium_plated_palladium', + 'gtceu:iv_robot_arm', + 'gtceu:iv_fluid_regulator', + '4x #forge:dense_plates/tungsten_steel', '#gtceu:circuits/luv') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*4)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*9)) .itemOutputs("4x expatternprovider:oversize_interface") .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') // ZPM - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_uv') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') .itemInputs( '8x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', 'gtceu:zpm_robot_arm', 'gtceu:zpm_fluid_regulator', '4x #forge:dense_plates/naquadah_alloy', - '#gtceu:circuits/zpm') + '#gtceu:circuits/uv') .inputFluids(Fluid.of('tfg:fluix', 144*18)) .itemOutputs("8x expatternprovider:oversize_interface") .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + // ZPM Moon + + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm_moon') + .itemInputs( + '8x #expatternprovider:extended_interface', + '4x megacells:accumulation_processor', + 'gtceu:zpm_robot_arm', + 'gtceu:zpm_fluid_regulator', + '4x #forge:dense_plates/naquadah_alloy', + '#gtceu:circuits/uv') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*18)) + .itemOutputs("16x expatternprovider:oversize_interface") + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + //#endregion //#region Ext Pattern Provider // IV - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_iv') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv') .itemInputs( 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:ex_pattern_provider') .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_moon') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv_moon') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:ex_pattern_provider') .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(1) // ZPM - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_zpm') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm') .itemInputs( 'gtceu:zpm_robot_arm', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '16x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:ex_pattern_provider') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:ex_pattern_provider') .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:ex_pattern_provider') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) // Pattern Provider Upgrade @@ -235,34 +310,34 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', - '#ae2:pattern_provider') + '2x megacells:accumulation_processor', + '1x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_luv_moon') + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_iv_moon') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor') + '2x megacells:accumulation_processor') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(2) // ZPM @@ -271,16 +346,33 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:zpm_robot_arm', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '8x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:pattern_provider_upgrade') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:pattern_provider_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) //#endregion diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index 115b7fada..db04fc032 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -124,7 +124,7 @@ const registerGTCEUMetals = (event) => { const registerGTCEUBedrockOreVeins = (event) => { - +/* // Tin, Magnesium event.add('tfg:moon_tin', vein => { vein.weight(75) @@ -155,7 +155,6 @@ const registerGTCEUBedrockOreVeins = (event) => { .material(GTMaterials.Chalcopyrite, 10) .material(GTMaterials.Zeolite, 4) .material(GTMaterials.Cassiterite, 3) - .material(GTMaterials.Realgar, 2) .dimensions('ad_astra:moon') }) @@ -191,6 +190,7 @@ const registerGTCEUBedrockOreVeins = (event) => { .material(GTMaterials.Pollucite, 1) .dimensions('ad_astra:moon') }) + */ } function registerGTCEUBedrockFluidVeins(event) { @@ -227,4 +227,152 @@ function registerGTCEUBedrockFluidVeins(event) { vein.depletionChance(1) vein.depletedYield(10) }) + + // Mars Fluid Vein - Credit to Monifactory + + const Registries = Java.loadClass("net.minecraft.core.registries.Registries") + const ResourceKey = Java.loadClass("net.minecraft.resources.ResourceKey") + const martianOasisResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/martian_oasis") + const martianAmberHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/amber_hills") + const martianAmberPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/amber_plains") + const martianMountainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/martian_mountains") + const martianRusticusHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/rusticus_hills") + const martianRusticusPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/rusticus_plains") + const martianSangnumHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/sangnum_hills") + const martianSangnumPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/sangnum_plains") + + event.add('tfg:semiheavy_ammoniacal_water', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:semiheavy_ammoniacal_water').fluid) + vein.weight(100) + vein.minimumYield(200) + vein.maximumYield(400) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(15) + }) + + event.add('tfg:liquid_carbon_dioxide', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('gtceu:liquid_carbon_dioxide').fluid) + vein.weight(15) + vein.minimumYield(20) + vein.maximumYield(350) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + // Heavy Ammonical Water in Specific Biome Credit to Monifactory from https://github.com/ThePansmith/Monifactory/blob/main/kubejs/server_scripts/worldgen/fluidVeins.js + + event.add('tfg:heavy_ammoniacal_water_oasis', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(350, martianOasisResourceKey) + vein.weight(0) + vein.minimumYield(300) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(20) + }) + + event.add('tfg:heavy_ammoniacal_water_amber_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianAmberHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_amber_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianAmberPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_mountains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianMountainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_rusticus_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianRusticusHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_rusticus_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianRusticusPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_sangnum_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianSangnumHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_sangnum_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianSangnumPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + // Ammonia + + event.add('tfg:ammonia_mars_oasis', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('gtceu:ammonia').fluid) + vein.biomes(400, martianOasisResourceKey) + vein.weight(0) + vein.minimumYield(300) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(20) + }) + } \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4d7fc9cf0..03055afe0 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1362,7 +1362,7 @@ const registerGTCEURecipes = (event) => { 'ADA', 'BCB' ], { - A: '#gtceu:circuits/iv', + A: '#gtceu:circuits/ev', B: 'gtceu:ev_electric_motor', C: 'gtceu:aluminium_single_cable', D: 'gtceu:ev_centrifuge', @@ -1399,4 +1399,32 @@ const registerGTCEURecipes = (event) => { event.replaceOutput({ id: 'gtceu:cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') + + //#region Replace Recipe + + event.remove({ id : 'gtceu:assembly_line/me_pattern_buffer_proxy'}) + event.recipes.gtceu.assembly_line('tfg:me_pattern_buffer_proxy') + .itemInputs( + 'gtceu:luv_machine_hull', + '2x gtceu:luv_sensor', + '#gtceu:circuits/luv', + 'gtceu:fusion_glass', + '2x ae2:quantum_ring', + '32x gtceu:fine_europium_wire', + '32x gtceu:fine_europium_wire', + '16x megacells:accumulation_processor') + .inputFluids(Fluid.of('gtceu:lubricant', 500)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*4)) + .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) + .itemOutputs('gtceu:me_pattern_buffer_proxy') + .duration(30*20) + .EUt(GTValues.VA[GTValues.ZPM]) + + event.replaceInput({ id: 'gtceu:assembly_line/me_pattern_buffer' }, 'ae2:pattern_provider', '3x expatternprovider:ex_pattern_provider') + event.replaceInput({ id: 'gtceu:assembly_line/me_pattern_buffer' }, 'ae2:interface', '3x expatternprovider:oversize_interface') + + event.replaceInput({ id: 'gtceu:shaped/large_combustion_engine' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + event.replaceInput({ id: 'gtceu:shaped/nano_chestplate_advanced' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + event.replaceInput({ id: 'gtceu:assembler/ev_large_miner' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 4103eed3f..0131d3b0e 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -690,38 +690,6 @@ function registerGTCEuMachineRecipes(event) { ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack(Item.of('gtceu:computer_monitor_cover')).EUt(GTValues.VA[GTValues.IV]).duration(120 * 20)) - event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer' }) - event.recipes.gtceu.assembly_line('me_pattern_buffer') - .itemInputs('gtceu:luv_dual_input_hatch', - 'gtceu:luv_emitter', - '4x #gtceu:circuits/luv', - '3x ae2:pattern_provider', - '3x ae2:interface', - '4x ae2:speed_card', - '2x ae2:capacity_card', - '64x #forge:fine_wires/europium', - '32x #forge:fine_wires/europium') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500)) - .itemOutputs('gtceu:me_pattern_buffer') - .duration(30 * 20) - .EUt(GTValues.VA[GTValues.LuV]) - ["scannerResearch(java.util.function.UnaryOperator)"](b => - b.researchStack(Item.of('gtceu:luv_dual_input_hatch')).EUt(GTValues.VA[GTValues.LuV]).duration(60 * 20)) - - event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer_proxy' }) - event.recipes.gtceu.assembly_line('me_pattern_buffer_proxy') - .itemInputs('gtceu:luv_machine_hull', - '2x gtceu:luv_sensor', - '#gtceu:circuits/luv', - 'ae2:quantum_link', - '2x ae2:quantum_ring', - '64x #forge:fine_wires/europium') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500)) - .itemOutputs('gtceu:me_pattern_buffer_proxy') - .duration(30 * 20) - .EUt(GTValues.VA[GTValues.ZPM]) - .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) - event.remove({ id: 'gtceu:assembly_line/ultimate_battery' }) event.recipes.gtceu.assembly_line('ultimate_battery') .itemInputs('16x #forge:double_plates/darmstadtium', @@ -896,48 +864,7 @@ function registerGTCEuMachineRecipes(event) { event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_hatch' }, 'gtceu:steel_dust', '6x gtceu:steel_dust') event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_hatch' }, 'gtceu:steel_block', '6x gtceu:steel_ingot') - // #region Bedrock Miner - - event.recipes.gtceu.assembler('gtceu:mv_bedrock_miner') - .itemInputs('1x gtceu:hv_machine_hull', - '4x #forge:frames/steel', - '4x #gtceu:circuits/iv', - '4x gtceu:hv_electric_motor', - '4x gtceu:hv_robot_arm', - '4x gtceu:hv_conveyor_module', - '4x #forge:gears/blue_steel') - .itemOutputs('gtceu:mv_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.HV]) - .circuit(2) - - event.recipes.gtceu.assembler('gtceu:hv_bedrock_miner') - .itemInputs('1x gtceu:ev_machine_hull', - '4x #forge:frames/titanium', - '4x #gtceu:circuits/luv', - '4x gtceu:luv_electric_motor', - '4x gtceu:luv_robot_arm', - '4x gtceu:luv_conveyor_module', - '4x #forge:gears/ruridit') - .itemOutputs('gtceu:hv_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.IV]) - .circuit(2) - - event.recipes.gtceu.assembler('gtceu:ev_bedrock_miner') - .itemInputs('1x gtceu:iv_machine_hull', - '4x #forge:frames/tungsten_steel', - '4x #gtceu:circuits/zpm', - '4x gtceu:zpm_electric_motor', - '4x gtceu:zpm_robot_arm', - '4x gtceu:zpm_conveyor_module', - '4x #forge:gears/osmiridium') - .itemOutputs('gtceu:ev_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.ZPM]) - .circuit(2) - - //#endregion + //#region Chipboard Composite event.recipes.gtceu.mixer('gtceu:chipboard_composite_wax') .itemInputs('2x #tfg:wood_dusts', @@ -1027,6 +954,30 @@ function registerGTCEuMachineRecipes(event) { .duration(2.5 * 20) .EUt(16) + event.recipes.gtceu.assembler('tfg:casings/machine_casing_stainless_evaporation') + .itemInputs('gtceu:clean_machine_casing', '4x gtceu:annealed_copper_double_wire') + .inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 288)) + .itemOutputs('tfg:casings/machine_casing_stainless_evaporation') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + 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)) + .itemOutputs('tfg:casings/machine_casing_mars') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('gtceu:atomic_casing') + .itemInputs('4x #forge:dense_plates/lead', '2x #forge:plates/rtm_alloy', '#forge:frames/titanium') + .inputFluids(Fluid.of('gtceu:polyvinyl_butyral', 288)) + .itemOutputs('2x gtceu:atomic_casing') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + //#endregion //#region Large Solar Panel @@ -1151,4 +1102,149 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.LuV]), 2) .circuit(2) + //#endregion + + //#region Mars Ore Line + + // Multiblock + + /* LOCKED UNTIL VENUS + + event.shaped( + 'gtceu:extraterrestrial_ore_fabricator', + [ 'USU', + 'WZW', + 'PTP'], + { + S: 'tfg:casings/machine_casing_vacuum_engine_intake', + Z: 'gtceu:iv_machine_hull', + W: '#gtceu:circuits/iv', + U: '#forge:double_plates/stellite_100', + T: '#forge:single_cables/platinum', + P: 'gtceu:iv_electric_pump' + } + ).id('gtceu:shaped/extraterrestrial_ore_fabricator') + + */ + + event.recipes.gtceu.assembler('tfg:ostrum_harvester') + .itemInputs( + '1x gtceu:ev_machine_hull', + '4x #gtceu:circuits/ev', + '4x gtceu:ev_electric_motor', + '4x #forge:rotors/black_steel', + '4x gtceu:ev_electric_pump', + '4x #forge:gears/desh') + .itemOutputs('gtceu:ostrum_harvester') + .duration(400) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(2) + + event.recipes.gtceu.assembler('tfg:moon_dust_harvester') + .itemInputs( + '1x gtceu:hv_machine_hull', + '4x #gtceu:circuits/hv', + '4x gtceu:hv_electric_motor', + '4x #forge:rotors/titanium', + '4x gtceu:hv_electric_pump', + '4x #forge:gears/rocket_alloy_t1') + .itemOutputs('gtceu:moon_dust_harvester') + .duration(400) + .EUt(GTValues.VA[GTValues.HV]) + .circuit(2) + + // Vacuum Intake + + event.shaped( + 'tfg:casings/machine_casing_vacuum_engine_intake', + [ 'USU', + 'WZW', + 'UTU'], + { + S: '#forge:tools/hammers', + T: '#forge:tools/wrenches', + W: '#forge:rotors/ultimet', + U: 'gtceu:ultimet_normal_item_pipe', + Z: 'gtceu:inert_machine_casing' + } + ).id('tfg:shaped/casing_machine_casing_vacuum_engine_intake') + + event.recipes.gtceu.assembler('tfg:casings/machine_casing_vacuum_engine_intake') + .itemInputs( + '2x #forge:rotors/ultimet', + '4x gtceu:ultimet_normal_item_pipe', + '1x gtceu:inert_machine_casing') + .itemOutputs('tfg:casings/machine_casing_vacuum_engine_intake') + .duration(50) + .EUt(GTValues.VH[GTValues.LV]) + .circuit(2) + + // Stainless Evaporation Tower - LOCKED UNTIL VENUS + + /* + + event.shaped( + 'gtceu:evaporation_tower', + [ 'TUT', + 'WZW', + 'TUT'], + { + T: '#gtceu:circuits/ev', + W: 'gtceu:hv_electric_pump', + U: '#forge:double_wires/kanthal', + Z: 'gtceu:hv_machine_hull' + } + ).id('tfg:shaped/evaporation_tower') + + */ + + //#endregion + + //#region Nuclear Controler - LOCKED UNTIL MARS + + /* + + event.shaped( + 'gtceu:fission_reactor', + [ 'TUT', + 'WZW', + 'TUT'], + { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:hv_field_generator', + Z: 'gtceu:ev_machine_hull' + } + ).id('tfg:shaped/fission_reactor') + + event.shaped( + 'gtceu:nuclear_fuel_factory', + [ 'TUT', + 'WZW', + 'TBT'], + { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:ev_emitter', + Z: 'gtceu:ev_machine_hull', + B: 'gtceu:ev_robot_arm' + } + ).id('tfg:shaped/nuclear_fuel_factory') + + event.shaped( + 'gtceu:heat_exchanger', + [ 'TUT', + 'WZW', + 'TBT'], + { + T: 'gtceu:high_temperature_smelting_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:ev_sensor', + Z: 'gtceu:ev_machine_hull', + B: 'gtceu:ev_fluid_regulator' + } + ).id('tfg:shaped/heat_exchanger') + + */ + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 855d8b072..17bde7c41 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -21,5 +21,7 @@ const registerTFGRecipes = (event) => { registerTFGStoneDustRecipes(event) registerTFGRecyclingRecipes(event) registerTFGNuclearRecipes(event) + registerTFGMarsRecipes(event) + registerTFGMoonOres(event) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.mars.js b/kubejs/server_scripts/tfg/recipes.mars.js new file mode 100644 index 000000000..1d1cbebd9 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.mars.js @@ -0,0 +1,72 @@ + function registerTFGMarsRecipes(event) { + +const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') + + // Ostrum Harvester + + event.recipes.gtceu.ostrum_harvester(`ostrum_harvesting`) + .perTick(true) + .inputFluids('gtceu:drilling_fluid 4') + .perTick(false) + .dimension('ad_astra:mars') + .itemOutputsRanged('gtceu:ostrum_dust',1,5) + .duration(20*5) + .EUt(GTValues.VA[GTValues.LV]); + + // Large Centrifuge Ostrum dust - SCRAP FROM MARS GOING TO VENUS + + /* + + event.recipes.gtceu.centrifuge(`ostrum_harvesting`) + .inputFluids('gtceu:bromine 100') + .itemInputs('#forge:dusts/ostrum') + .dimension('ad_astra:mars') + .chancedFluidOutputLogic($ChanceLogic.XOR) + .chancedFluidOutput('gtceu:lightweight_ostrum_vapor',6000,0) + .chancedFluidOutput('gtceu:ostrum_vapor',3000,0) + .chancedFluidOutput('gtceu:dense_ostrum_vapor',1000,0) + .duration(20*58) + .EUt(GTValues.VA[GTValues.EV], 4); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('lightweight_ostrum') + .inputFluids('gtceu:lightweight_ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:radon', 1000)) + .itemOutputsRanged('#forge:crushed_ores/tantalite',1,10) + .itemOutputsRanged('#forge:crushed_ores/bauxite',1,10) + //.itemOutputsRanged('#forge:crushed_ores/pyrope',1,10) + //.itemOutputsRanged('#forge:crushed_ores/rose_quartz',1,10) + .itemOutputsRanged('#forge:crushed_ores/thorium',1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_ruby_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('ostrum') + .inputFluids('gtceu:ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) + .itemOutputsRanged(Item.of('gtceu:crushed_chromite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_malachite_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_quartzite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_gypsum_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_electrotine_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_barite_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('dense_ostrum') + .inputFluids('gtceu:dense_ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:tritiated_water', 500)) + .itemOutputsRanged('#forge:crushed_ores/uraninite',1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_certus_quartz_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_beryllium_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_bastnasite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_spessartine_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_silver_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + + */ + + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index d12eb97b4..21692b19b 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -825,7 +825,7 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.gtceu.assembler('sensor_iv') .itemInputs('gtceu:quantum_eye', '#forge:rods/iridium', '#gtceu:circuits/iv', '4x #forge:plates/tungsten_steel') - .itemOutputs('gtceu:ev_sensor') + .itemOutputs('gtceu:iv_sensor') .duration(100) .EUt(30) diff --git a/kubejs/server_scripts/tfg/recipes.moon_ores.js b/kubejs/server_scripts/tfg/recipes.moon_ores.js new file mode 100644 index 000000000..a110ed7c6 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.moon_ores.js @@ -0,0 +1,131 @@ +// priority: 0 + +function registerTFGMoonOres(event) { + +//#region Moon Harvester + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_assurine_harvester') + .biome('tfg:moon/lunar_asurine_dense') + .itemOutputsRanged('#forge:dusts/certus_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(1) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_chorus_dense') + .biome('tfg:moon/lunar_chorus_dense') + .itemOutputsRanged('#forge:dusts/goethe_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(2) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_corals_dense') + .biome('tfg:moon/lunar_corals_dense') + .itemOutputsRanged('#forge:dusts/bright_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(3) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_lights_dense') + .biome('tfg:moon/lunar_lights_dense') + .itemOutputsRanged('#forge:dusts/cassiterite_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(4) + + //#endregion + + //#region Regolith Vapor Processing + + event.recipes.gtceu.mixer('tfg:regolith_slurry_suspension') + .itemInputs('ad_astra:moon_sand', 'tfg:dry_ice') + .itemOutputs('#forge:dusts/regolith_mush') + .dimension('ad_astra:moon') + .duration(20*60) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_bath('tfg:regolith_vapor') + .itemInputs('#forge:dusts/regolith_mush') + .inputFluids('gtceu:nitrogen 1000') + .itemOutputs('#forge:dusts/silicon_dioxide') + .outputFluids('gtceu:regolith_vapor 1000') + .dimension('ad_astra:moon') + .duration(20*28) + .EUt(GTValues.VHA[GTValues.LV]) + + //#endregion + + //#region Making Dusty Ores + +const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') + + event.recipes.gtceu.chemical_reactor('tfg:dusty_certus_reactor') + .itemInputs('#forge:dusts/certus_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_certus_quartz') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_goethite_reactor') + .itemInputs('#forge:dusts/goethe_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_goethite') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_shiny_reactor') + .itemInputs('#forge:dusts/bright_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .chancedItemOutputLogic($ChanceLogic.XOR) + .chancedOutput('gtceu:dusty_raw_diamond',2000,0) + .chancedOutput('gtceu:dusty_raw_gold',8000,0) + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_cassiterite_reactor') + .itemInputs('#forge:dusts/cassiterite_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_cassiterite') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + //#endregion + + //#region Dusty to Dust through centrifuge + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_certus_quartz') + .itemInputs('gtceu:dusty_raw_certus_quartz') + .itemOutputs('ae2:certus_quartz_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_goethite') + .itemInputs('gtceu:dusty_raw_goethite') + .chancedItemOutputLogic($ChanceLogic.XOR) + .chancedOutput('gtceu:iron_dust',5000,0) + .chancedOutput('gtceu:copper_dust',5000,0) + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_diamond') + .itemInputs('gtceu:dusty_raw_diamond') + .itemOutputs('gtceu:diamond_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_gold') + .itemInputs('gtceu:dusty_raw_gold') + .itemOutputs('gtceu:gold_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_tin') + .itemInputs('gtceu:dusty_raw_cassiterite') + .itemOutputs('gtceu:tin_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 9d4aa903d..376743188 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -47,13 +47,20 @@ function registerTFGNuclearRecipes(event) { //#region Mars Water - event.recipes.gtceu.electrolyzer('mars_water') - .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 1000)) + event.recipes.gtceu.centrifuge('mars_heavy_water') + .inputFluids(Fluid.of('tfg:heavy_ammoniacal_water', 1000)) .outputFluids(Fluid.of('gtceu:heavy_water', 500)) .itemOutputs('#forge:dusts/ammonium_chloride', '2x #forge:small_dusts/ammonium_chloride') .duration(20*9) .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.centrifuge('mars_semiheavy_water') + .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 1000)) + .outputFluids(Fluid.of('minecraft:water', 500)) + .itemOutputs('2x #forge:tiny_dusts/ammonium_chloride') + .duration(20*9) + .EUt(GTValues.VA[GTValues.MV]) + // Martian Sludge event.recipes.gtceu.chemical_bath('dirty_hexafluorosilicic_acid') @@ -77,7 +84,7 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('gtceu:martian_sludge', 1000)) .inputFluids(Fluid.of('gtceu:formamide', 1000)) .inputFluids(Fluid.of('gtceu:radioactive_waste', 1000)) - .outputFluids(Fluid.of('gtceu:radon', 100)) + .outputFluids(Fluid.of('gtceu:radon', 1000)) .itemOutputs('#forge:dusts/nuclear_residue') .duration(20*30) .EUt(GTValues.VA[GTValues.EV]) @@ -85,7 +92,7 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.vacuum_freezer('oxidized_nuclear_residue') .itemInputs('#forge:dusts/nuclear_residue') .inputFluids(Fluid.of('gtceu:dioxygen_difluoride', 1000)) - .outputFluids(Fluid.of('minecraft:water', 10)) + .outputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) .itemOutputs('#forge:dusts/oxidized_nuclear_residue') .duration(20*5) .EUt(GTValues.VA[GTValues.IV]) @@ -201,19 +208,27 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.gas_turbine('dense_steam') .inputFluids(Fluid.of('gtceu:dense_steam', 1)) - .EUt(-(32*4)) + .EUt(-(32)) .duration(20*2) //#endregion - //#region FLiBe Line + //#region FLiBe Line - SCRAP FROM MARS TO VENUS - event.recipes.gtceu.evaporation_tower('raw_rich_brine') + /* + + event.recipes.gtceu.evaporation_tower('raw_rich_brine_earth') .inputFluids(Fluid.of('tfc:spring_water', 20000)) .outputFluids(Fluid.of('gtceu: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)) + .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)) @@ -283,9 +298,13 @@ function registerTFGNuclearRecipes(event) { .duration(20*36) .EUt(GTValues.VA[GTValues.IV]) + */ + //#endregion - //#region Bromine Line + //#region Bromine Line - SCRAP FROM MARS TO VENUS + + /* event.recipes.gtceu.evaporation_tower('evaporation_brine') .inputFluids(Fluid.of('tfc:salt_water', 20000)) @@ -293,6 +312,12 @@ function registerTFGNuclearRecipes(event) { .duration(20*50) .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.evaporation_tower('evaporation_brine_mars') + .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 20000)) + .outputFluids(Fluid.of('gtceu:raw_brine', 1000)) + .duration(20*50) + .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.fluid_heater('heat_brine') .inputFluids(Fluid.of("gtceu:raw_brine", 1000)) .outputFluids(Fluid.of("gtceu:hot_brine", 1000)) @@ -398,4 +423,6 @@ function registerTFGNuclearRecipes(event) { .duration(20*25) .EUt(GTValues.VA[GTValues.HV]) + */ + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 494d4dfd4..186d1ffb8 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -287,7 +287,7 @@ function registerTFGSpaceRecipes(event) { 'CHC', 'NEN' ], { - C: '#gtceu:circuits/iv', + C: '#gtceu:circuits/ev', S: 'gtceu:hv_sensor', E: 'gtceu:hv_emitter', H: 'gtceu:ev_machine_hull', diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index 68c5e64fe..2bc2b6a0e 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -150,14 +150,7 @@ function registerTFGTerrariumRecipes(event) { }).id('tfg:shaped/end_crystal') // chorus fruit - - event.recipes.gtceu.large_chemical_reactor('tfg:kovarex') - .itemInputs('40x gtceu:uranium_235_dust', '5x gtceu:uranium_dust') - .itemOutputs('41x gtceu:uranium_235_dust', '2x gtceu:uranium_dust') - .duration(600) - .EUt(GTValues.VA[GTValues.LuV]) - .circuit(2) - + // end stone diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index f9282a9fd..37ac4831b 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -41,7 +41,6 @@ const registerAdAstraMaterials = (event) => { .color(0xbd7980) .secondaryColor(0xA66C8D) .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) - .dust() .ingot() .liquid() .blastTemp(2900, 'mid', GTValues.VA[GTValues.HV]) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index fcc65cafb..161d0b996 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -183,7 +183,12 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:mossy_marble_cobblestone', 'gtceu:marble_bricks', 'gtceu:cracked_marble_bricks', - 'gtceu:mossy_marble_bricks' + 'gtceu:mossy_marble_bricks', + + // Machine Bedrock Miner + 'gtceu:mv_bedrock_ore_miner', + 'gtceu:hv_bedrock_ore_miner', + 'gtceu:ev_bedrock_ore_miner' ]; //#endregion diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 6ed68ad78..66cf74285 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -4,6 +4,7 @@ const registerGTCEuMachines = (event) => { const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine'); const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags") + const CoilWorkableElectricMultiblockMachine = Java.loadClass("com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine") //#region Nether Dome @@ -561,4 +562,133 @@ const registerGTCEuMachines = (event) => { 'gtceu:block/casings/solid/machine_casing_stainless_evaporation', 'gtceu:block/multiblock/distillation_tower') -} + //#endregion + + //#region Ore Line + + // Ostrum Harvester + + event.create('ostrum_harvester', 'multiblock') + .machine((holder) => new CoilWorkableElectricMultiblockMachine(holder)) + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('ostrum_harvester') + .recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT, (machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe)]) + .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) + .pattern(definition => FactoryBlockPattern.start() + .aisle(' ' ,'A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') + .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' G ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ' ,'A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('gtceu:secure_maceration_casing')) + .where('B', Predicates.blocks('gtceu:nonconducting_casing')) + .where('C', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2).setPreviewCount(2)) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) + .where('D', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('E', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1).setPreviewCount(1))) + .where('F', Predicates.heatingCoils()) + .where('G', Predicates.blocks('tfg:spice')) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .workableCasingModel( + 'gtceu:block/casings/gcym/nonconducting_casing', + 'gtceu:block/multiblock/distillation_tower') + + // Moon Harvester + + event.create('moon_dust_harvester', 'multiblock') + .machine((holder) => new CoilWorkableElectricMultiblockMachine(holder)) + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('moon_dust_harvester') + .recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT, (machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe)]) + .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) + .pattern(definition => FactoryBlockPattern.start() + .aisle('A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') + .aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle('A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('tfg:casings/machine_casing_iron_desh')) + .where('B', Predicates.blocks('gtceu:nonconducting_casing')) + .where('C', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) + .where('D', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('E', Predicates.blocks('gtceu:nonconducting_casing')) + .where('F', Predicates.heatingCoils()) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .workableCasingModel( + 'gtceu:block/casings/gcym/nonconducting_casing', + 'gtceu:block/multiblock/distillation_tower') + + // Extraterrestrial Ore Fabricator + + event.create('extraterrestrial_ore_fabricator', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('extraterrestrial_ore_fabricator') + .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT]) + .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_mars')) + .pattern(definition => FactoryBlockPattern.start() + .aisle('AAAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) + .aisle('BAAAAAAAA', 'B#######D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('AAAAAAAAA', 'A#######D', 'BB###BBGA', ' C###C ', ' BBHBB ' ) + .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('A#####AFA', 'A#####AXA', 'AAAAAAAFA', ' ', ' ' ) + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))) + .where('B', Predicates.blocks('gtceu:high_temperature_smelting_casing')) + .where('C', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('D', Predicates.blocks('gtceu:heat_vent')) + .where('E', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(6))) + .where('F', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) + .where('G', Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1)) + .where('H', Predicates.abilities(PartAbility.EXPORT_ITEMS).setExactLimit(1)) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .shapeInfo(controller => MultiblockShapeInfo.builder() + .aisle('KKAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) + .aisle('BAAAAAAAA', 'B D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('AAAAAAAAA', 'A D', 'BB BBGA', ' C C ', ' BBHBB ' ) + .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('A AMA', 'A AXA', 'AAAAAAAAA', ' ', ' ' ) + .where('X', controller, Direction.SOUTH) + .where('A', Block.getBlock('tfg:casings/machine_casing_mars')) + .where('B', Block.getBlock('gtceu:high_temperature_smelting_casing')) + .where('C', Block.getBlock('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('D', Block.getBlock('gtceu:heat_vent')) + .where('E', GTMachines.FLUID_IMPORT_HATCH[GTValues.EV], Direction.SOUTH) + .where('G', GTMachines.MUFFLER_HATCH[GTValues.LV], Direction.UP) + .where('H', GTMachines.ITEM_EXPORT_BUS[GTValues.EV], Direction.UP) + .where('M', GTMachines.AUTO_MAINTENANCE_HATCH, Direction.SOUTH) + .where('K', GTMachines.ENERGY_INPUT_HATCH[GTValues.HV], Direction.NORTH) + .where(' ', Block.getBlock('minecraft:air')) + .build() + ) + + .workableCasingModel( + 'tfg:block/casings/machine_casing_mars', + 'gtceu:block/machines/thermal_centrifuge') + +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index d066405f5..692a1384e 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -29,6 +29,7 @@ const registerGTCEuMaterialModification = (event) => { GENERATE_DOUBLE_INGOTS, HAS_SMALL_TFC_ORE, HAS_SMALL_NATIVE_TFC_ORE, + GENERATE_DUSTY_ORES, } = TFGMaterialFlags const { @@ -166,6 +167,15 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Tin.addFlags(GENERATE_DOUBLE_INGOTS); GTMaterials.Zinc.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_BOLT_SCREW); GTMaterials.SterlingSilver.addFlags(GENERATE_DOUBLE_INGOTS); + + // /* Generate Dusty Ores for Infinite Ores + + GTMaterials.Goethite.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Diamond.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.CertusQuartz.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Gold.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Cassiterite.addFlags(GENERATE_DUSTY_ORES); + // // /* Имеют инструменты, броню TFC, двойные слитки */ GTMaterials.Copper.addFlags(GENERATE_DOUBLE_INGOTS, HAS_TFC_TOOL, HAS_TFC_ARMOR, HAS_TFC_UTILITY, CAN_BE_UNMOLDED); @@ -258,6 +268,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Silicon.addFlags(GENERATE_DENSE); + GTMaterials.RTMAlloy.addFlags(GENERATE_DENSE); + GTMaterials.Lead.addFlags(GENERATE_DENSE); + GTMaterials.Quartzite.addFlags(GENERATE_ROD); GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD); diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index c34118ad5..94554dc48 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -72,4 +72,28 @@ const registerGTCEuRecipeTypes = (event) => { .setProgressBar(GuiTextures.PROGRESS_BAR_DISTILLATION_TOWER, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH) + event.create('ostrum_harvester') + .category('ostrum_harvester') + .setEUIO('in') + .setMaxIOSize(0, 1, 1, 0) + .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.JET_ENGINE) + + event.create('moon_dust_harvester') + .category('moon_dust_harvester') + .setEUIO('in') + .setMaxIOSize(1, 1, 0, 0) + .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.JET_ENGINE) + + event.create('extraterrestrial_ore_fabricator') + .category('extraterrestrial_ore_fabricator') + .setEUIO('in') + .setMaxIOSize(0, 6, 2, 0) + .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.BATH) + } diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index c73d7b257..8da674a2a 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -32,6 +32,21 @@ const registerTFGBlocks = (event) => { .particleCount(2) .particleForced(false) + event.create('tfg:spice', 'tfg:particle_emitter') + .textureAll('tfg:block/sand_spice') + .soundType('sand') + .hardness(1) + .resistance(1) + .unbreakable() + .tagBlock('tfcambiental:hot_stuff') + .lightLevel(0.1) + .mapColor('color_white') + .particleOffset(0, 2, 0) + .particleVelocity(0.05, 0, 0.05) + .particle('electric_spark') + .particleCount(3) + .particleForced(false) + // #region Machine Casings global.TFG_MACHINE_CASINGS.forEach(type => { @@ -56,6 +71,16 @@ const registerTFGBlocks = (event) => { .tagBlock('minecraft:mineable/wrench') .mapColor('color_light_gray') + event.create('tfg:casings/machine_casing_vacuum_engine_intake', 'gtceu:active') + .simple('tfg:block/casings/machine_casing_vacuum_engine_intake') + .translationKey(`block.tfg.casings.machine_casing_vacuum_engine_intake`) + .soundType('metal') + .resistance(6).hardness(5) + .tagBlock('mineable/pickaxe') + .tagBlock('forge:mineable/wrench') + .requiresTool(true) + .mapColor('color_light_gray') + //#endregion // #region Decorative vases diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index d7e7599e6..a961968dc 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -32,6 +32,13 @@ const registerTFGFluids = (event) => { .noBlock() //#region Mars + + event.create('tfg:heavy_ammoniacal_water') + .thinTexture(0x08733f) + .bucketColor(0x08733f) + .temperature(236) + .noBlock() + //#endregion //#region Venus @@ -51,4 +58,5 @@ const registerTFGFluids = (event) => { .temperature(1000) .renderType('translucent') //#endregion + } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 6049828a5..b314a0370 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -9,7 +9,6 @@ const registerTFGItems = (event) => { registerTFGDeprecatedItems(event) registerTFGFoodItems(event) - registerTFGNuclearItems(event) // #region Electronics event.create('tfg:unfinished_electron_tube', 'create:sequenced_assembly') @@ -389,4 +388,7 @@ const registerTFGItems = (event) => { event.create('tfg:photo_cell_t1') .translationKey("item.tfg.basic.photovoltaic.cell") .texture('tfg:item/photo_cell_t1') + + //#endregion + } diff --git a/kubejs/startup_scripts/tfg/items.nuclear.js b/kubejs/startup_scripts/tfg/items.nuclear.js deleted file mode 100644 index b7af34d20..000000000 --- a/kubejs/startup_scripts/tfg/items.nuclear.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 - -function registerTFGNuclearItems(event) { - - -} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index c4c2c0256..9f895bc1f 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -330,4 +330,70 @@ const registerTFGMaterials = (event) => { .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(293)) .color(0x82a6ce) .formula('HI') + + //#endregion + + //# Mars Ore Line + + event.create('lightweight_ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(760)) + .formula('(?)') + + event.create('ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(815)) + .formula('(?)') + + event.create('dense_ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(930)) + .formula('(?)') + + event.create('residual_radioactive_concoction') + .liquid(new GTFluidBuilder().customStill().temperature(450)) + .formula('(?)') + + //#endregion + + // Moon Ore Line + + event.create('regolith_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(727)) + + event.create('tfg:certus_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.CERTUS) + .color('0xc1e6e4') + .secondaryColor('0x7a5225') + + event.create('tfg:goethe_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.METALLIC) + .color('0xb0af5b') + .secondaryColor('0x7a5225') + + event.create('tfg:bright_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.SHINY) + .color('0xf0efe9') + .secondaryColor('0xffffff') + + event.create('tfg:cassiterite_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.METALLIC) + .color('0xbab6b7') + .secondaryColor('0x7a5225') + + // Reactant to Ore line + + event.create('tfg:regolith_mush') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.WOOD) + .color('0xa2cde0') + .secondaryColor('0x7a5225') + + } diff --git a/kubejs/startup_scripts/tfg/materials.nuclear.js b/kubejs/startup_scripts/tfg/materials.nuclear.js index 3ca41eee1..2adc6678d 100644 --- a/kubejs/startup_scripts/tfg/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/materials.nuclear.js @@ -129,14 +129,6 @@ const registerTFGNuclearMaterials = (event) => { //#region Dust - event.create('tfg:mars_stone_dust') - .dust() - .components('2x deuterium', '1x oxygen') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xE79B07) - .secondaryColor(0x5A4316) - .iconSet(GTMaterialIconSet.ROUGH) - event.create('tfg:nuclear_residue') .dust() .formula('(?)')