Skip to content

Commit

Permalink
Hardmode Progression Fixes + A Load Of Other Stuff (#334)
Browse files Browse the repository at this point in the history
* Update random_recipes.js

Addition of a chemical reactor Sculk Catalyst recipe to match with Nomi CEu's Dragon's Breath Recipe. Currently there's no way for HM players to get Sculk Compound without killing enough Wardens or looting enough chests for the initial amount for a T7MM afaik.

* Update post_tank_wafers.js

Modified Hyperdynamic RAM Chip recipe to be more properly gated to UIV as it now requires Holmium.

* Buffed Atomic Casing and Sterilized Filter Casing Recipe

Atomic Casings use single instead of double plates now

Sterilizing Filter Casings now use Iridium Rotors instead of Osmiridium

Removed Tritium Ring since it was uncraftable anyways

* Added Deep Dark Data Mission

Deep Dark Data is unobtainable in HM, this fixes that

* Crystallizer fix + Trinaquadalloy Mixer Recipe

-made Restonia Empowered Block recipe take the proper amount of redstone (was previously 1)

-Gave Trinaquadalloy a mixer recipe since you need a lot of it now

* Boosted Sculk Catalyst Recipes

also moved them to chem reactor instead of solely being LCR

* Create solar_flux_to_gt_solar.js

Adds the conversions of Solar Flux solar panels into GT Solar Panel covers from Nomi CEu. Regular GT Solar Panel cover recipes are replaced.

Gallium Arsenide's smelting recipe has been removed from the Electric Blast Furnace, as it can cause conflicts with trying to create Boules and is useless without GT's standard solar panel recipes.

* Unremoved Gallium Arsenide Recipes

idk maybe someone will find a use for it later

* Added Singularity Containment Unit and Contained Singularity textures

* Fix for #336

* Fixed some goofs with UEV and UIV hulls

* Sculk Reactor Implementation + World Accelerator Proper Implementation

-Added recipe for Sculk Reactor and Sculk Reactor blocks that previously didn't have a recipe

-changed World Accelerator recipes to match those in Nomi CEu, extended changes to upper tiers of World Accelerators following the same crafting pattern just with higher tier materials

* Maybe not that evil (halved amount of abyssal reaction casings required)

* Update random_recipes.js

---------

Co-authored-by: Pansmith <70342772+ThePansmith@users.noreply.github.com>
  • Loading branch information
SparkedTheorem and ThePansmith authored Jun 22, 2024
1 parent 049a108 commit a38e85c
Show file tree
Hide file tree
Showing 14 changed files with 218 additions and 8 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 3
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
131 changes: 130 additions & 1 deletion kubejs/server_scripts/End_Game.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ ServerEvents.recipes(event => {
.duration(1200)
.EUt(131072)

//Sculk Reactor
event.recipes.gtceu.assembly_line('sculk_reactor')
.itemInputs('8x kubejs:resonant_fusion_casing', '20x kubejs:abyssal_reaction_casing', "16x kubejs:resonant_fusion_coil", '32x gtceu:holmium_double_wire', '4x gtceu:uiv_field_generator', '8x kubejs:quasi_stable_neutron_star', '4x gtceu:double_infinity_plate', '4x #gtceu:circuits/uiv')
.inputFluids('gtceu:soldering_alloy 1152', 'gtceu:resonant_sculk_compound 1152')
.itemOutputs('gtceu:sculk_reactor')
.duration(6000)
.EUt(13920000)

.stationResearch(b => b
.researchStack('gtceu:sculk_reverberator')
.CWUt(160, 1024000)
.EUt(1200000)
)

// Blacklight
event.shaped(
Expand All @@ -38,6 +51,38 @@ ServerEvents.recipes(event => {
}
).id('gtceu:shaped/blacklight')

// Trinaquadalloy Mixer Recipe
event.recipes.gtceu.mixer("mixer_trinaquadalloy")
.itemInputs("6x gtceu:trinium_dust", "2x gtceu:naquadah_dust", "gtceu:carbon_dust")
.itemOutputs("9x gcyr:trinaquadalloy_dust")
.circuit(1)
.duration(300)
.EUt(491250)

// Atomic Casing Buff
event.remove({ id: 'gcyr:shaped/casing_atomic' })
event.remove({ id: 'gcyr:assembler/casing_atomic' })

event.shaped(
'2x gtceu:atomic_casing', [
'PHP',
'PFP',
'PWP'
], {
P: 'gcyr:trinaquadalloy_plate',
H: '#forge:tools/hammers',
W: '#forge:tools/wrenches',
F: 'gtceu:naquadah_alloy_frame',
}
).id('gtceu:shaped/atomic_casing')

event.recipes.gtceu.assembler("atomic_casing")
.itemInputs("6x gcyr:trinaquadalloy_plate", "gtceu:naquadah_alloy_frame")
.itemOutputs("2x gtceu:atomic_casing")
.duration(100)
.EUt(16)
.circuit(6)

// Sterilising Filter Casing
event.shaped(
'gtceu:sterilizing_filter_casing', [
Expand All @@ -50,7 +95,7 @@ ServerEvents.recipes(event => {
F: 'gtceu:item_filter',
M: 'gtceu:luv_electric_motor',
P: 'gtceu:polybenzimidazole_large_fluid_pipe',
R: 'gtceu:osmiridium_rotor', // TODO: replace with iridium rotor if possible
R: 'gtceu:iridium_rotor',
S: 'gtceu:black_steel_frame'
}
).id('gtceu:shaped/filter_casing_sterile')
Expand Down Expand Up @@ -204,6 +249,90 @@ ServerEvents.recipes(event => {
}
)

//World Accelerators
event.remove({ id: 'gtceu:shaped/lv_world_accelerator' })
event.remove({ id: 'gtceu:shaped/mv_world_accelerator' })
event.remove({ id: 'gtceu:shaped/hv_world_accelerator' })
event.remove({ id: 'gtceu:shaped/ev_world_accelerator' })
event.remove({ id: 'gtceu:shaped/iv_world_accelerator' })
event.remove({ id: 'gtceu:shaped/luv_world_accelerator' })
event.remove({ id: 'gtceu:shaped/zpm_world_accelerator' })
event.remove({ id: 'gtceu:shaped/uv_world_accelerator' })

event.recipes.gtceu.assembly_line('hv_world_accelerator')
.itemInputs('gtceu:luv_machine_hull', '64x gtceu:luv_field_generator', '16x gtceu:luv_field_generator', '20x gtceu:luv_sensor', '20x gtceu:luv_emitter', '16x #gtceu:circuits/luv', '4x gtceu:double_iridium_plate', '2x gtceu:dense_sculk_compound_plate')
.inputFluids('gtceu:enderium 1152', 'gtceu:soldering_alloy 1152')
.itemOutputs('gtceu:hv_world_accelerator')
.stationResearch(b => b.researchStack('minecraft:clock').CWUt(4,16000))
.duration(6000)
.EUt(30720)

event.recipes.gtceu.assembly_line('ev_world_accelerator')
.itemInputs('gtceu:zpm_machine_hull', '64x gtceu:zpm_field_generator', '16x gtceu:zpm_field_generator', '20x gtceu:zpm_sensor', '20x gtceu:zpm_emitter', '16x #gtceu:circuits/zpm', '4x gtceu:double_europium_plate', '2x gtceu:dense_sculk_compound_plate')
.inputFluids('gtceu:enderium 1152', 'gtceu:soldering_alloy 1152')
.itemOutputs('gtceu:ev_world_accelerator')
.duration(6000)
.EUt(122880)

.stationResearch(b => b
.researchStack('gtceu:hv_world_accelerator')
.CWUt(32, 128000)
.EUt(122880)
)

event.recipes.gtceu.assembly_line('iv_world_accelerator')
.itemInputs('gtceu:uv_machine_hull', '64x gtceu:uv_field_generator', '16x gtceu:uv_field_generator', '20x gtceu:uv_sensor', '20x gtceu:uv_emitter', '16x #gtceu:circuits/uv', '4x gtceu:double_europium_plate', '2x gtceu:dense_neutronium_plate')
.inputFluids('gtceu:enderium 1152', 'gtceu:soldering_alloy 1152')
.itemOutputs('gtceu:iv_world_accelerator')
.duration(6000)
.EUt(491520)

.stationResearch(b => b
.researchStack('gtceu:ev_world_accelerator')
.CWUt(64, 256000)
.EUt(491520)
)

event.recipes.gtceu.assembly_line('luv_world_accelerator')
.itemInputs('gtceu:uhv_machine_hull', '64x gtceu:uhv_field_generator', '16x gtceu:uhv_field_generator', '20x gtceu:uhv_sensor', '20x gtceu:uhv_emitter', '16x #gtceu:circuits/uhv', '4x gtceu:double_netherite_plate', '2x gtceu:dense_neutronium_plate')
.inputFluids('gtceu:omnium 1152', 'gtceu:soldering_alloy 1152')
.itemOutputs('gtceu:luv_world_accelerator')
.duration(6000)
.EUt(1966080)

.stationResearch(b => b
.researchStack('gtceu:iv_world_accelerator')
.CWUt(128, 512000)
.EUt(1966080)
)

//Beyond this point we could probably just treat these like joke items
event.recipes.gtceu.assembly_line('zpm_world_accelerator')
.itemInputs('gtceu:uev_machine_hull', '64x gtceu:uev_field_generator', '16x gtceu:uev_field_generator', '20x gtceu:uev_sensor', '20x gtceu:uev_emitter', '16x #gtceu:circuits/uev', '4x gtceu:double_holmium_plate', '2x gtceu:dense_infinity_plate')
.inputFluids('gtceu:omnium 1152', 'gtceu:soldering_alloy 1152')
.itemOutputs('gtceu:zpm_world_accelerator')
.duration(6000)
.EUt(7864320)

.stationResearch(b => b
.researchStack('gtceu:luv_world_accelerator')
.CWUt(128, 512000)
.EUt(7864320)
)

event.recipes.gtceu.assembly_line('uv_world_accelerator')
.itemInputs('gtceu:uiv_machine_hull', '64x gtceu:uiv_field_generator', '16x gtceu:uiv_field_generator', '20x gtceu:uiv_sensor', '20x gtceu:uiv_emitter', '16x #gtceu:circuits/uiv', '4x gtceu:double_monium_plate', '2x gtceu:dense_infinity_plate')
.inputFluids('gtceu:omnium 11520', 'gtceu:soldering_alloy 11520')
.itemOutputs('gtceu:uv_world_accelerator')
.duration(6000)
.EUt(31457280)

.stationResearch(b => b
.researchStack('gtceu:zpm_world_accelerator')
.CWUt(256, 1024000)
.EUt(31457280)
)

//! Creative Items !//

//Creative Jetpack
Expand Down
11 changes: 11 additions & 0 deletions kubejs/server_scripts/_hardmode/actualization_chamber.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,17 @@ ServerEvents.recipes(event => {
)
.duration(780)
.EUt(30720)

event.recipes.gtceu.actualization_chamber('pristine_t4half_six')
.itemInputs('kubejs:pristine_matter_t4half')
.circuit(6)
.itemOutputs(
'64x kubejs:deep_dark_data',
'64x kubejs:deep_dark_data',
'32x kubejs:warden_horn'
)
.duration(780)
.EUt(30720)

event.recipes.gtceu.actualization_chamber('pristine_t5_one')
.itemInputs('kubejs:pristine_matter_t5')
Expand Down
15 changes: 15 additions & 0 deletions kubejs/server_scripts/_hardmode/expert_missions.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,21 @@ ServerEvents.recipes(event => {
.duration(100*20)
.EUt(30720)

event.recipes.gtceu.advanced_microverse_ii('t4half_six')
.itemInputs(
'kubejs:microminer_t4half',
'8x kubejs:quantum_flux',
'64x kubejs:aerotheum_dust',
'16x minecraft:sculk_catalyst'
)
.itemOutputs(
'64x kubejs:deep_dark_data',
'64x kubejs:deep_dark_data',
'32x kubejs:warden_horn'
)
.duration(100*20)
.EUt(30720)

// Tier 8.5 missions
event.recipes.gtceu.advanced_microverse_iii('t8half_one')
.itemInputs(
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/_hardmode/universal_crystallizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ServerEvents.recipes(event => {
.EUt(1000000)

event.recipes.gtceu.universal_crystallizer('restonia_crystallization')
.itemInputs('minecraft:redstone')
.itemInputs('63x minecraft:redstone')
.inputFluids('gtceu:enriched_naquadah 3')
.itemOutputs('7x gtceu:restonia_empowered_block')
.duration(7)
Expand Down
4 changes: 2 additions & 2 deletions kubejs/server_scripts/gregtech/Post_UV_Components.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ ServerEvents.recipes(event => {
// UEV/UIV/MAX Hulls and Casing

event.recipes.gtceu.assembler('uev_hull')
.itemInputs('gtceu:uev_machine_casing', '2x gtceu:single_omnium_wire')
.itemInputs('gtceu:uev_machine_casing', '2x gtceu:omnium_single_wire')
.inputFluids('gtceu:polybenzimidazole 576')
.itemOutputs('gtceu:uev_machine_hull')
.duration(50)
Expand All @@ -149,7 +149,7 @@ ServerEvents.recipes(event => {
.EUt(16)

event.recipes.gtceu.assembler('uiv_hull')
.itemInputs('gtceu:uev_machine_casing', '2x gtceu:omnium_single_wire')
.itemInputs('gtceu:uiv_machine_casing', '2x gtceu:netherite_single_wire')
.inputFluids('gtceu:polybenzimidazole 576')
.itemOutputs('gtceu:uiv_machine_hull')
.duration(50)
Expand Down
12 changes: 12 additions & 0 deletions kubejs/server_scripts/gregtech/omnic_forge.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,16 @@ ServerEvents.recipes(event => {
.itemOutputs('3x kubejs:dimensional_stabilization_netherite_casing')
.duration(2000)
.EUt(65520)

event.recipes.gtceu.omnic_forge('kubejs:resonant_fusion_coil')
.itemInputs('2x gtceu:fusion_coil', '8x gtceu:dense_resonant_sculk_compound_plate', '2x gtceu:netherite_frame', '2x #gtceu:circuits/uhv', 'gtceu:uhv_field_generator')
.itemOutputs('2x kubejs:resonant_fusion_coil')
.duration(2000)
.EUt(65520)

event.recipes.gtceu.omnic_forge('kubejs:resonant_fusion_casing')
.itemInputs('gtceu:uiv_machine_hull', '2x kubejs:resonant_fusion_coil', '12x gtceu:resonant_sculk_compound_plate', '4x gtceu:fusion_casing_mk3', 'gtceu:uev_field_generator')
.itemOutputs('4x kubejs:resonant_fusion_casing')
.duration(2000)
.EUt(65520)
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/gregtech/post_tank_wafers.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ ServerEvents.recipes(event => {
.EUt(128000)

event.recipes.gtceu.circuit_assembler("activated_hyperdynamic_ram_chip")
.itemInputs('4x kubejs:hyperdynamic_ram_chip_base', '12x #gtceu:circuits/ulv', '4x gtceu:advanced_smd_transistor', '12x gtceu:fine_netherite_wire')
.itemInputs('4x kubejs:hyperdynamic_ram_chip_base', '2x kubejs:matter_processing_unit', '4x gtceu:advanced_smd_transistor', '12x gtceu:fine_holmium_wire')
.inputFluids('gtceu:soldering_alloy 144')
.itemOutputs('4x kubejs:hyperdynamic_ram_chip')
.cleanroom(CleanroomType.CLEANROOM)
Expand Down
4 changes: 2 additions & 2 deletions kubejs/server_scripts/mods/NuclearCraft.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ ServerEvents.recipes(event => {


event.shaped('nuclearcraft:fuel_thorium_tbu', ['AAA', 'AAA', 'AAA'], { A: 'nuclearcraft:thorium_232' })
event.shaped('nuclearcraft:fuel_uranium_heu_233', ['AAA', 'ABB', 'BBB'], { A: 'nuclearcraft:uranium_233', B: 'nuclearcraft:uranium_238' })
event.shaped('nuclearcraft:fuel_uranium_leu_233', ['ABB', 'BBB', 'BBB'], { A: 'nuclearcraft:uranium_233', B: 'nuclearcraft:uranium_238' })
event.shaped('nuclearcraft:fuel_uranium_heu_233', ['AAA', 'ABB', 'BBB'], { A: 'nuclearcraft:uranium_233', B: 'gtceu:uranium_ingot' })
event.shaped('nuclearcraft:fuel_uranium_leu_233', ['ABB', 'BBB', 'BBB'], { A: 'nuclearcraft:uranium_233', B: 'gtceu:uranium_ingot' })
event.shaped('nuclearcraft:fuel_uranium_leu_235', ['ABB', 'BBB', 'BBB'], { A: 'gtceu:uranium_235_ingot', B: 'gtceu:uranium_ingot' })
event.shaped('nuclearcraft:fuel_uranium_heu_235', ['AAA', 'ABB', 'BBB'], { A: 'gtceu:uranium_235_ingot', B: 'gtceu:uranium_ingot' })
event.shaped('nuclearcraft:fuel_neptunium_hen_236', ['AAA', 'ABB', 'BBB'], { A: 'nuclearcraft:neptunium_236', B: 'nuclearcraft:neptunium_237' })
Expand Down
18 changes: 18 additions & 0 deletions kubejs/server_scripts/random_recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,24 @@ ServerEvents.recipes(event => {
// Dust hydration
event.shapeless("minecraft:clay", ["kubejs:dust", "minecraft:water_bucket"])

// Sculk Catalyst LCR recipes
event.recipes.gtceu.large_chemical_reactor("sculk_catalyst")
.notConsumable("minecraft:sculk_catalyst")
.itemInputs('4x #forge:cobblestone')
.inputFluids("enderio:xp_juice 4000", 'gtceu:plutonium 144')
.itemOutputs("4x minecraft:sculk_catalyst")
.duration(1000)
.EUt(2000)

event.recipes.gtceu.large_chemical_reactor("sculk_catalyst_boosted")
.notConsumable("minecraft:sculk_catalyst")
.itemInputs('16x #forge:cobblestone')
.inputFluids("enderio:xp_juice 4000", 'gtceu:berkelium 144')
.itemOutputs("16x minecraft:sculk_catalyst")
.duration(1000)
.EUt(2000)


// Change recipes for LV and MV macerators
event.shaped(
"gtceu:lv_macerator", [
Expand Down
19 changes: 19 additions & 0 deletions kubejs/server_scripts/solar_flux_to_gt_solar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ServerEvents.recipes(event => {
event.remove({ id: "gtceu:shaped/solar_panel_basic" })
event.remove({ id: "gtceu:shaped/solar_panel_ulv" })
event.remove({ id: "gtceu:shaped/solar_panel_lv" })

event.shapeless('2x gtceu:solar_panel', 'solarflux:sp_2').id('gtceu:solar_panel_basic_conversion')
event.shapeless('gtceu:ulv_solar_panel', 'solarflux:sp_3').id('gtceu:solar_panel_ulv_conversion')
event.shapeless('gtceu:lv_solar_panel', 'solarflux:sp_4').id('gtceu:solar_panel_lv_conversion')
event.shapeless('gtceu:mv_solar_panel', 'solarflux:sp_5').id('gtceu:solar_panel_mv_conversion')
event.shapeless('gtceu:hv_solar_panel', 'solarflux:sp_6').id('gtceu:solar_panel_hv_conversion')
event.shapeless('gtceu:ev_solar_panel', 'solarflux:sp_7').id('gtceu:solar_panel_ev_conversion')
event.shapeless('gtceu:iv_solar_panel', 'solarflux:sp_8').id('gtceu:solar_panel_iv_conversion')
event.shapeless('2x gtceu:iv_solar_panel', 'solarflux:sp_custom_echo').id('gtceu:solar_panel_iv_conversion_echo')
event.shapeless('2x gtceu:luv_solar_panel', 'solarflux:sp_custom_resonant').id('gtceu:solar_panel_luv_conversion')
event.shapeless('gtceu:zpm_solar_panel', 'solarflux:sp_custom_abyssal').id('gtceu:solar_panel_zpm_conversion')
event.shapeless('4x gtceu:uv_solar_panel', 'solarflux:sp_custom_neutronium').id('gtceu:solar_panel_uv_conversion_neutronium')
event.shapeless('8x gtceu:uv_solar_panel', 'solarflux:sp_custom_infinity').id('gtceu:solar_panel_uv_conversion_infinity')

})
2 changes: 1 addition & 1 deletion kubejs/startup_scripts/Missing_Materials.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
GTMaterials.Holmium.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE, GTMaterialFlags.GENERATE_ROTOR, GTMaterialFlags.GENERATE_SPRING)

GTMaterials.Neutronium.addFlags(GTMaterialFlags.GENERATE_FOIL)
GTMaterials.Tritium.addFlags(GTMaterialFlags.GENERATE_RING)
GTMaterials.Iridium.addFlags(GTMaterialFlags.GENERATE_ROTOR)

GTMaterials.Einsteinium.setProperty($PropertyKey.FLUID, new $FluidProperty())
GTMaterials.Einsteinium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
Expand Down

0 comments on commit a38e85c

Please sign in to comment.