Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -1308,6 +1308,21 @@ function registerTFGMiscellaneousRecipes(event) {
 	//#endregion
 
 	//#region flax stuff
+
+	event.shapeless('1x tfg:flax_bundle', ['9x tfg:flax_product'])
+	event.recipes.gtceu.packer('tfg:packer/flax_bundle')
+		.itemInputs('9x tfg:flax_product')
+		.itemOutputs('tfg:flax_bundle')
+		.duration('100')
+		.EUt(GTValues.VA[GTValues.ULV])	
+
+	event.shapeless('1x tfg:bundled_scraped_flax', ['9x tfg:flax_waste'])
+	event.recipes.gtceu.packer('tfg:packer/bundled_scraped_flax')
+		.itemInputs('9x tfg:flax_waste')
+		.itemOutputs('tfg:bundled_scraped_flax')
+		.duration('100')
+		.EUt(GTValues.VA[GTValues.ULV])		
+
 	event.recipes.tfc.scraping(
 		'tfg:flax_waste',
 		'tfg:flax_product',
@@ -1316,6 +1331,14 @@ function registerTFGMiscellaneousRecipes(event) {
 		'2x tfg:flax_line'
 	).id('tfg:scraping/flax_line')
 
+	event.recipes.tfc.scraping(
+		'tfg:bundled_scraped_flax',
+		'tfg:flax_bundle',
+		'tfg:item/bundled_scraped_flax',
+		'tfg:item/flax_bundle',
+		'18x tfg:flax_line'
+	).id('tfg:scraping/flax_line_from_bundle')	
+
 	event.recipes.tfc.scraping(
 		'tfc:groundcover/humus',
 		'tfg:flax_waste',
@@ -1324,17 +1347,37 @@ function registerTFGMiscellaneousRecipes(event) {
 		'tfg:flax_tow'
 	).id('tfg:scraping/flax_tow')
 
+	event.recipes.tfc.scraping(
+		'9x tfc:groundcover/humus',
+		'tfg:bundled_scraped_flax',
+		'tfc:item/groundcover/humus',
+		'tfg:item/bundled_scraped_flax',
+		'9x tfg:flax_tow'
+	).id('tfg:scraping/flax_tow_from_pile')
+
 	event.recipes.gtceu.cutter('tfg:flax_line_in_cutter')
 		.itemInputs('tfg:flax_product')
 		.itemOutputs('2x tfg:flax_line', 'tfg:flax_waste')
 		.duration(60)
 		.EUt(2)
 
+	event.recipes.gtceu.cutter('tfg:flax_line_from_bundle_in_cutter')
+		.itemInputs('tfg:flax_bundle')
+		.itemOutputs('18x tfg:flax_line', 'tfg:bundled_scraped_flax')
+		.duration(540)
+		.EUt(2)	
+
 	event.recipes.gtceu.cutter('tfg:flax_tow_in_cutter')
 		.itemInputs('tfg:flax_waste')
 		.itemOutputs('1x tfg:flax_tow', '1x tfc:groundcover/humus')
 		.duration(60)
 		.EUt(2)
+	
+	event.recipes.gtceu.cutter('tfg:flax_tow_from_bundle_in_cutter')
+		.itemInputs('tfg:bundled_scraped_flax')
+		.itemOutputs('9x tfg:flax_tow', '9x tfc:groundcover/humus')
+		.duration(540)
+		.EUt(2)
 
 	event.recipes.gtceu.centrifuge('tfg:flax_product')
 		.itemInputs('tfg:flax_product')
@@ -1342,6 +1385,12 @@ function registerTFGMiscellaneousRecipes(event) {
 		.duration(200)
 		.EUt(GTValues.VA[GTValues.LV])
 
+	event.recipes.gtceu.centrifuge('tfg:flax_product_from_bundle')
+		.itemInputs('tfg:flax_bundle')
+		.itemOutputs('18x tfg:flax_line', '9x tfg:flax_tow', '9x tfc:groundcover/humus')
+		.duration(1800)
+		.EUt(GTValues.VA[GTValues.LV])	
+
 	event.custom({
 		type: 'vintageimprovements:centrifugation',
 		ingredients: [{ item: 'tfg:flax_product' }],
@@ -1349,6 +1398,13 @@ function registerTFGMiscellaneousRecipes(event) {
 		processingTime: 40 * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
 	}).id('tfg:vi_seperate_flax')
 
+	event.custom({
+		type: 'vintageimprovements:centrifugation',
+		ingredients: [{ item: 'tfg:flax_bundle' }],
+		results: [{ item: 'tfg:flax_line', count: 18 }, { item: 'tfg:flax_tow', count: 9 }, { item: 'tfc:groundcover/humus', count: 9 }],
+		processingTime: 360 * 90 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
+	}).id('tfg:vi_seperate_flax_from_bundle')
+
 	//#region flax line spining
 	event.recipes.tfc.damage_inputs_shapeless_crafting(
 		event.shapeless('4x tfg:linen_thread', [

kubejs/startup_scripts/tfg/items.js

@@ -456,6 +456,16 @@ const registerTFGItems = (event) => {
 		.tag('forge:cloth')
 		.tag('tfc:sewing_light_cloth')
 
+	event.create('tfg:flax_bundle')
+		.tag('tfc:scrapable')
+		.translationKey('item.tfg.flax_bundle')
+		.texture('tfg:item/flax_bundle')
+	
+	event.create('tfg:bundled_scraped_flax')
+		.tag('tfc:scrapable')
+		.translationKey('item.tfg.bundled_scraped_flax')
+		.texture('tfg:item/bundled_scraped_flax')	
+
 	//#region Lab Equipment
 
 	global.LAB_EQUIPMENT_CONTAINERS.forEach((item) => {