diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index f6db5e448..6bde18e34 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -28,28 +28,7 @@ const registerGTCEURecipes = (event) => { .EUt(30) //#endregion - - //stuff for biodiesel meta that idk where to place cause I don't read russian - event.recipes.gtceu.mixer(`alcohol_biodiesel`) - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:alcohols" }})) - .inputFluids(Fluid.of('gtceu:seed_oil', 6000)) - .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) - .duration(20*30) - .EUt(GTValues.VHA[GTValues.ULV]) - - event.recipes.gtceu.extractor(`rapeseed_oil`) - .itemInputs('tfg:rapeseed_product') - .outputFluids(Fluid.of('gtceu:seed_oil', 600)) - .duration(20*30) - .EUt(GTValues.VHA[GTValues.ULV]) - - event.recipes.gtceu.extractor(`sunflower_oil`) - .itemInputs('tfg:sunflower_product') - .outputFluids(Fluid.of('gtceu:seed_oil', 350)) - .duration(20*30) - .EUt(GTValues.VHA[GTValues.ULV]) - - + //#region Выход: Кварцевый песок event.shaped('gtceu:quartz_sand_dust', [ diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 4494fcb11..a586e8841 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -152,7 +152,6 @@ TFCEvents.data(event => { registerTFCDataForTFCLunchbox(event) registerTFCDataForTFG(event) registerTFCDataForWaterFlasks(event) - registerTFCDATAForClimate_range(event) }) /** diff --git a/kubejs/server_scripts/minecraft/data.js b/kubejs/server_scripts/minecraft/data.js index 890a49977..13f416962 100644 --- a/kubejs/server_scripts/minecraft/data.js +++ b/kubejs/server_scripts/minecraft/data.js @@ -59,8 +59,4 @@ function registerTFCDataForMinecraft(event) { food.water(2) food.decayModifier(2) }) - event.foodItem('tfg:roasted_sunflower_seeds', food => { - food.hunger(0.5) - food.decayModifier(0.5) - }) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 163ed327f..4a2712c3a 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -86,28 +86,3 @@ const registerTFCFoodData = (event) => { food.dairy(0.5) }) } - -//#region Climate Range for Crops - -const registerTFCDATAForClimate_range = (event) => { - - event.climateRange(climate => { - climate.minHydration(10) - climate.maxHydration(60) - climate.minTemperature(5) - climate.maxTemperature(40) - climate.hydrationWiggle(7.5) - climate.temperatureWiggle(5.5) - }, 'tfg:sunflower') - - event.climateRange(climate => { - climate.minHydration(10) - climate.maxHydration(60) - climate.minTemperature(-5) - climate.maxTemperature(25) - climate.hydrationWiggle(7.5) - climate.temperatureWiggle(1.5) - }, 'tfg:rapeseed') -} - -//#endregion diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 0fb018dee..e7c7abab3 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -6,6 +6,7 @@ function registerTFCDataForTFG(event) { registerTFGSupportData(event); registerTFGFoodData(event); registerTFGFauna(event); + registerTFGCropRanges(event); } @@ -123,9 +124,36 @@ const registerTFGFoodData = (event) => { event.foodItem('tfg:food/meal_bag', food => { food.type('dynamic') }) + + event.foodItem('tfg:roasted_sunflower_seeds', food => { + food.hunger(0.5) + food.decayModifier(0.5) + food.grain(0.1) + }) } const registerTFGFauna = (event) => { //event.fauna(climate => { }, fauna => { fauna.chance(0) }, 'tfg:moon_rabbit') +} + +const registerTFGCropRanges = (event) => { + + event.climateRange(climate => { + climate.minHydration(10) + climate.maxHydration(60) + climate.minTemperature(5) + climate.maxTemperature(40) + climate.hydrationWiggle(7.5) + climate.temperatureWiggle(5.5) + }, 'tfg:sunflower') + + event.climateRange(climate => { + climate.minHydration(10) + climate.maxHydration(60) + climate.minTemperature(-5) + climate.maxTemperature(25) + climate.hydrationWiggle(7.5) + climate.temperatureWiggle(1.5) + }, 'tfg:rapeseed') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 4225551a0..777135949 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -124,7 +124,7 @@ function registerTFGMiscellaneousRecipes(event) { .outputFluids(Fluid.of('firmalife:curdled_goat_milk', 1000)) .duration(300) .EUt(GTValues.VA[GTValues.LV]) - + //Scaffolding Frame event.shaped('tfg:scaffolding_frame', [ @@ -136,7 +136,7 @@ function registerTFGMiscellaneousRecipes(event) { A: '#forge:rods/wood', B: '#forge:cloth' }).id('tfg:shaped/scaffolding_frame'); - + //Airship Hull event.shaped('tfg:airship_hull', [ 'A B', @@ -254,7 +254,7 @@ function registerTFGMiscellaneousRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.fluid_solidifier('tfg:ice') - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" } })) .notConsumable('gtceu:block_casting_mold') .itemOutputs('minecraft:ice') .duration(200) @@ -391,20 +391,20 @@ function registerTFGMiscellaneousRecipes(event) { ]).id(`tfg:shapeless/armor_stand`) event.recipes.tfc.sewing( - '1x tfg:piglin_disguise', - [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 0, 0, 0, 1, 1, 0, - 0, 1, 1, 1, 0, 1, 1, 1, 0, - 0, 0, 1, 1, 0, 1, 1, 0, 0, - 0, 0, 1, 1, 0, 1, 1, 0, 0 - ], [ - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 1, 0, 0, 1, 0, 1, - 1, -1, 0, 0, 0, 0, -1, 1, - 1, -1, 0, 0, 0, 0, -1, 1 - ] - ).id('tfg:sewing/piglin_disguise') + '1x tfg:piglin_disguise', + [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 1, 0, 0, 0, 1, 1, 0, + 0, 1, 1, 1, 0, 1, 1, 1, 0, + 0, 0, 1, 1, 0, 1, 1, 0, 0, + 0, 0, 1, 1, 0, 1, 1, 0, 0 + ], [ + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 1, 0, 0, 1, 0, 1, + 1, -1, 0, 0, 0, 0, -1, 1, + 1, -1, 0, 0, 0, 0, -1, 1 + ] + ).id('tfg:sewing/piglin_disguise') //trowel event.shaped('tfg:trowel', [ @@ -418,55 +418,56 @@ function registerTFGMiscellaneousRecipes(event) { D: '#forge:tools/screwdrivers' }).id('tfg:shaped/trowel') - event.recipes.gtceu.assembler('tfg:assembler/trowel') - .itemInputs(ChemicalHelper.get(TagPrefix.plate, GTMaterials.Invar, 2), '1x #forge:screws', '1x #tfc:lumber') - .itemOutputs('1x tfg:trowel') - .duration(40) - .circuit(4) - .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.assembler('tfg:assembler/trowel') + .itemInputs(ChemicalHelper.get(TagPrefix.plate, GTMaterials.Invar, 2), '1x #forge:screws', '1x #tfc:lumber') + .itemOutputs('1x tfg:trowel') + .duration(40) + .circuit(4) + .EUt(GTValues.VA[GTValues.ULV]) + // Food related event.recipes.gtceu.forming_press('tfg:forming_press/foil_pack') - .itemInputs(ChemicalHelper.get(TagPrefix.foil, GTMaterials.Aluminium, 1), ChemicalHelper.get(TagPrefix.foil, GTMaterials.Polyethylene, 1)) - .itemOutputs('1x tfg:foil_pack') - .duration(100) - .EUt(GTValues.VA[GTValues.MV]) + .itemInputs(ChemicalHelper.get(TagPrefix.foil, GTMaterials.Aluminium, 1), ChemicalHelper.get(TagPrefix.foil, GTMaterials.Polyethylene, 1)) + .itemOutputs('1x tfg:foil_pack') + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.fluid_solidifier('tfg:fluid_solidifier/dry_ice') - .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) + .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) .notConsumable('gtceu:block_casting_mold') - .itemOutputs('2x tfg:dry_ice') - .duration(100) - .EUt(GTValues.VA[GTValues.MV]) + .itemOutputs('2x tfg:dry_ice') + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/dry_ice') - .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) + .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) .notConsumable('gtceu:block_casting_mold') - .itemOutputs('10x tfg:dry_ice') - .duration(100) - .EUt(GTValues.VA[GTValues.MV]) + .itemOutputs('10x tfg:dry_ice') + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/decompress_dry_ice') - .outputFluids(Fluid.of('gtceu:carbon_dioxide', 100)) - .itemInputs('1x tfg:dry_ice') - .duration(20) - .circuit(4) - .EUt(GTValues.VA[GTValues.ULV]) + .outputFluids(Fluid.of('gtceu:carbon_dioxide', 100)) + .itemInputs('1x tfg:dry_ice') + .duration(20) + .circuit(4) + .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.mixer('tfg:clean_foil_pack') - .itemInputs('1x tfg:used_foil_pack') - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) - .itemOutputs('1x tfg:clean_foil_pack') - .duration(200) - .circuit(1) - .EUt(GTValues.VA[GTValues.LV]) + .itemInputs('1x tfg:used_foil_pack') + .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" } })) + .itemOutputs('1x tfg:clean_foil_pack') + .duration(200) + .circuit(1) + .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.ore_washer('tfg:ore_washer/distilled/clean_foil_pack') - .itemInputs('1x tfg:used_foil_pack') + .itemInputs('1x tfg:used_foil_pack') .inputFluids(Fluid.of('gtceu:distilled_water', 10)) - .itemOutputs('1x tfg:clean_foil_pack') - .duration(200) - .circuit(2) - .EUt(GTValues.VA[GTValues.ULV]) + .itemOutputs('1x tfg:clean_foil_pack') + .duration(200) + .circuit(2) + .EUt(GTValues.VA[GTValues.ULV]) event.custom({ type: "ae2:transform", @@ -475,8 +476,8 @@ function registerTFGMiscellaneousRecipes(event) { tag: "tfc:water" }, ingredients: [ - {item: 'tfg:used_foil_pack'}], - result: {item: 'tfg:clean_foil_pack'} + { item: 'tfg:used_foil_pack' }], + result: { item: 'tfg:clean_foil_pack' } }).id('tfg:ae_transform/clean_foil_pack') event.recipes.greate.splashing(['tfg:clean_foil_pack'], 'tfg:used_foil_pack') @@ -496,37 +497,60 @@ function registerTFGMiscellaneousRecipes(event) { ]).id(`tfg:shapeless/emptying/freeze_dried/${fruit.name}`) }) + // Refrigerants + event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/chlorodifluoromethane') .inputFluids(Fluid.of('gtceu:chloroform', 2000), Fluid.of('gtceu:hydrofluoric_acid', 4000)) - .outputFluids(Fluid.of('tfg:chlorodifluoromethane', 6000)) - .duration(480) - .circuit(2) - .EUt(GTValues.VA[GTValues.MV]) + .outputFluids(Fluid.of('tfg:chlorodifluoromethane', 6000)) + .duration(480) + .circuit(2) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/breakdown/chlorodifluoromethane') .inputFluids(Fluid.of('tfg:chlorodifluoromethane', 300)) - .outputFluids(Fluid.of('gtceu:tetrafluoroethylene', 100), Fluid.of('gtceu:hydrochloric_acid', 200)) - .duration(100) - .EUt(GTValues.VA[GTValues.HV]) + .outputFluids(Fluid.of('gtceu:tetrafluoroethylene', 100), Fluid.of('gtceu:hydrochloric_acid', 200)) + .duration(100) + .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/acetylene') .inputFluids(Fluid.of('gtceu:methane', 3000), Fluid.of('gtceu:oxygen', 3000)) - .outputFluids(Fluid.of('tfg:acetylene', 100)) - .circuit(4) - .duration(120) - .EUt(GTValues.VA[GTValues.MV]) + .outputFluids(Fluid.of('tfg:acetylene', 100)) + .circuit(4) + .duration(120) + .EUt(GTValues.VA[GTValues.MV]) event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/1_1_1_2_tetrafluoroethane') .inputFluids(Fluid.of('tfg:acetylene', 1000), Fluid.of('gtceu:chlorine', 2000), Fluid.of('gtceu:hydrofluoric_acid', 8000)) - .outputFluids(Fluid.of('tfg:1_1_1_2_tetrafluoroethane', 2000), Fluid.of('gtceu:hydrochloric_acid', 6000)) - .circuit(4) - .duration(480) - .EUt(GTValues.VA[GTValues.HV]) + .outputFluids(Fluid.of('tfg:1_1_1_2_tetrafluoroethane', 2000), Fluid.of('gtceu:hydrochloric_acid', 6000)) + .circuit(4) + .duration(480) + .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.cracker('tfg:cracker/isobutane') .inputFluids(Fluid.of('gtceu:butane', 4000)) - .outputFluids(Fluid.of('tfg:isobutane', 1000), Fluid.of('gtceu:lpg', 3000)) - .circuit(4) - .duration(2400) - .EUt(GTValues.VA[GTValues.HV]) + .outputFluids(Fluid.of('tfg:isobutane', 1000), Fluid.of('gtceu:lpg', 3000)) + .circuit(4) + .duration(2400) + .EUt(GTValues.VA[GTValues.HV]) + + // Biodiesel + + event.recipes.gtceu.chemical_reactor(`alcohol_biodiesel`) + .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:alcohols" } })) + .inputFluids(Fluid.of('gtceu:seed_oil', 6000)) + .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) + .duration(20 * 30) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.extractor(`rapeseed_oil`) + .itemInputs('tfg:rapeseed_product') + .outputFluids(Fluid.of('gtceu:seed_oil', 600)) + .duration(20 * 30) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.extractor(`sunflower_oil`) + .itemInputs('tfg:sunflower_product') + .outputFluids(Fluid.of('gtceu:seed_oil', 350)) + .duration(20 * 30) + .EUt(GTValues.VHA[GTValues.ULV]) } diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 6eb15caba..ad4818bd0 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -612,26 +612,27 @@ function registerVintageImprovementsRecipes(event) { processingTime: 120 }).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber') + // Seed oils event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:sunflower_product' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 350 }], - processingTime: 1000 - }).id('tfg:vi/vacuumizing/sunflower') + type: 'vintageimprovements:vacuumizing', + ingredients: [{ item: 'tfg:sunflower_product' }], + results: [{ fluid: 'gtceu:seed_oil', amount: 350 }], + processingTime: 1000 + }).id('tfg:vi/vacuumizing/sunflower') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:rapeseed_product' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 600 }], - processingTime: 1000 - }).id('tfg:vi/vacuumizing/rapeseed') + event.custom({ + type: 'vintageimprovements:vacuumizing', + ingredients: [{ item: 'tfg:rapeseed_product' }], + results: [{ fluid: 'gtceu:seed_oil', amount: 600 }], + processingTime: 1000 + }).id('tfg:vi/vacuumizing/rapeseed') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'forge:seeds'}], - results: [{ fluid: 'gtceu:seed_oil', amount: 16 }], - processingTime: 100 - }).id('tfg:vi/vacuumizing/seed_oil') + event.custom({ + type: 'vintageimprovements:vacuumizing', + ingredients: [{ tag: 'forge:seeds' }], + results: [{ fluid: 'gtceu:seed_oil', amount: 16 }], + processingTime: 100 + }).id('tfg:vi/vacuumizing/seed_oil') // #endregion diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index e2a5724d7..368103584 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -3,12 +3,10 @@ StartupEvents.registry('item', event => { registerGTCEuItems(event) registerTFGItems(event) - registerTFGPlants(event) }) StartupEvents.registry('block', event => { registerTFGBlocks(event) - registerTFGCrops(event) registerBetterEndBlocks(event) }) diff --git a/kubejs/startup_scripts/tfg/crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js similarity index 85% rename from kubejs/startup_scripts/tfg/crops.js rename to kubejs/startup_scripts/tfg/blocks.crops.js index 8dec9f927..ecfc666cf 100644 --- a/kubejs/startup_scripts/tfg/crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -1,6 +1,4 @@ -//#region New Crops - -// Sunflower +// Priority: 0 const registerTFGCrops = (event) => { @@ -53,18 +51,4 @@ const registerTFGCrops = (event) => { .translationKey('item.tfg.wild_rapeseed') .seeds('tfg:rapeseed_seeds') .hardness(0.2) -} - -//#endregion - -//#region New Items - -const registerTFGPlants = (event) => { - - event.create('tfg:roasted_sunflower_seeds') - .translationKey('item.tfg.roasted_sunflower_seeds') - .texture('tfg:item/plant/roasted_sunflower_seeds') - -} - -//#endregion \ No newline at end of file +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index f3c2df8fe..6784d385e 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -4,6 +4,7 @@ const registerTFGBlocks = (event) => { registerTFGNetherBlocks(event) registerTFGSpaceBlocks(event) registerTFGSupportBlocks(event) + registerTFGCrops(event) event.create('tfg:artificial_end_portal_frame') .stoneSoundType() diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index 1078c4322..493576158 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -46,14 +46,14 @@ function registerTFGFoodItems(event) { .eaten(ctx => { ctx.player.give('tfg:used_foil_pack') })) - .texture('tfg:item/food/calorie_paste') + .texture('tfg:item/food/calorie_paste') event.create('tfg:used_foil_pack') .translationKey('item.tfg.food.used_foil_pack') .food(food => food.hunger(0).saturation(0) .effect('minecraft:nausea', 200, 0, 1) ) - .texture('tfg:item/used_foil_pack') + .texture('tfg:item/used_foil_pack') event.create('tfg:food/meal_bag') .translationKey('item.tfg.food.meal_bag') @@ -61,5 +61,9 @@ function registerTFGFoodItems(event) { .eaten(ctx => { ctx.player.give('tfg:used_foil_pack') })) - .texture('tfg:item/food/meal_bag') + .texture('tfg:item/food/meal_bag') + + event.create('tfg:roasted_sunflower_seeds') + .translationKey('item.tfg.roasted_sunflower_seeds') + .texture('tfg:item/plant/roasted_sunflower_seeds') } \ No newline at end of file