diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 7a636a5cc..f6db5e448 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -29,6 +29,27 @@ const registerGTCEURecipes = (event) => { //#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 a586e8841..4494fcb11 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -152,6 +152,7 @@ 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 13f416962..890a49977 100644 --- a/kubejs/server_scripts/minecraft/data.js +++ b/kubejs/server_scripts/minecraft/data.js @@ -59,4 +59,8 @@ 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 518927acc..163ed327f 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -87,3 +87,27 @@ const registerTFCFoodData = (event) => { }) } +//#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/tags.js b/kubejs/server_scripts/tfg/tags.js index 86410f3f4..1f0738ba7 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -2,7 +2,10 @@ const registerTFGItemTags = (event) => { registerTFGTrimTags(event) registerFacadeWhitelistTags(event) - + //crop stuff + event.add('tfc:seeds', 'tfg:sunflower_seeds') + event.add('tfc:seeds', 'tfg:rapeseed_seeds') + event.add('tfc:foods', 'tfg:roasted_sunflower_seeds') //temporary hidden items event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small') event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source') @@ -300,7 +303,12 @@ const registerTFGItemTags = (event) => { const registerTFGBlockTags = (event) => { event.add('minecraft:mineable/shovel', 'tfg:ash_pile') + //crop stuff + event.add('tfc:crops', 'tfg:rapeseed') + event.add('tfc:mineable_with_sharp_tool', 'tfg:rapeseed') + event.add('tfc:crops', 'tfg:sunflower') + event.add('tfc:mineable_with_sharp_tool','tfg:sunflower') // #region Nether blocks event.add('minecraft:nether_carver_replaceables', 'tfg:rock/hardened_deepslate') diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index d8d63ff86..6eb15caba 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -612,6 +612,27 @@ function registerVintageImprovementsRecipes(event) { processingTime: 120 }).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber') + event.custom({ + 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: [{ tag: 'forge:seeds'}], + results: [{ fluid: 'gtceu:seed_oil', amount: 16 }], + processingTime: 100 + }).id('tfg:vi/vacuumizing/seed_oil') + // #endregion // #region Coiling diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index e0079e103..e2a5724d7 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -1,13 +1,15 @@ // priority: 0 StartupEvents.registry('item', event => { - registerGTCEuItems(event) - registerTFGItems(event) + registerGTCEuItems(event) + registerTFGItems(event) + registerTFGPlants(event) }) StartupEvents.registry('block', event => { + registerTFGBlocks(event) + registerTFGCrops(event) registerBetterEndBlocks(event) - registerTFGBlocks(event) }) StartupEvents.registry('entity_type', event => { diff --git a/kubejs/startup_scripts/tfg/crops.js b/kubejs/startup_scripts/tfg/crops.js new file mode 100644 index 000000000..8dec9f927 --- /dev/null +++ b/kubejs/startup_scripts/tfg/crops.js @@ -0,0 +1,70 @@ +//#region New Crops + +// Sunflower + +const registerTFGCrops = (event) => { + + event.create('tfg:sunflower', 'tfc:double_crop') + .displayName('Sunflower') + .nutrient('nitrogen') + .stages(8) + .hardness(0.4) + .texture('tfg:block/plant/sunflower') + ['productItem(java.util.function.Consumer)'](product=> { + product.translationKey('item.tfg.sunflower') + product.texture('tfg:item/plant/sunflower_plant') + }) + .seedItem(seed => { + seed.translationKey('item.tfg.sunflower_seed') + seed.texture('tfg:item/plant/sunflower_seed') + }) + .deadBlock(dead => { + dead.translationKey('item.tfg.sunflower_dead') + dead.hardness(0.2) + }) + + event.create('tfg:wild_sunflower', 'tfc:wild_crop') + .type('double') + .translationKey('item.tfg.wild_sunflower') + .seeds('tfg:sunflower_seeds') + .hardness(0.2) + + event.create('tfg:rapeseed', 'tfc:double_crop') + .displayName('Rapeseed') + .nutrient('phosphorous') + .stages(12) + .hardness(0.4) + .texture('tfg:block/plant/rapeseed') + ['productItem(java.util.function.Consumer)'](product => { + product.translationKey('item.tfg.rapeseed') + product.texture('tfg:item/plant/rapeseed_plant') + }) + .seedItem(seed => { + seed.translationKey('item.tfg.rapeseed_seed') + seed.texture('tfg:item/plant/rapeseed_seed') + }) + .deadBlock(dead => { + dead.translationKey('item.tfg.rapeseed_dead') + dead.hardness(0.2) + }) + + event.create('tfg:wild_rapeseed', 'tfc:wild_crop') + .type('double') + .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