From ad67a00027090523546454addb8743cda0577895 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Tue, 2 Sep 2025 13:40:16 -0400 Subject: [PATCH] Ostrum line (#1734) * Adding the Ostrum Line * fix comment and add geysers to blacklist * Remove muffler hatch * Adding the Ostrum Line * fix comment and add geysers to blacklist * Remove muffler hatch * fix tfg for id recipe * Fix fucking Git * change a line --- .../gtceu_ostrum_particle_accelerator.json | 1 + kubejs/server_scripts/tfg/recipes.mars.js | 119 +++++++++++------ .../server_scripts/tfg/recipes.stone_dusts.js | 125 +++++++++--------- kubejs/server_scripts/tfg/tags.js | 24 ++++ kubejs/startup_scripts/gtceu/machines.js | 19 ++- kubejs/startup_scripts/gtceu/materials.js | 12 +- kubejs/startup_scripts/gtceu/recipe_types.js | 6 +- 7 files changed, 191 insertions(+), 115 deletions(-) create mode 100644 kubejs/assets/emi/category/properties/gtceu_ostrum_particle_accelerator.json diff --git a/kubejs/assets/emi/category/properties/gtceu_ostrum_particle_accelerator.json b/kubejs/assets/emi/category/properties/gtceu_ostrum_particle_accelerator.json new file mode 100644 index 000000000..ceab87237 --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_ostrum_particle_accelerator.json @@ -0,0 +1 @@ +{"gtceu:ostrum_particle_accelerator":{"order":125}} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.mars.js b/kubejs/server_scripts/tfg/recipes.mars.js index 1d1cbebd9..58e7d60c6 100644 --- a/kubejs/server_scripts/tfg/recipes.mars.js +++ b/kubejs/server_scripts/tfg/recipes.mars.js @@ -4,69 +4,114 @@ const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.log // Ostrum Harvester - event.recipes.gtceu.ostrum_harvester(`ostrum_harvesting`) + event.recipes.gtceu.ostrum_harvester(`tfg:ostrum_harvesting`) .perTick(true) .inputFluids('gtceu:drilling_fluid 4') .perTick(false) .dimension('ad_astra:mars') .itemOutputsRanged('gtceu:ostrum_dust',1,5) - .duration(20*5) + .duration(20*30) + .duration(20*30) .EUt(GTValues.VA[GTValues.LV]); - // Large Centrifuge Ostrum dust - SCRAP FROM MARS GOING TO VENUS - /* + // Ostrum Linear Accelerator Recipes - event.recipes.gtceu.centrifuge(`ostrum_harvesting`) - .inputFluids('gtceu:bromine 100') - .itemInputs('#forge:dusts/ostrum') - .dimension('ad_astra:mars') +event.recipes.gtceu.ostrum_linear_accelerator('tfg:ostrum_transformation') + .inputFluids('gtceu:residual_radioactive_concoction 1000') + .itemInputs('32x #forge:dusts/ostrum') .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); + .dimension('ad_astra:mars') + .duration(20*5) + .EUt(GTValues.VA[GTValues.EV]); -event.recipes.gtceu.extraterrestrial_ore_fabricator('lightweight_ostrum') +event.recipes.gtceu.ostrum_linear_accelerator('tfg: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') + .inputFluids('gtceu:residual_radioactive_concoction 100') + .inputFluids(Fluid.of('gtceu:heavy_water', 1000)) + .itemOutputsRanged('#forge:dusty_raw_materials/pitchblende',1,10) + .itemOutputsRanged('#forge:dusty_raw_materials/silver',1,10) + .itemOutputsRanged('#forge:dusty_raw_materials/tricalcium_phosphate',1,10) + .dimension('ad_astra:mars') .duration(20*5) .EUt(GTValues.VA[GTValues.IV]); -event.recipes.gtceu.extraterrestrial_ore_fabricator('ostrum') +event.recipes.gtceu.ostrum_linear_accelerator('tfg: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') + .inputFluids('gtceu:residual_radioactive_concoction 100') + .inputFluids(Fluid.of('gtceu:radon', 100)) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'),1,10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'),1,10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/beryllium'),1,10) + .dimension('ad_astra:mars') .duration(20*5) .EUt(GTValues.VA[GTValues.IV]); -event.recipes.gtceu.extraterrestrial_ore_fabricator('dense_ostrum') +event.recipes.gtceu.ostrum_linear_accelerator('tfg:dense_ostrum') .inputFluids('gtceu:dense_ostrum_vapor 1000') + .inputFluids('gtceu:residual_radioactive_concoction 100') .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') + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'),1,10) + .itemOutputsRanged(Item.of('#forge:dusty_raw_materials/uraninite'),1,10) + .dimension('ad_astra:mars') .duration(20*5) .EUt(GTValues.VA[GTValues.IV]); - */ + //#endregion + + //#region Centrifuge Dusty Ores + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_pitchblende') + .itemInputs('#forge:dusty_raw_materials/pitchblende') + .itemOutputs('gtceu:pitchblende_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_silver') + .itemInputs('#forge:dusty_raw_materials/silver') + .itemOutputs('gtceu:silver_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_tricalcium_phosphate') + .itemInputs('#forge:dusty_raw_materials/tricalcium_phosphate') + .itemOutputs('gtceu:tricalcium_phosphate') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_bauxite') + .itemInputs('#forge:dusty_raw_materials/bauxite') + .itemOutputs('gtceu:aluminium_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_lead') + .itemInputs('#forge:dusty_raw_materials/lead') + .itemOutputs('gtceu:lead_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_beryllium') + .itemInputs('#forge:dusty_raw_materials/beryllium') + .itemOutputs('gtceu:beryllium_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_thorium') + .itemInputs('#forge:dusty_raw_materials/thorium') + .itemOutputs('gtceu:thorium_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_uraninite') + .itemInputs('#forge:dusty_raw_materials/uraninite') + .itemOutputs('gtceu:uraninite_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + //#endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.stone_dusts.js b/kubejs/server_scripts/tfg/recipes.stone_dusts.js index d63e44a26..11799217d 100644 --- a/kubejs/server_scripts/tfg/recipes.stone_dusts.js +++ b/kubejs/server_scripts/tfg/recipes.stone_dusts.js @@ -13,8 +13,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diorite, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Clay, 1), 4500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Mirabilite, 1), 2000, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Clay, 1), 4500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Mirabilite, 1), 2000, 0) .outputFluids(Fluid.of('gtceu:oxygen', 5)) event.recipes.gtceu.centrifuge('gtceu:decomposition_centrifuging__marble') @@ -22,8 +22,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Marble, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcite, 1), 6000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnesium, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcite, 1), 6000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnesium, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 12)) event.recipes.gtceu.centrifuge('gtceu:decomposition_centrifuging__andesite') @@ -31,24 +31,24 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Andesite, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Asbestos, 1), 6000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Saltpeter, 1), 2000, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Asbestos, 1), 6000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Saltpeter, 1), 2000, 0) event.recipes.gtceu.centrifuge('gtceu:decomposition_centrifuging__basalt') .EUt(GTValues.VA[GTValues.MV]) .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Basalt, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Flint, 1), 5000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 1500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcite, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Flint, 1), 5000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 1500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcite, 1), 1500, 0) event.recipes.gtceu.centrifuge('gtceu:decomposition_centrifuging__granite') .EUt(GTValues.VA[GTValues.MV]) .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Granite, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Redrock, 1), 2000, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Redrock, 1), 2000, 0) .outputFluids(Fluid.of('gtceu:oxygen', 5)) event.recipes.gtceu.centrifuge('gtceu:decomposition_centrifuging__deepslate') @@ -56,9 +56,9 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Deepslate, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Biotite, 1), 2000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 3500, 700) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 3500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Biotite, 1), 2000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 3500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 12)) event.recipes.gtceu.centrifuge('blackstone_dust_separation') @@ -66,9 +66,9 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Blackstone, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Graphite, 1), 3500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnesium, 1), 4500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Gold, 1), 3500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Graphite, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnesium, 1), 4500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Gold, 1), 3500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 16)) // TFC @@ -78,17 +78,16 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('gabbro'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnetite, 1), 2500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Rutile, 1), 1500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnetite, 1), 2500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 0) event.recipes.gtceu.centrifuge('shale_dust_separation') .EUt(GTValues.VA[GTValues.MV]) .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('shale'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 6500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 6500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 16)) event.recipes.gtceu.centrifuge('claystone_dust_separation') @@ -96,9 +95,9 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('claystone'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Clay, 1), 3000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Hematite, 1), 3500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Bauxite, 1), 2500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Clay, 1), 3000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Hematite, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Bauxite, 1), 2500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 5)) event.recipes.gtceu.centrifuge('limestone_dust_separation') @@ -106,8 +105,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('limestone'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 5500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 5500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 36)) event.recipes.gtceu.centrifuge('conglomerate_dust_separation') @@ -115,8 +114,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('conglomerate'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Hematite, 1), 3500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.TricalciumPhosphate, 1), 3500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Hematite, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.TricalciumPhosphate, 1), 3500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 5)) event.recipes.gtceu.centrifuge('dolomite_dust_separation') @@ -124,9 +123,9 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('dolomite'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnesium, 1), 6500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 5500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 3500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnesium, 1), 6500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 5500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 3500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 16)) event.recipes.gtceu.centrifuge('chert_dust_separation') @@ -134,8 +133,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('chert'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Redrock, 1), 5500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 3500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Redrock, 1), 5500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 3500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 24)) event.recipes.gtceu.centrifuge('chalk_dust_separation') @@ -143,9 +142,9 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('chalk'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 6500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Carbon, 1), 3500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 6500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Carbon, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 12)) event.recipes.gtceu.centrifuge('rhyolite_dust_separation') @@ -153,18 +152,17 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('rhyolite'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Tantalite, 1), 1500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 0) event.recipes.gtceu.centrifuge('dacite_dust_separation') .EUt(GTValues.VA[GTValues.MV]) .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('dacite'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 6500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 5500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Kyanite, 1), 3500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 6500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 5500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Kyanite, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 12)) event.recipes.gtceu.centrifuge('slate_dust_separation') @@ -172,8 +170,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('slate'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sapphire, 1), 1500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sapphire, 1), 1500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 24)) event.recipes.gtceu.centrifuge('phyllite_dust_separation') @@ -181,8 +179,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('phyllite'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Quartzite, 1), 5500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CalciumChloride, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Quartzite, 1), 5500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CalciumChloride, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 5)) event.recipes.gtceu.centrifuge('schist_dust_separation') @@ -190,9 +188,9 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('schist'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Mica, 1), 6500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Talc, 1), 5500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Mica, 1), 6500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Talc, 1), 5500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.MetalMixture, 1), 500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 12)) event.recipes.gtceu.centrifuge('gneiss_dust_separation') @@ -200,8 +198,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('gneiss'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Quartzite, 1), 6500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Biotite, 1), 3500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Quartzite, 1), 6500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Biotite, 1), 3500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 5)) event.recipes.gtceu.centrifuge('dripstone_dust_separation') @@ -209,8 +207,8 @@ function registerTFGStoneDustRecipes(event) { .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('dripstone'), 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CalciumCarbonate, 1), 8500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CalciumHydroxide, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CalciumCarbonate, 1), 8500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CalciumHydroxide, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 12)) // Ad astra @@ -219,9 +217,8 @@ function registerTFGStoneDustRecipes(event) { .EUt(GTValues.VA[GTValues.MV]) .duration(10 * 20) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('moon_stone'), 1)) - .chancedOutput('ae2:sky_dust', 5000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Ilmenite, 1), 1000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnetite, 1), 2000, 500) + .chancedOutput('ae2:sky_dust', 5000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnetite, 1), 2000, 0) .outputFluids(Fluid.of('gtceu:helium_3', 200)) event.recipes.gtceu.centrifuge('moon_deepslate_dust_separation') @@ -229,8 +226,8 @@ function registerTFGStoneDustRecipes(event) { .duration(10 * 20) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('moon_deepslate'), 1)) .chancedOutput('ae2:sky_dust', 5000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 2000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 1500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 2000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 1500, 0) .outputFluids(Fluid.of('gtceu:helium_3', 200)) event.recipes.gtceu.centrifuge('glacio_stone_dust_separation') @@ -238,8 +235,8 @@ function registerTFGStoneDustRecipes(event) { .duration(10 * 20) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('glacio_stone'), 1)) .chancedOutput('ae2:sky_dust', 3000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 4000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Potassium, 1), 4000, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 4000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Potassium, 1), 4000, 0) .outputFluids(Fluid.of('gtceu:oxygen', 50), Fluid.of('gtceu:helium_3', 300)) // AE2 @@ -249,7 +246,7 @@ function registerTFGStoneDustRecipes(event) { .duration(100) .itemInputs('ae2:sky_dust') .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CertusQuartz, 1), 4500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CertusQuartz, 1), 4500, 0) // Create @@ -257,8 +254,8 @@ function registerTFGStoneDustRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) .duration(100) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('asurine'), 1)) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.CertusQuartz, 1), 4500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Zinc, 1), 3500, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.CertusQuartz, 1), 4500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Zinc, 1), 3500, 0) // Misc dust @@ -267,5 +264,5 @@ function registerTFGStoneDustRecipes(event) { .duration(60) .itemInputs('2x gtceu:quartz_sand_dust') .itemOutputs('gtceu:quartzite_dust') - .chancedOutput('#forge:dust/nether_quartz', 2000, 200) + .chancedOutput('#forge:dust/nether_quartz', 2000, 0) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index d4b7a77ae..12e843489 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -94,6 +94,8 @@ const registerTFGItemTags = (event) => { event.add('tfc:fluxstone', 'tfg:loose/dripstone') // #endregion + event.add('buildinggadgets2:deny', 'tfg:spice') + //#region Cloth & String event.add('forge:cloth', 'tfg:phantom_silk') event.add('forge:cloth', 'tfg:polycaprolactam_fabric') @@ -460,6 +462,28 @@ const registerTFGBlockTags = (event) => { event.add('tfc:crops', 'tfg:flax') event.add('tfc:mineable_with_sharp_tool', 'tfg:flax') + // Spice unmovable + + event.add('buildinggadgets2:deny', 'tfg:spice') + event.add('ae2:blacklisted/spatial', 'tfg:spice') + + event.add('buildinggadgets2:deny', 'tfg:geyser_source') + event.add('ae2:blacklisted/spatial', 'tfg:geyser_source') + + event.add('buildinggadgets2:deny', 'tfg:geyser_source_small') + event.add('ae2:blacklisted/spatial', 'tfg:geyser_source_small') + + // Spice unmovable + + event.add('buildinggadgets2:deny', 'tfg:spice') + event.add('ae2:blacklisted/spatial', 'tfg:spice') + + event.add('buildinggadgets2:deny', 'tfg:geyser_source') + event.add('ae2:blacklisted/spatial', 'tfg:geyser_source') + + event.add('buildinggadgets2:deny', 'tfg:geyser_source_small') + event.add('ae2:blacklisted/spatial', 'tfg:geyser_source_small') + // #region Nether blocks event.add('minecraft:nether_carver_replaceables', 'tfg:rock/hardened_deepslate') event.add('minecraft:moss_replaceable', 'tfg:rock/hardened_deepslate') diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index f4fec0da5..fb0ebb741 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -575,7 +575,7 @@ const registerGTCEuMachines = (event) => { .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(' ' ,'A A', 'AAAAA', 'ACCCA', 'AACAA', ' AAA ') .aisle(' G ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') .aisle(' GGG ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') .aisle('GGGGG' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') @@ -591,8 +591,6 @@ const registerGTCEuMachines = (event) => { .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()) @@ -640,15 +638,15 @@ const registerGTCEuMachines = (event) => { // Extraterrestrial Ore Fabricator - event.create('extraterrestrial_ore_fabricator', 'multiblock') + event.create('ostrum_linear_accelerator', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) - .recipeType('extraterrestrial_ore_fabricator') + .recipeType('ostrum_linear_accelerator') .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('AAAAAAAAA', 'A#######D', 'BB###BBAA', ' C###C ', ' BHHHB ' ) .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) .aisle('A#####AFA', 'A#####AXA', 'AAAAAAAFA', ' ', ' ' ) .where('X', Predicates.controller(Predicates.blocks(definition.get()))) @@ -661,8 +659,9 @@ const registerGTCEuMachines = (event) => { .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('H', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.EXPORT_ITEMS)) + .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS))) .where('#', Predicates.air()) .where(' ', Predicates.any()) .build() @@ -670,7 +669,7 @@ const registerGTCEuMachines = (event) => { .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('AAAAAAAAA', 'A D', 'BB BBAA', ' C C ', ' BIAHB ' ) .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) .aisle('A AMA', 'A AXA', 'AAAAAAAAA', ' ', ' ' ) .where('X', controller, Direction.SOUTH) @@ -679,8 +678,8 @@ const registerGTCEuMachines = (event) => { .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('I', GTMachines.FLUID_EXPORT_HATCH[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')) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 692a1384e..7e70c05d0 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -168,13 +168,23 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Zinc.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_BOLT_SCREW); GTMaterials.SterlingSilver.addFlags(GENERATE_DOUBLE_INGOTS); - // /* Generate Dusty Ores for Infinite Ores + //#region 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); + GTMaterials.Pitchblende.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Silver.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.TricalciumPhosphate.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Bauxite.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Lead.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Beryllium.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Thorium.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Uraninite.addFlags(GENERATE_DUSTY_ORES); + + //#endregion // // /* Имеют инструменты, броню TFC, двойные слитки */ diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index f7afe396e..e769eedb9 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -88,10 +88,10 @@ const registerGTCEuRecipeTypes = (event) => { .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.JET_ENGINE) - event.create('extraterrestrial_ore_fabricator') - .category('extraterrestrial_ore_fabricator') + event.create('ostrum_linear_accelerator') + .category('ostrum_linear_accelerator') .setEUIO('in') - .setMaxIOSize(0, 6, 2, 0) + .setMaxIOSize(1, 6, 3, 3) .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH)