diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 674f1114a..cb5ba435c 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -114,7 +114,7 @@ const registerAdAstraRecipes = (event) => { event.recipes.gtceu.mixer('tfg:rocket_alloy_t2') .itemInputs('19x #forge:dusts/titanium', '3x #forge:small_dusts/chromium', '3x #forge:small_dusts/tin', '3x #forge:small_dusts/aluminium') - .inputFluids(Fluid.of('gtceu:vanadium', 540)) + .inputFluids(Fluid.of('gtceu:vanadium', 144 * 4)) .itemOutputs('25x #forge:dusts/rocket_alloy_t2') .duration(580) .circuit(5) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 45821afd7..16c852eca 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -2393,6 +2393,18 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(2) + event.recipes.gtceu.macerator('tfg:ochrum') + .itemInputs('create:ochrum') + .itemOutputs('#forge:dusts/ochrum') + .duration(50) + .EUt(2) + + event.recipes.gtceu.macerator('tfg:cut_ochrum') + .itemInputs('create:cut_ochrum') + .itemOutputs('#forge:dusts/ochrum') + .duration(50) + .EUt(2) + event.shapeless('create:sand_paper', ['minecraft:paper', 'tfc:glue', '#forge:sand']) .id('tfg:shapeless/sand_paper') diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 77112512c..1cc21e81c 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -643,6 +643,7 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_flower_pot') removeMaceratorRecipe(event, 'macerate_marble') + removeMaceratorRecipe(event, 'macerate_red_granite') removeMaceratorRecipe(event, 'macerate_wool') @@ -653,6 +654,8 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:wiremill/string_from_polycaprolactam' }) + event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_granite_red' }) + event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down' }) event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down_distilled_water' }) event.remove({ id: 'gtceu:chemical_bath/red_steel_cool_down' }) diff --git a/kubejs/server_scripts/tfg/recipes.stone_dusts.js b/kubejs/server_scripts/tfg/recipes.stone_dusts.js index 432ecab96..a5df1c6c5 100644 --- a/kubejs/server_scripts/tfg/recipes.stone_dusts.js +++ b/kubejs/server_scripts/tfg/recipes.stone_dusts.js @@ -48,7 +48,7 @@ function registerTFGStoneDustRecipes(event) { .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, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Redrock, 1), 3000, 0) .outputFluids(Fluid.of('gtceu:oxygen', 5)) event.recipes.gtceu.centrifuge('gtceu:decomposition_centrifuging__deepslate') @@ -71,6 +71,16 @@ function registerTFGStoneDustRecipes(event) { .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Gold, 1), 3500, 0) .outputFluids(Fluid.of('gtceu:oxygen', 16)) + event.recipes.gtceu.centrifuge('red_granite_dust_separation') + .EUt(GTValues.VA[GTValues.MV]) + .duration(480) + .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.GraniteRed, 1)) + .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Hematite, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnesium, 1), 2000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Redrock, 1), 1500, 0) + .outputFluids(Fluid.of('gtceu:oxygen', 8)) + // TFC event.recipes.gtceu.centrifuge('gabbro_dust_separation') @@ -238,6 +248,26 @@ function registerTFGStoneDustRecipes(event) { .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)) + + event.recipes.gtceu.centrifuge('mars_stone_dust_separation') + .EUt(GTValues.VA[GTValues.MV]) + .duration(480) + .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('mars_stone'), 1)) + .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, TFGHelpers.getMaterial('aluminium_silicate'), 1), 4000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Hematite, 1), 4500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Beryllium, 1), 2000, 0) + .outputFluids(Fluid.of('gtceu:oxygen', 36)) + + event.recipes.gtceu.centrifuge('venus_stone_dust_separation') + .EUt(GTValues.VA[GTValues.MV]) + .duration(480) + .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('venus_stone'), 1)) + .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, TFGHelpers.getMaterial('aluminium_silicate'), 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Potassium, 1), 2000, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Lithium, 1), 2000, 0) + .outputFluids(Fluid.of('gtceu:oxygen', 32)) // AE2 @@ -251,12 +281,19 @@ function registerTFGStoneDustRecipes(event) { // Create event.recipes.gtceu.centrifuge('asurine_dust_separation') - .EUt(GTValues.VA[GTValues.LV]) - .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('asurine'), 1)) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.CertusQuartz, 1), 4500, 0) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Zinc, 1), 3500, 0) + event.recipes.gtceu.centrifuge('ochrum_dust_separation') + .EUt(GTValues.VA[GTValues.MV]) + .duration(480) + .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('ochrum'), 1)) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Gold, 1), 3500, 0) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Silver, 1), 3500, 0) + // Misc dust event.recipes.gtceu.centrifuge('gtceu:quartz_sand_separation') @@ -268,7 +305,7 @@ function registerTFGStoneDustRecipes(event) { event.recipes.gtceu.centrifuge('netherrack_separation') .EUt(GTValues.VA[GTValues.MV]) - .duration(10 * 20) + .duration(480) .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Netherrack, 1)) .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.SiliconDioxide, 1)) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Graphite, 1), 3500, 0) diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index 1b1599988..e706f6738 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -79,7 +79,6 @@ global.AD_ASTRA_DISABLED_ITEMS = // Disabled until LuV planet - 'ad_astra:glacio_globe', // maybe 'ad_astra:tier_4_rocket', 'ad_astra:calorite_engine', 'ad_astra:calorite_tank', diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index 1b5e8f525..4cb2645ca 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -48,6 +48,7 @@ const registerAdAstraMaterials = (event) => { GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.FORCE_GENERATE_BLOCK, GTMaterialFlags.GENERATE_PLATE, + GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.DISABLE_ALLOY_BLAST ) diff --git a/kubejs/startup_scripts/create/materials.js b/kubejs/startup_scripts/create/materials.js index b2f12212c..f3dd87136 100644 --- a/kubejs/startup_scripts/create/materials.js +++ b/kubejs/startup_scripts/create/materials.js @@ -7,4 +7,9 @@ function registerCreateMaterials(event) { .color(0x7DB8D1) .secondaryColor(0x4C5D7B) .dust() + + event.create('ochrum') + .color(0xB6995E) + .secondaryColor(0x865840) + .dust() } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 88d36f57e..b1b72d20e 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -389,6 +389,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Nickel.setMaterialSecondaryARGB(0x8d8d71) GTMaterials.Thorium.setMaterialARGB(0xf8a8c0) GTMaterials.Thorium.setMaterialSecondaryARGB(0xcd8dbc) + GTMaterials.GraniteRed.setMaterialARGB(0x974B3C) + GTMaterials.GraniteRed.setMaterialSecondaryARGB(0x632117) global.MINECRAFT_DYE_NAMES.forEach(colorName => { @@ -408,4 +410,5 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.get('tfg:tmos').setFormula("Si(OCH3)4", true) GTMaterials.get('tfg:fluix').setFormula("?(?SiO2)(SiO2)", true) GTMaterials.CertusQuartz.setFormula("?SiO2", true) + GTMaterials.GraniteRed.setFormula("?", true) } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 9f895bc1f..ca8675f9d 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -62,18 +62,16 @@ const registerTFGMaterials = (event) => { .iconSet('metallic') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) .blastTemp(1760, 'low', 256, 900) -/* - event.create('rocket_alloy_t2') .ingot() - .components('76x titanium', '15x vanadium', '3x aluminium', '3x chromium', '3x tin') + .components('19x titanium', '4x vanadium', '3x aluminium', '3x chromium', '3x tin') .color(0x3c253d) .iconSet('metallic') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.GENERATE_GEAR) .blastTemp(3200, 'mid', 1024, 1100) - event.create('rocket_alloy_t3') +/* event.create('rocket_alloy_t3') .ingot() .components('8x titanium', '9x tungsten_steel', '2x tantalum', '2x radon') .color(0x6c678b) diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index 717cdf593..85e1c3d41 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -86,7 +86,9 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ 'vintageimprovements:nethersteel_rod', 'vintageimprovements:andesite_rod', 'vintageimprovements:shadow_steel_rod', - 'vintageimprovements:desh_rod' + 'vintageimprovements:desh_rod', + 'vintageimprovements:ostrum_rod', + 'vintageimprovements:calorite_rod' ] global.VINTAGE_IMPROVEMENTS_DISABLED_BLOCKS = [