Skip to content

Commit a6269e5

Browse files
KillLaAquaKillLaAqua
committed
Adjustments prior to core update
Noted by: //undo comment link when core updated
1 parent 801d896 commit a6269e5

37 files changed

Lines changed: 279 additions & 283 deletions

‎kubejs/server_scripts/common/additions/progression/lines/combustion_lines.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,18 @@ ServerEvents.recipes(event => {
119119
.duration(200)
120120
.EUt(GTValues.VA[GTValues.ZPM]);
121121

122-
event.recipes.gtceu.modular_rocket_module(id('rp_1'))
123-
.inputFluids('gtceu:rp_1 1')
124-
.duration(200)
125-
.EUt(-32);
126-
127-
event.recipes.gtceu.modular_rocket_module(id('monomethylhydrazine'))
128-
.inputFluids('gtceu:monomethylhydrazine 1')
129-
.duration(400)
130-
.EUt(-32);
131-
132-
event.recipes.gtceu.modular_rocket_module(id('sorbitol_hypergolic_fuel'))
133-
.inputFluids('gtceu:sorbitol_hypergolic_fuel 1')
134-
.duration(600)
135-
.EUt(-32);
122+
// event.recipes.gtceu.modular_rocket_module(id('rp_1')) //undo comment link when core updated
123+
// .inputFluids('gtceu:rp_1 1')
124+
// .duration(200)
125+
// .EUt(-32);
126+
127+
// event.recipes.gtceu.modular_rocket_module(id('monomethylhydrazine'))
128+
// .inputFluids('gtceu:monomethylhydrazine 1')
129+
// .duration(400)
130+
// .EUt(-32);
131+
132+
// event.recipes.gtceu.modular_rocket_module(id('sorbitol_hypergolic_fuel'))
133+
// .inputFluids('gtceu:sorbitol_hypergolic_fuel 1')
134+
// .duration(600)
135+
// .EUt(-32);
136136
});

‎kubejs/server_scripts/common/additions/progression/power/modular_combustion.js‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
ServerEvents.recipes(event => {
1+
// ServerEvents.recipes(event => { //undo comment link when core updated
22

3-
const id = global.id;
4-
const componentMaterials = global.componentMaterials;
5-
const getRecipeTier = global.getRecipeTier;
6-
const assline = event.recipes.gtceu.assembly_line;
3+
// const id = global.id;
4+
// const componentMaterials = global.componentMaterials;
5+
// const getRecipeTier = global.getRecipeTier;
6+
// const assline = event.recipes.gtceu.assembly_line;
77

8-
assline(id('modular_combustion_frame'))
9-
.itemInputs('gtceu:luv_machine_hull', '2x #gtceu:circuits/luv', Item.of('gtceu:lapotronic_energy_orb_cluster'),
10-
'4x gtceu:luv_emitter', '4x gtceu:luv_sensor', '4x gtceu:luv_fluid_regulator', `8x gtceu:${componentMaterials.luv.materials.cable}_quadruple_cable`,
11-
`32x gtceu:fine_${componentMaterials.luv.materials.wireMechanical}_wire`)
12-
.inputFluids(`gtceu:${componentMaterials.luv.materials.lubricant} 4608`, `gtceu:${componentMaterials.luv.materials.plastic} 1152`)
13-
.itemOutputs('start_core:modular_combustion_frame')
14-
["scannerResearch(java.util.function.UnaryOperator)"](
15-
researchRecipeBuilder => researchRecipeBuilder
16-
.researchStack(Item.of('gtceu:iridium_frame'))
17-
.duration(600)
18-
.EUt(GTValues.VHA[GTValues.IV])
19-
)
20-
.duration(600)
21-
.EUt(GTValues.VHA[GTValues.LuV]);
8+
// assline(id('modular_combustion_frame'))
9+
// .itemInputs('gtceu:luv_machine_hull', '2x #gtceu:circuits/luv', Item.of('gtceu:lapotronic_energy_orb_cluster'),
10+
// '4x gtceu:luv_emitter', '4x gtceu:luv_sensor', '4x gtceu:luv_fluid_regulator', `8x gtceu:${componentMaterials.luv.materials.cable}_quadruple_cable`,
11+
// `32x gtceu:fine_${componentMaterials.luv.materials.wireMechanical}_wire`)
12+
// .inputFluids(`gtceu:${componentMaterials.luv.materials.lubricant} 4608`, `gtceu:${componentMaterials.luv.materials.plastic} 1152`)
13+
// .itemOutputs('start_core:modular_combustion_frame')
14+
// ["scannerResearch(java.util.function.UnaryOperator)"](
15+
// researchRecipeBuilder => researchRecipeBuilder
16+
// .researchStack(Item.of('gtceu:iridium_frame'))
17+
// .duration(600)
18+
// .EUt(GTValues.VHA[GTValues.IV])
19+
// )
20+
// .duration(600)
21+
// .EUt(GTValues.VHA[GTValues.LuV]);
2222

23-
[
23+
// [
2424

25-
{ tier: 'luv', researchItem: 'gtceu:extreme_combustion_engine' },
26-
{ tier: 'zpm', researchItem: 'start_core:luv_combustion_module', cwuT: 24 },
27-
{ tier: 'uv', researchItem: 'start_core:zpm_combustion_module' , cwuT: 64 },
28-
{ tier: 'uev', researchItem: 'start_core:uv_combustion_module' , cwuT: 160 }
25+
// { tier: 'luv', researchItem: 'gtceu:extreme_combustion_engine' },
26+
// { tier: 'zpm', researchItem: 'start_core:luv_combustion_module', cwuT: 24 },
27+
// { tier: 'uv', researchItem: 'start_core:zpm_combustion_module' , cwuT: 64 },
28+
// { tier: 'uev', researchItem: 'start_core:uv_combustion_module' , cwuT: 160 }
2929

30-
].forEach(machine => {
31-
const machineType = (machine.tier === 'luv' || machine.tier === 'zpm') ? 'combustion' : 'rocket';
32-
const circuitCount = (machineType === 'rocket') ? 8 : 6;
33-
const plateCount = (machineType === 'rocket') ? 4 : 2;
34-
const otherCounts = (machineType === 'rocket') ? 6 : 4;
35-
const cableType = (machineType === 'rocket') ? 'double' : 'single';
36-
const fluidMultiplier = (machineType == 'rocket') ? 2 : 1;
30+
// ].forEach(machine => {
31+
// const machineType = (machine.tier === 'luv' || machine.tier === 'zpm') ? 'combustion' : 'rocket';
32+
// const circuitCount = (machineType === 'rocket') ? 8 : 6;
33+
// const plateCount = (machineType === 'rocket') ? 4 : 2;
34+
// const otherCounts = (machineType === 'rocket') ? 6 : 4;
35+
// const cableType = (machineType === 'rocket') ? 'double' : 'single';
36+
// const fluidMultiplier = (machineType == 'rocket') ? 2 : 1;
3737

38-
const {
39-
tierMaterial,
40-
primMaterial,
41-
supMaterial,
42-
wireMechanical,
43-
cable,
44-
lubricant,
45-
plastic
46-
} = componentMaterials[machine.tier].materials;
38+
// const {
39+
// tierMaterial,
40+
// primMaterial,
41+
// supMaterial,
42+
// wireMechanical,
43+
// cable,
44+
// lubricant,
45+
// plastic
46+
// } = componentMaterials[machine.tier].materials;
4747

48-
const mainRecipe = assline(id(`${machine.tier}_combustion_module`));
48+
// const mainRecipe = assline(id(`${machine.tier}_combustion_module`));
4949

50-
mainRecipe
51-
.itemInputs(`gtceu:${machine.tier}_machine_hull`, `${circuitCount}x #gtceu:circuits/${machine.tier}`, `${plateCount}x gtceu:dense_${tierMaterial}_plate`,
52-
`${otherCounts}x gtceu:${primMaterial}_gear`, `${otherCounts}x gtceu:small_${supMaterial}_gear`, `${otherCounts}x gtceu:${machine.tier}_electric_motor`,
53-
`${otherCounts}x gtceu:${machine.tier}_electric_piston`, `8x gtceu:${cable}_${cableType}_cable`
54-
)
55-
.inputFluids(`gtceu:${lubricant} ${4608 * fluidMultiplier}`, `gtceu:${plastic} ${1152 * fluidMultiplier}`)
56-
.itemOutputs(`start_core:${machine.tier}_combustion_module`)
57-
.duration(600)
58-
.EUt(GTValues.VHA[GTValues[getRecipeTier(machine.tier)]]);
50+
// mainRecipe
51+
// .itemInputs(`gtceu:${machine.tier}_machine_hull`, `${circuitCount}x #gtceu:circuits/${machine.tier}`, `${plateCount}x gtceu:dense_${tierMaterial}_plate`,
52+
// `${otherCounts}x gtceu:${primMaterial}_gear`, `${otherCounts}x gtceu:small_${supMaterial}_gear`, `${otherCounts}x gtceu:${machine.tier}_electric_motor`,
53+
// `${otherCounts}x gtceu:${machine.tier}_electric_piston`, `8x gtceu:${cable}_${cableType}_cable`
54+
// )
55+
// .inputFluids(`gtceu:${lubricant} ${4608 * fluidMultiplier}`, `gtceu:${plastic} ${1152 * fluidMultiplier}`)
56+
// .itemOutputs(`start_core:${machine.tier}_combustion_module`)
57+
// .duration(600)
58+
// .EUt(GTValues.VHA[GTValues[getRecipeTier(machine.tier)]]);
5959

60-
if (machine.tier === 'luv') {
61-
mainRecipe
62-
['scannerResearch(java.util.function.UnaryOperator)'](
63-
researchRecipeBuilder => researchRecipeBuilder
64-
.researchStack(Item.of(machine.researchItem))
65-
.duration(300)
66-
.EUt(GTValues.VHA[GTValues.IV])
67-
);
68-
}
69-
else {
70-
mainRecipe
71-
.stationResearch(
72-
researchRecipeBuilder => researchRecipeBuilder
73-
.researchStack(Item.of(machine.researchItem))
74-
.CWUt(machine.cwuT)
75-
.EUt(GTValues.VHA[GTValues[getRecipeTier(machine.tier)]])
76-
);
77-
}
60+
// if (machine.tier === 'luv') {
61+
// mainRecipe
62+
// ['scannerResearch(java.util.function.UnaryOperator)'](
63+
// researchRecipeBuilder => researchRecipeBuilder
64+
// .researchStack(Item.of(machine.researchItem))
65+
// .duration(300)
66+
// .EUt(GTValues.VHA[GTValues.IV])
67+
// );
68+
// }
69+
// else {
70+
// mainRecipe
71+
// .stationResearch(
72+
// researchRecipeBuilder => researchRecipeBuilder
73+
// .researchStack(Item.of(machine.researchItem))
74+
// .CWUt(machine.cwuT)
75+
// .EUt(GTValues.VHA[GTValues[getRecipeTier(machine.tier)]])
76+
// );
77+
// }
7878

79-
if (machineType === 'rocket') {
80-
mainRecipe
81-
.itemInputs(`${otherCounts}x gtceu:${machine.tier}_fluid_regulator`, `32x gtceu:fine_${wireMechanical}_wire`);
82-
}
79+
// if (machineType === 'rocket') {
80+
// mainRecipe
81+
// .itemInputs(`${otherCounts}x gtceu:${machine.tier}_fluid_regulator`, `32x gtceu:fine_${wireMechanical}_wire`);
82+
// }
8383

8484

8585

86-
});
86+
// });
8787

88-
});
88+
// });

‎kubejs/server_scripts/utils/helpers/recipe_helpers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ global.getRecipeTier = (tier) => {
270270
return recipeTier;
271271
}
272272

273-
const getDataItem = (cwu) => (cwu >= 320) ? 'start_core:component_data_core' : (cwu >= 160) ? 'start_core:data_dna_disk' : (cwu >=32) ? 'gtceu:data_module' : 'gtceu:data_orb' ;
273+
global.getDataItem = (cwu) => (cwu >= 320) ? 'start_core:component_data_core' : (cwu >= 160) ? 'start_core:data_dna_disk' : (cwu >=32) ? 'gtceu:data_module' : 'gtceu:data_orb' ;
274274

275275
ServerEvents.recipes(event => {
276276

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/large_cubes.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
1414
const largeCube = (type, casing) => {
1515
event.create(`t_large_${type}`, 'multiblock')
1616
.rotationState(RotationState.NON_Y_AXIS)
17-
.tooltips([
18-
Text.translate("block.start_core.gap"),
19-
Text.translate("block.kubejs.only_one_2a_hatch.tooltip")
20-
])
17+
// .tooltips([ //undo comment link when core updated
18+
// Text.translate("block.start_core.gap"),
19+
// Text.translate("block.kubejs.only_one_2a_hatch.tooltip")
20+
// ])
2121
.recipeType(type)
2222
.recipeModifiers([GTRecipeModifiers.OC_PERFECT, GTRecipeModifiers.BATCH_MODE])
2323
.appearanceBlock(() => Block.getBlock(`kubejs:${casing}_casing`))

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_abs.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
22

33
event.create('super_abs', 'multiblock')
44
.rotationState(RotationState.NON_Y_AXIS)
5-
.tooltips([
6-
Text.translate("block.start_core.gap"),
7-
Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8-
])
5+
// .tooltips([ //undo comment link when core updated
6+
// Text.translate("block.start_core.gap"),
7+
// Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8+
// ])
99
.recipeType('alloy_blast_smelter')
1010
.machine((holder) => new $CoiledMulti(holder))
1111
.recipeModifiers([GTRecipeModifiers.EBF_OVERCLOCK, $StarTRecipeModifiers.THROUGHPUT_BOOSTING, GTRecipeModifiers.BATCH_MODE])

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_barrel.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
22

33
event.create('super_barrel', 'multiblock')
44
.rotationState(RotationState.NON_Y_AXIS)
5-
.tooltips([
6-
Text.translate("block.start_core.gap"),
7-
Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8-
])
5+
// .tooltips([ //undo comment link when core updated
6+
// Text.translate("block.start_core.gap"),
7+
// Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8+
// ])
99
.recipeTypes(['industrial_barrel_aqueous', 'industrial_barrel_magmatic'])
1010
.recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT_SUBTICK, $StarTRecipeModifiers.THROUGHPUT_BOOSTING, GTRecipeModifiers.BATCH_MODE])
1111
.appearanceBlock(GTBlocks.CASING_PALLADIUM_SUBSTATION)

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_cracker.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
22

33
event.create('super_cracker', 'multiblock')
44
.rotationState(RotationState.NON_Y_AXIS)
5-
.tooltips([
6-
Text.translate("block.start_core.gap"),
7-
Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8-
])
5+
// .tooltips([ //undo comment link when core updated
6+
// Text.translate("block.start_core.gap"),
7+
// Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8+
// ])
99
.recipeType('cracker')
1010
.machine((holder) => new $CoiledMulti(holder))
1111
.recipeModifiers([GTRecipeModifiers.CRACKER_OVERCLOCK, $StarTRecipeModifiers.THROUGHPUT_BOOSTING, GTRecipeModifiers.BATCH_MODE])

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_cutter.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
22

33
event.create('super_cutter', 'multiblock')
44
.rotationState(RotationState.NON_Y_AXIS)
5-
.tooltips([
6-
Text.translate("block.start_core.gap"),
7-
Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8-
])
5+
// .tooltips([ //undo comment link when core updated
6+
// Text.translate("block.start_core.gap"),
7+
// Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8+
// ])
99
.recipeType('cutter')
1010
.recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT, $StarTRecipeModifiers.THROUGHPUT_BOOSTING, GTRecipeModifiers.BATCH_MODE])
1111
.appearanceBlock(() => Block.getBlock('kubejs:beryllium_bronze_casing'))

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_ebf.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
22

33
event.create('super_ebf', 'multiblock')
44
.rotationState(RotationState.NON_Y_AXIS)
5-
.tooltips([
6-
Text.translate("block.start_core.gap"),
7-
Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8-
])
5+
// .tooltips([ //undo comment link when core updated
6+
// Text.translate("block.start_core.gap"),
7+
// Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
8+
// ])
99
.recipeType('electric_blast_furnace')
1010
.machine((holder) => new $CoiledMulti(holder))
1111
.recipeModifiers([GTRecipeModifiers.EBF_OVERCLOCK, $StarTRecipeModifiers.THROUGHPUT_BOOSTING, GTRecipeModifiers.BATCH_MODE])

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_gas_collector.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
GTCEuStartupEvents.registry('gtceu:machine', event => {
22
event.create('super_gas_collector', 'multiblock')
33
.rotationState(RotationState.NON_Y_AXIS)
4-
.tooltips([
5-
Text.translate("block.start_core.gap"),
6-
Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
7-
])
4+
// .tooltips([ //undo comment link when core updated
5+
// Text.translate("block.start_core.gap"),
6+
// Text.translate("gtceu.multiblock.exact_hatch_1.tooltip")
7+
// ])
88
.recipeType('gas_collector')
99
.recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT_SUBTICK, $StarTRecipeModifiers.THROUGHPUT_BOOSTING, GTRecipeModifiers.BATCH_MODE])
1010
.appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN)

0 commit comments

Comments
 (0)