Skip to content

Commit ea654fd

Browse files
UltraPuPowerUltraPuPower
committed
Merge branch 'Theta-1-Testing' of https://github.com/StarT-Dev-Team/Star-Technology into Theta-1-Testing
2 parents b202d44 + 2e41f95 commit ea654fd

10 files changed

Lines changed: 255 additions & 250 deletions

File tree

‎config/ftbquests/quests/chapters/industrial_revolution.snbt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,11 @@
735735
y: 4.5d
736736
}
737737
{
738-
dependencies: ["397C622B06B1165A"]
738+
dependencies: [
739+
"397C622B06B1165A"
740+
"6C7DB1CB4517B843"
741+
]
742+
dependency_requirement: "one_completed"
739743
description: ["{ftbquests.industrial_revolution.sphalerite.description}"]
740744
id: "3F116A55E0215095"
741745
rewards: [{

‎config/ftbquests/quests/chapters/line_of_progression.snbt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,10 +1199,6 @@
11991199
Count: 1b
12001200
id: "gtceu:t_large_bender"
12011201
}
1202-
{
1203-
Count: 1b
1204-
id: "gtceu:large_chemical_reactor"
1205-
}
12061202
{
12071203
Count: 1b
12081204
id: "gtceu:t_large_lathe"
@@ -1371,6 +1367,10 @@
13711367
Count: 1b
13721368
id: "gtceu:electric_ore_factory"
13731369
}
1370+
{
1371+
Count: 1b
1372+
id: "gtceu:large_chemical_reactor"
1373+
}
13741374
{
13751375
Count: 1b
13761376
id: "gtceu:industrial_barrel"

‎kubejs/assets/gtceu/lang/en_us.json‎

Lines changed: 145 additions & 150 deletions
Large diffs are not rendered by default.

‎kubejs/client_scripts/common/tooltips.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ItemEvents.tooltip(event => {
66
"lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv", "uev", "uiv"
77
];
88
const addedByStarTSingles = [
9-
"electric_blast_furnace", "electric_smoker", "me_assembler"
9+
"electric_blaster", "electric_smoker", "me_assembler"
1010
];
1111

1212
tiers.forEach(tier => {

‎kubejs/server_scripts/common/additions/progression/lines/gate_lines/aerogels.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ ServerEvents.recipes (event => {
4444
.inputFluids(`gtceu:chlorine 4000`)
4545
.outputFluids(`gtceu:silicon_tetrachloride 1000`)
4646
.duration(200)
47+
.circuit(0)
4748
.EUt(GTValues.VHA[GTValues.ZPM]);
4849

4950
lcr(id(`tetraethyl_orthosilicate`))
@@ -77,4 +78,4 @@ ServerEvents.recipes (event => {
7778
//dust removal
7879
event.remove({output: `gtceu:aerogel_dust`});
7980
event.remove({input: `gtceu:aerogel_dust`});
80-
})
81+
})

‎kubejs/server_scripts/common/additions/progression/recycling/general_recycling_info.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ global.singleblockRecyclingDetails = { //if specialSingle = true, the next 3 are
185185
extraCasings: 0,
186186
extraCables: 0
187187
},
188-
electric_blast_furnace: {
189-
name: "electric_blast_furnace",
188+
electric_blaster: {
189+
name: "electric_blaster",
190190
specialSingle: true,
191191
components: " ",
192192
extraCasings: 0,

‎kubejs/server_scripts/common/systems/gate_based/csg.js‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -15,70 +15,70 @@ ServerEvents.recipes(event => {
1515
const researchBuilder = global.researchBuilder;
1616
// global.researchBuilder = (machineType, recId, inputsI, inputsF, outputsI, duration, cwuT, totalCWU, euT, researched)
1717

18-
researchBuilder(cpa, 'csg_chevron',
19-
['2x gtceu:long_prismalium_rod', 'gtceu:exquisite_naquadic_netherite_gem', 'kubejs:csg_field_stabiliser',
20-
'kubejs:csg_computational_matrix', '4x gtceu:zpm_sensor', '64x gtceu:fine_borosilicate_glass_wire'],
21-
['gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
22-
['kubejs:csg_chevron'],
23-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:exquisite_naquadic_netherite_gem');
24-
25-
researchBuilder(cpa, 'csg_reinforced_plating',
26-
['gtceu:dense_trinaquadalloy_plate', 'gtceu:zpm_electric_piston', 'gtceu:dense_naquadah_alloy_plate',
27-
'2x #gtceu:circuits/uv', 'gtceu:dense_enriched_naquadah_plate', '8x gtceu:yttrium_barium_cuprate_single_cable'],
28-
['gtceu:naquadria 288', 'gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
29-
['kubejs:csg_reinforced_plating'],
30-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:dense_trinaquadalloy_plate');
31-
32-
researchBuilder(cpa, 'csg_stellar_access_point',
33-
['gtceu:double_naquadah_plate', 'kubejs:csg_computational_matrix', '4x gtceu:prismalium_double_wire',
34-
'gtceu:polycarbonate_foil_ream', 'gtceu:polyphenylene_sulfide_foil_ream', 'gtceu:polyvinyl_chloride_foil_ream'],
35-
['gtceu:indium_tin_lead_cadmium_soldering_alloy 864', 'gtceu:polybenzimidazole 1296'],
36-
['kubejs:csg_stellar_access_point'],
37-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:yttrium_barium_cuprate_double_cable')
38-
39-
researchBuilder(cpa, 'csg_energy_modulator',
40-
['gtceu:trinaquadalloy_frame', '1x gtceu:zpm_emitter', '4x gtceu:prismalium_foil', 'gtceu:energy_module',
41-
'4x kubejs:advanced_neutron_reflector', '4x gtceu:naquadah_alloy_foil'],
42-
['gtceu:pcb_coolant 250000', 'gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
43-
['kubejs:csg_energy_modulator'],
44-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:prismalium_foil');
45-
46-
researchBuilder(cpa, 'csg_field_stabiliser',
47-
['2x gtceu:dense_enriched_naquadah_plate', '4x gtceu:zpm_field_generator', 'kubejs:csg_energy_modulator',
48-
'16x gtceu:fine_lumium_wire', '16x gtceu:fine_twinite_wire', '16x gtceu:fine_signalum_wire'],
49-
['gtceu:indium_tin_lead_cadmium_soldering_alloy 1296'],
50-
['kubejs:csg_field_stabiliser'],
51-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:fine_trinaquadalloy_wire');
52-
53-
researchBuilder(cpa, 'csg_stellar_dialer',
54-
['gtceu:dense_enriched_naquadah_plate', 'gtceu:computer_monitor_cover', 'kubejs:csg_computational_matrix',
55-
'gtceu:dragonsteel_bolt'],
56-
['gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
57-
['kubejs:csg_stellar_dialer'],
58-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:computer_monitor_cover')
59-
60-
researchBuilder(assline, 'quantum_core',
61-
['gtceu:weapon_grade_naquadah_frame', '4x kubejs:csg_energy_modulator', '16x gtceu:quantum_star', '2x gtceu:zpm_field_generator',
62-
'6x gtceu:trinium_spring', '4x gtceu:zpm_electric_pump', '16x gtceu:fine_prismalium_wire','16x gtceu:osthendah_foil',
63-
'8x gtceu:naquadah_alloy_plate', '4x gtceu:osmiridium_bolt'],
64-
['gtceu:nether_star_concentrate 864', 'gtceu:polybenzimidazole 1296'],
65-
['kubejs:quantum_core'],
66-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:quantum_star');
67-
68-
researchBuilder(assline, 'crystal_interface',
18+
researchBuilder(cpa, 'csg_chevron',
19+
['2x gtceu:long_prismalium_rod', 'gtceu:exquisite_naquadic_netherite_gem', 'kubejs:csg_field_stabiliser',
20+
'kubejs:csg_computational_matrix', '4x gtceu:zpm_sensor', '64x gtceu:fine_borosilicate_glass_wire'],
21+
['gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
22+
['kubejs:csg_chevron'],
23+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:exquisite_naquadic_netherite_gem', 'gtceu:data_orb');
24+
25+
researchBuilder(cpa, 'csg_reinforced_plating',
26+
['gtceu:dense_trinaquadalloy_plate', 'gtceu:zpm_electric_piston', 'gtceu:dense_naquadah_alloy_plate',
27+
'2x #gtceu:circuits/uv', 'gtceu:dense_enriched_naquadah_plate', '8x gtceu:yttrium_barium_cuprate_single_cable'],
28+
['gtceu:naquadria 288', 'gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
29+
['kubejs:csg_reinforced_plating'],
30+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:dense_trinaquadalloy_plate', 'gtceu:data_orb');
31+
32+
researchBuilder(cpa, 'csg_stellar_access_point',
33+
['gtceu:double_naquadah_plate', 'kubejs:csg_computational_matrix', '4x gtceu:prismalium_double_wire',
34+
'gtceu:polycarbonate_foil_ream', 'gtceu:polyphenylene_sulfide_foil_ream', 'gtceu:polyvinyl_chloride_foil_ream'],
35+
['gtceu:indium_tin_lead_cadmium_soldering_alloy 864', 'gtceu:polybenzimidazole 1296'],
36+
['kubejs:csg_stellar_access_point'],
37+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:yttrium_barium_cuprate_double_cable', 'gtceu:data_orb')
38+
39+
researchBuilder(cpa, 'csg_energy_modulator',
40+
['gtceu:trinaquadalloy_frame', '1x gtceu:zpm_emitter', '4x gtceu:prismalium_foil', 'gtceu:energy_module',
41+
'4x kubejs:advanced_neutron_reflector', '4x gtceu:naquadah_alloy_foil'],
42+
['gtceu:pcb_coolant 250000', 'gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
43+
['kubejs:csg_energy_modulator'],
44+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:prismalium_foil', 'gtceu:data_orb');
45+
46+
researchBuilder(cpa, 'csg_field_stabiliser',
47+
['2x gtceu:dense_enriched_naquadah_plate', '4x gtceu:zpm_field_generator', 'kubejs:csg_energy_modulator',
48+
'16x gtceu:fine_lumium_wire', '16x gtceu:fine_twinite_wire', '16x gtceu:fine_signalum_wire'],
49+
['gtceu:indium_tin_lead_cadmium_soldering_alloy 1296'],
50+
['kubejs:csg_field_stabiliser'],
51+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:fine_trinaquadalloy_wire', 'gtceu:data_orb');
52+
53+
researchBuilder(cpa, 'csg_stellar_dialer',
54+
['gtceu:dense_enriched_naquadah_plate', 'gtceu:computer_monitor_cover', 'kubejs:csg_computational_matrix',
55+
'gtceu:dragonsteel_bolt'],
56+
['gtceu:indium_tin_lead_cadmium_soldering_alloy 864'],
57+
['kubejs:csg_stellar_dialer'],
58+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:computer_monitor_cover', 'gtceu:data_orb')
59+
60+
researchBuilder(assline, 'quantum_core',
61+
['gtceu:weapon_grade_naquadah_frame', '4x kubejs:csg_energy_modulator', '16x gtceu:quantum_star', '2x gtceu:zpm_field_generator',
62+
'6x gtceu:trinium_spring', '4x gtceu:zpm_electric_pump', '16x gtceu:fine_prismalium_wire', '16x gtceu:osthendah_foil',
63+
'8x gtceu:naquadah_alloy_plate', '4x gtceu:osmiridium_bolt'],
64+
['gtceu:nether_star_concentrate 864', 'gtceu:polybenzimidazole 1296'],
65+
['kubejs:quantum_core'],
66+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:quantum_star', 'gtceu:data_orb');
67+
68+
researchBuilder(assline, 'crystal_interface',
6969
['gtceu:trinaquadalloy_frame', '16x gtceu:prismalium_hex_wire', '6x kubejs:csg_reinforced_plating',
70-
'kubejs:csg_stellar_access_point', 'kubejs:csg_energy_modulator', '64x gtceu:fine_dragonsteel_wire', '64x gtceu:fine_dragonsteel_wire'],
71-
['gtceu:indium_tin_lead_cadmium_soldering_alloy 3888', 'gtceu:polycarbonate 2592'],
72-
['sgjourney:crystal_interface'],
73-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'start_core:zpm_64a_energy_converter');
74-
75-
researchBuilder(assline, 'csg_dimensional_supercomputer',
76-
['3x gtceu:trinaquadalloy_frame', '8x kubejs:csg_computational_matrix', 'kubejs:quantum_core', '64x #gtceu:circuits/uv',
77-
'8x gtceu:prismalium_foil_ream', '24x gtceu:enriched_naquadah_small_fluid_pipe', '36x gtceu:silicone_rubber_ring',
78-
'48x gtceu:polycarbonate_tiny_fluid_pipe'],
79-
['gtceu:polybenzimidazole 3888', 'gtceu:indium_tin_lead_cadmium_soldering_alloy 2592', 'gtceu:naquadria 576'],
80-
['kubejs:csg_dimensional_supercomputer'],
81-
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:crystal_processor_mainframe')
70+
'kubejs:csg_stellar_access_point', 'kubejs:csg_energy_modulator', '64x gtceu:fine_dragonsteel_wire', '64x gtceu:fine_dragonsteel_wire'],
71+
['gtceu:indium_tin_lead_cadmium_soldering_alloy 3888', 'gtceu:polycarbonate 2592'],
72+
['sgjourney:crystal_interface'],
73+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'start_core:zpm_64a_energy_converter', 'gtceu:data_orb');
74+
75+
researchBuilder(assline, 'csg_dimensional_supercomputer',
76+
['3x gtceu:trinaquadalloy_frame', '8x kubejs:csg_computational_matrix', 'kubejs:quantum_core', '64x #gtceu:circuits/uv',
77+
'8x gtceu:prismalium_foil_ream', '24x gtceu:enriched_naquadah_small_fluid_pipe', '36x gtceu:silicone_rubber_ring',
78+
'48x gtceu:polycarbonate_tiny_fluid_pipe'],
79+
['gtceu:polybenzimidazole 3888', 'gtceu:indium_tin_lead_cadmium_soldering_alloy 2592', 'gtceu:naquadria 576'],
80+
['kubejs:csg_dimensional_supercomputer'],
81+
6000, 48, 48 * 600, GTValues.VHA[GTValues.ZPM], 'gtceu:crystal_processor_mainframe', 'gtceu:data_orb')
8282

8383
lcr(id('csg_enscription_plate'))
8484
.itemInputs('gtceu:naquadah_wafer', '48x gtceu:aerogel_foil', '1x #gtceu:circuits/uv')
@@ -97,7 +97,7 @@ ServerEvents.recipes(event => {
9797
.EUt(GTValues.VHA[GTValues.ZPM]);
9898

9999
assembler(id('classic_dhd'))
100-
.itemInputs('gtceu:atomic_casing', 'kubejs:csg_stellar_dialer', '12x gtceu:dragonsteel_foil',
100+
.itemInputs('gtceu:atomic_casing', 'kubejs:csg_stellar_dialer', '12x gtceu:dragonsteel_foil',
101101
'12x kubejs:proto_solarus_rune', '14x kubejs:proto_energized_rune', '12x kubejs:proto_lunarus_rune')
102102
.inputFluids('gtceu:indium_tin_lead_cadmium_soldering_alloy 1296')
103103
.itemOutputs('sgjourney:classic_dhd')
@@ -130,15 +130,15 @@ ServerEvents.recipes(event => {
130130

131131
rotor(id('raw_stargate_rod'))
132132
.layeredRecipe((layers) => layers
133-
.itemInputs('kubejs:csg_stargate_rod_base','2x gtceu:quantum_star')
133+
.itemInputs('kubejs:csg_stargate_rod_base', '2x gtceu:quantum_star')
134134
.next()
135-
.itemInputs('gtceu:naquadah_alloy_foil_ream','gtceu:weapon_grade_naquadah_foil_ream','gtceu:pure_netherite_foil_ream')
135+
.itemInputs('gtceu:naquadah_alloy_foil_ream', 'gtceu:weapon_grade_naquadah_foil_ream', 'gtceu:pure_netherite_foil_ream')
136136
.inputFluids('gtceu:lubricant 25000')
137137
.next()
138-
.itemInputs('gtceu:netherite_foil_ream','gtceu:nether_star_foil_ream','gtceu:trinaquadalloy_foil_ream')
138+
.itemInputs('gtceu:netherite_foil_ream', 'gtceu:nether_star_foil_ream', 'gtceu:trinaquadalloy_foil_ream')
139139
.inputFluids('gtceu:lubricant 25000')
140140
.next()
141-
.itemInputs('gtceu:naquadah_alloy_foil_ream','gtceu:weapon_grade_naquadah_foil_ream','gtceu:pure_netherite_foil_ream')
141+
.itemInputs('gtceu:naquadah_alloy_foil_ream', 'gtceu:weapon_grade_naquadah_foil_ream', 'gtceu:pure_netherite_foil_ream')
142142
.inputFluids('gtceu:lubricant 25000')
143143
)
144144
.itemOutputs('kubejs:raw_stargate_rod')
@@ -154,7 +154,7 @@ ServerEvents.recipes(event => {
154154

155155
stargateComponent('csg_ring')
156156
.layeredRecipe((layers) => layers
157-
.itemInputs('gtceu:prismalium_frame','16x kubejs:activated_stargate_rod')
157+
.itemInputs('gtceu:prismalium_frame', '16x kubejs:activated_stargate_rod')
158158
.next()
159159
.itemInputs('2x kubejs:proto_solarus_rune', 'kubejs:csg_reinforced_plating')
160160
.next()
@@ -169,13 +169,13 @@ ServerEvents.recipes(event => {
169169

170170
stargateComponent('csg_chevron')
171171
.layeredRecipe((layers) => layers
172-
.itemInputs('sgjourney:classic_stargate_ring_block','kubejs:csg_chevron','6x kubejs:activated_stargate_rod')
172+
.itemInputs('sgjourney:classic_stargate_ring_block', 'kubejs:csg_chevron', '6x kubejs:activated_stargate_rod')
173173
.next()
174-
.itemInputs('kubejs:csg_field_stabiliser', 'kubejs:csg_reinforced_plating','2x kubejs:activated_stargate_rod')
174+
.itemInputs('kubejs:csg_field_stabiliser', 'kubejs:csg_reinforced_plating', '2x kubejs:activated_stargate_rod')
175175
.next()
176176
.itemInputs('kubejs:proto_solarus_rune', '3x kubejs:proto_energized_rune', 'kubejs:proto_lunarus_rune')
177177
.next()
178-
.itemInputs('kubejs:csg_field_stabiliser', 'kubejs:csg_reinforced_plating','2x kubejs:activated_stargate_rod')
178+
.itemInputs('kubejs:csg_field_stabiliser', 'kubejs:csg_reinforced_plating', '2x kubejs:activated_stargate_rod')
179179
)
180180
.inputFluids('gtceu:naquadria 1152')
181181
.itemOutputs('sgjourney:classic_stargate_chevron_block')
@@ -184,31 +184,31 @@ ServerEvents.recipes(event => {
184184

185185
stargateComponent('csg_base')
186186
.layeredRecipe((layers) => layers
187-
.itemInputs('sgjourney:classic_stargate_ring_block','kubejs:csg_dimensional_supercomputer','6x kubejs:activated_stargate_rod')
187+
.itemInputs('sgjourney:classic_stargate_ring_block', 'kubejs:csg_dimensional_supercomputer', '6x kubejs:activated_stargate_rod')
188188
.next()
189-
.itemInputs('kubejs:csg_stellar_access_point', 'kubejs:csg_reinforced_plating','2x kubejs:activated_stargate_rod')
189+
.itemInputs('kubejs:csg_stellar_access_point', 'kubejs:csg_reinforced_plating', '2x kubejs:activated_stargate_rod')
190190
.next()
191191
.itemInputs('6x kubejs:proto_solarus_rune', '4x kubejs:proto_energized_rune', '6x kubejs:proto_lunarus_rune')
192192
.next()
193-
.itemInputs('kubejs:csg_stellar_access_point', 'kubejs:csg_reinforced_plating','2x kubejs:activated_stargate_rod')
193+
.itemInputs('kubejs:csg_stellar_access_point', 'kubejs:csg_reinforced_plating', '2x kubejs:activated_stargate_rod')
194194
)
195195
.inputFluids('gtceu:naquadria 1152')
196196
.itemOutputs('sgjourney:classic_stargate_base_block')
197197
.duration(1200)
198198
.EUt(GTValues.VHA[GTValues.UV]);
199199

200200
event.recipes.create.mechanical_crafting(`sgjourney:classic_stargate {BlockEntityTag:{LocalPointOfOrigin:1b}}`, [
201-
' CRCRC ',
202-
'RR RR',
203-
'C C',
204-
'R R',
205-
'R R',
206-
'CR RC',
207-
' RCBCR '
208-
], {
209-
R: 'sgjourney:classic_stargate_ring_block',
210-
C: 'sgjourney:classic_stargate_chevron_block',
211-
B: 'sgjourney:classic_stargate_base_block'
212-
}).id('start:shaped/csg');
201+
' CRCRC ',
202+
'RR RR',
203+
'C C',
204+
'R R',
205+
'R R',
206+
'CR RC',
207+
' RCBCR '
208+
], {
209+
R: 'sgjourney:classic_stargate_ring_block',
210+
C: 'sgjourney:classic_stargate_chevron_block',
211+
B: 'sgjourney:classic_stargate_base_block'
212+
}).id('start:shaped/csg');
213213

214214
});

‎kubejs/server_scripts/common/systems/pulverizer.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const blacklist = ["aluminum"];
22

33
ServerEvents.recipes(event => {
44
const id = global.id;
5+
var once = true;
56

67
event.forEachRecipe({ type: 'gtceu:macerator' }, macParse => {
78
const macData = JSON.parse(macParse.json);
@@ -41,6 +42,9 @@ ServerEvents.recipes(event => {
4142
if (oreTagSplit[0] === 'forge:raw_materials' && !blacklist.includes(oreTagSplit[1])) {
4243
const oreName = oreTagSplit[1];
4344
const furnOutput = furnData.result;
45+
const furnOutputItem = typeof furnOutput === "string" ? furnOutput : furnOutput.item;
46+
47+
if (furnOutputItem.includes("dust")) return;
4448

4549
event.recipes.gtceu.pulverizer(id(`crushed_heated_${oreName}`))
4650
.itemInputs(`1x gtceu:crushed_${oreName}_ore`)

‎kubejs/server_scripts/default/additions/machines_and_parts/tiered_machines/singleblocks.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ServerEvents.recipes(event => {
9191
H: `gtceu:${tier}_machine_hull`
9292
}).id(`start:shaped/${tier}_electric_furnace`);
9393

94-
event.shaped(Item.of(`gtceu:${tier}_electric_blast_furnace`), [
94+
event.shaped(Item.of(`gtceu:${tier}_electric_blaster`), [
9595
'IDI',
9696
'WHW',
9797
'CQC'
@@ -102,7 +102,7 @@ ServerEvents.recipes(event => {
102102
H: `gtceu:${tier}_machine_hull`,
103103
Q: `gtceu:${wire}_quadruple_wire`,
104104
D: `gtceu:double_${tierMaterial}_plate`
105-
}).id(`start:shaped/${tier}_electric_blast_furnace`);
105+
}).id(`start:shaped/${tier}_electric_blaster`);
106106

107107
event.shaped(Item.of(`gtceu:${tier}_electric_smoker`), [
108108
'ISI',

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ global.getDataItem = (cwu) => (cwu >= 320) ? 'start_core:component_data_core' :
274274

275275
ServerEvents.recipes(event => {
276276

277-
global.researchBuilder = (machineType, recId, inputsI, inputsF, outputsI, duration, cwuT, totalCWU, euT, researched) => {
278-
const dataItem = global.getDataItem(cwuT);
277+
global.researchBuilder = (machineType, recId, inputsI, inputsF, outputsI, duration, cwuT, totalCWU, euT, researched, otherDataItem) => {
278+
const dataItem = otherDataItem || global.getDataItem(cwuT);
279279
const id = global.id;
280280

281281
let mainRecipe = event.recipes.gtceu[machineType](id(recId));
@@ -295,6 +295,7 @@ ServerEvents.recipes(event => {
295295
.stationResearch(
296296
researchRecipeBuilder => researchRecipeBuilder
297297
.researchStack(Item.of(researched))
298+
.dataStack(Item.of(dataItem))
298299
.CWUt(cwuT)
299300
.EUt(euT)
300301
)

0 commit comments

Comments
 (0)