@@ -18,13 +18,13 @@ ServerEvents.recipes(event => {
1818 . inputFluids ( 'gtceu:soldering_alloy 144' )
1919 . itemOutputs ( `ae2:${ type } _storage_cell_${ tier } k` )
2020 . duration ( 400 )
21- . EUt ( 128 ) ;
21+ . EUt ( 120 ) ;
2222
2323 event . recipes . gtceu . canner ( id ( `${ type } _storage_cell_${ tier } k` ) )
2424 . itemInputs ( `ae2:${ type } _cell_housing` , `ae2:cell_component_${ tier } k` )
2525 . itemOutputs ( `ae2:${ type } _storage_cell_${ tier } k` )
2626 . duration ( 400 )
27- . EUt ( 128 ) ;
27+ . EUt ( 120 ) ;
2828
2929 event . recipes . gtceu . packer ( id ( `${ type } _cell_${ tier } k_uncrafting` ) )
3030 . itemInputs ( `ae2:${ type } _storage_cell_${ tier } k` )
@@ -40,13 +40,13 @@ ServerEvents.recipes(event => {
4040 . inputFluids ( 'gtceu:fluix_steel 576' )
4141 . itemOutputs ( `megacells:${ type } _storage_cell_${ tier } m` )
4242 . duration ( 400 )
43- . EUt ( 8192 * tier ) ;
43+ . EUt ( 7680 ) ;
4444
4545 event . recipes . gtceu . canner ( id ( `${ type } _storage_cell_${ tier } m` ) )
4646 . itemInputs ( `megacells:mega_${ type } _cell_housing` , `megacells:cell_component_${ tier } m` )
4747 . itemOutputs ( `megacells:${ type } _storage_cell_${ tier } m` )
4848 . duration ( 400 )
49- . EUt ( 8192 * tier ) ;
49+ . EUt ( 7680 ) ;
5050
5151 event . recipes . gtceu . packer ( id ( `${ type } _cell_${ tier } m_uncrafting` ) )
5252 . itemInputs ( `megacells:${ type } _storage_cell_${ tier } m` )
@@ -87,7 +87,7 @@ ServerEvents.recipes(event => {
8787 . itemInputs ( 'ae2:crafting_unit' , `ae2:cell_component_${ tier } k` )
8888 . itemOutputs ( `ae2:${ tier } k_crafting_storage` )
8989 . duration ( 200 )
90- . EUt ( 128 ) ;
90+ . EUt ( 120 ) ;
9191
9292 event . recipes . gtceu . packer ( id ( `crafting_storage_${ tier } k_uncrafting` ) )
9393 . itemInputs ( `ae2:${ tier } k_crafting_storage` )
@@ -102,7 +102,7 @@ ServerEvents.recipes(event => {
102102 . itemInputs ( 'megacells:mega_crafting_unit' , `megacells:cell_component_${ tier } m` )
103103 . itemOutputs ( `megacells:${ tier } m_crafting_storage` )
104104 . duration ( 200 )
105- . EUt ( 128 ) ;
105+ . EUt ( 120 ) ;
106106
107107 event . recipes . gtceu . packer ( id ( `crafting_storage_${ tier } m_uncrafting` ) )
108108 . itemInputs ( `megacells:${ tier } m_crafting_storage` )
@@ -113,46 +113,53 @@ ServerEvents.recipes(event => {
113113
114114 } ;
115115
116- /*const expandedAccelerator = (tier) => {
116+ const transformerDict = {
117+ '4' : [ 'ulv' , 1 , 'wrought_iron' ] ,
118+ '16' : [ 'lv' , 2 , 'steel' ] ,
119+ '64' : [ 'mv' , 4 , 'aluminium' ] ,
120+ '256' : [ 'hv' , 8 , 'stainless_steel' ] ,
121+ '1k' : [ 'ev' , 16 , 'titanium' ] ,
122+ '4k' : [ 'iv' , 32 , 'tungsten_steel' ] ,
123+ '16k' : [ 'luv' , 64 , 'rhodium_plated_palladium' ] ,
124+ '64k' : [ 'zpm' , 128 , 'naquadah_alloy' ] ,
125+ '256k' : [ 'uv' , 256 , 'darmstadtium' ] ,
126+ '1m' : [ 'uhv' , 512 , 'neutronium' ]
127+ } ;
128+
129+ const expandedAccelerator = ( tier ) => {
117130 const suffixList = [ '' , 'k' , 'm' ] ;
118131 [ 0 , 1 ] . forEach ( suffixPos => {
119132 const previous = `${ tier == 1 ? 256 : tier / 4 } ${ suffixList [ suffixPos ] } ` ;
120133 const lower = `${ tier == 1 ? 512 : tier / 2 } ${ suffixList [ suffixPos ] } ` ;
121134 const current = `${ tier } ${ tier == 1 ? suffixList [ suffixPos + 1 ] : suffixList [ suffixPos ] } ` ;
122135
123- const transformerDict = {
124- '4': [GTValues.VHA[GTValues.ULV], 1],
125- '16': [GTValues.VHA[GTValues.LV], 2],
126- '64': [GTValues.VHA[GTValues.MV], 4],
127- '256': [GTValues.VHA[GTValues.HV], 8],
128- '1k': [GTValues.VHA[GTValues.EV], 16],
129- '4k': [GTValues.VHA[GTValues.IV], 32],
130- '16k': [GTValues.VHA[GTValues.LuV], 64],
131- '64k': [GTValues.VHA[GTValues.ZPM], 128],
132- '256k': [GTValues.VHA[GTValues.UV], 256],
133- '1m': [GTValues.VHA[GTValues.UHV], 512]
134- };
136+ const voltage = transformerDict [ current ] [ 0 ]
137+ const previousAcceleratorCraft = suffixPos == 0 && tier == 4 ? 'ae2:crafting_accelerator' : `expandedae:exp_crafting_accelerator_${ previous } `
138+ const lowerAccelerator = `expandedae:exp_crafting_accelerator_${ lower } `
139+ const currentAccelerator = `expandedae:exp_crafting_accelerator_${ current } `
135140
136- event.remove({output: `expandedae:exp_crafting_accelerator_${lower}` });
141+ event . remove ( { output : lowerAccelerator } ) ;
137142
138- event.shapeless(`2x expandedae:exp_crafting_accelerator_${lower }`, `expandedae:exp_crafting_accelerator_${current}` ).id(`start:shapeless/exp_crafting_accelerator_${current}_uncompressing`);
143+ event . shapeless ( `2x ${ lowerAccelerator } ` , currentAccelerator ) . id ( `start:shapeless/exp_crafting_accelerator_${ current } _uncompressing` ) ;
139144
140145 event . recipes . gtceu . me_assembler ( id ( `exp_crafting_accelerator_${ current } ` ) )
141- .itemInputs(`3x ${suffixPos == 0 && tier == 4 ? 'ae2:crafting_accelerator' : `expandedae:exp_crafting_accelerator_${previous}`}` , `4x gtceu:${suffixPos == 1 ? 'netherite_' : ''}certus_quartz_skystone_alloy_plate`)
142- .inputFluids(`gtceu:fluix_steel ${72 * transformerDict[current][1]}`)
143- .itemOutputs(`expandedae:exp_crafting_accelerator_${current}` )
146+ . itemInputs ( `gtceu: ${ transformerDict [ current ] [ 2 ] } _frame` , ` 3x ${ previousAcceleratorCraft } ` , `#gtceu:circuits/ ${ voltage } ` , `6x gtceu:${ suffixPos == 1 ? 'netherite_' : '' } certus_quartz_skystone_alloy_plate` )
147+ . inputFluids ( `gtceu:fluix_steel ${ 9 * transformerDict [ current ] [ 1 ] } ` )
148+ . itemOutputs ( currentAccelerator )
144149 . duration ( 200 )
145- .EUt(transformerDict[current][0 ]);
150+ . EUt ( global . vha [ voltage ] ) ;
146151 } ) ;
147- };*/
152+ } ;
153+
154+ event . shapeless ( 'expandedae:exp_crafting_accelerator_4' , 'megacells:mega_crafting_accelerator' ) . id ( 'start:shapeless/mega_crafting_accelerator_deprecation' ) ;
148155
149156 [ 1 , 4 , 16 , 64 , 256 ] . forEach ( tier => {
150157 packaging ( tier , 'item' , 'certus_quartz' ) ;
151158 packaging ( tier , 'fluid' , 'gold' ) ;
152159
153160 craftingStorage ( tier ) ;
154161
155- // expandedAccelerator(tier);
162+ expandedAccelerator ( tier ) ;
156163 } ) ;
157164
158165 const canner = ( output , catalyst , Mega ) => {
@@ -161,7 +168,7 @@ ServerEvents.recipes(event => {
161168 . itemInputs ( 'ae2:crafting_unit' , `ae2:${ catalyst } ` )
162169 . itemOutputs ( `ae2:crafting_${ output } ` )
163170 . duration ( 200 )
164- . EUt ( 128 ) ;
171+ . EUt ( 120 ) ;
165172
166173 event . recipes . gtceu . packer ( id ( `crafting_${ output } _uncrafting` ) )
167174 . itemInputs ( `ae2:crafting_${ output } ` )
@@ -176,7 +183,7 @@ ServerEvents.recipes(event => {
176183 . itemInputs ( 'megacells:mega_crafting_unit' , `ae2:${ catalyst } ` )
177184 . itemOutputs ( `megacells:mega_crafting_${ output } ` )
178185 . duration ( 200 )
179- . EUt ( 128 ) ;
186+ . EUt ( 120 ) ;
180187
181188 event . recipes . gtceu . packer ( id ( `mega_crafting_${ output } _uncrafting` ) )
182189 . itemInputs ( `megacells:mega_crafting_${ output } ` )
@@ -187,7 +194,7 @@ ServerEvents.recipes(event => {
187194 }
188195 } ;
189196
190- canner ( 'accelerator' , 'engineering_processor' , true ) ;
197+ canner ( 'accelerator' , 'engineering_processor' , false ) ;
191198 canner ( 'monitor' , 'storage_monitor' , true ) ;
192199
193200 [ '2' , '16' , '128' ] . forEach ( tier => {
@@ -197,13 +204,13 @@ ServerEvents.recipes(event => {
197204 . inputFluids ( 'gtceu:soldering_alloy 144' )
198205 . itemOutputs ( `ae2:spatial_storage_cell_${ tier } ` )
199206 . duration ( 400 )
200- . EUt ( 128 ) ;
207+ . EUt ( 120 ) ;
201208
202209 event . recipes . gtceu . canner ( id ( `spatial_storage_cell_${ tier } ` ) )
203210 . itemInputs ( 'ae2:item_cell_housing' , `ae2:spatial_cell_component_${ tier } ` )
204211 . itemOutputs ( `ae2:spatial_storage_cell_${ tier } ` )
205212 . duration ( 400 )
206- . EUt ( 128 ) ;
213+ . EUt ( 120 ) ;
207214
208215 event . recipes . gtceu . packer ( id ( `spatial_cell_${ tier } _uncrafting` ) )
209216 . itemInputs ( `ae2:spatial_storage_cell_${ tier } ` )
@@ -220,7 +227,7 @@ ServerEvents.recipes(event => {
220227 . itemOutputs ( 'megacells:mega_item_cell_housing' )
221228 . duration ( 400 )
222229 . circuit ( 2 )
223- . EUt ( 2048 ) ;
230+ . EUt ( 1920 ) ;
224231
225232 event . remove ( { id : 'megacells:cells/mega_fluid_cell_housing' } ) ;
226233 event . recipes . gtceu . assembler ( id ( 'mega_fluid_cell_housing' ) )
@@ -229,6 +236,6 @@ ServerEvents.recipes(event => {
229236 . itemOutputs ( 'megacells:mega_fluid_cell_housing' )
230237 . duration ( 400 )
231238 . circuit ( 1 )
232- . EUt ( 2048 ) ;
239+ . EUt ( 1920 ) ;
233240
234241} ) ;
0 commit comments