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

kubejs/server_scripts/firmaciv/recipes.js

@@ -104,6 +104,8 @@ const registerFirmaCivRecipes = (event) => {
 	//#endregion
 
 	// #region More rope
+	event.replaceInput({ output: 'firmaciv:rope_coil'}, 'tfc:jute_fiber', '#tfg:burlap_fiber')
+
 	event.shaped('firmaciv:rope_coil', [
 		'A ',
 		'AB',

kubejs/server_scripts/gregtech/recipes.js

@@ -1171,6 +1171,8 @@ const registerGTCEURecipes = (event) => {
 
 
 	//#region GT Facades
+	event.remove({ id: 'gtceu:crafting/facade_cover'})
+	
 	event.shapeless(Item.of('gtceu:facade_cover', 8, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/iron', "#tfg:whitelisted/facades"])
 		.modifyResult((craftingGrid, result) => {
 			let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id

kubejs/server_scripts/minecraft/recipes.js

@@ -780,7 +780,7 @@ const registerMinecraftRecipes = (event) => {
 		' BA',
 		'A  '
 	], {
-		A: 'tfc:jute_fiber',
+		A: '#tfg:burlap_fiber',
 		B: '#forge:rings'
 	}).id('tfc:crafting/lead')
 

kubejs/server_scripts/sacksnstuff/recipes.js

@@ -59,7 +59,7 @@ const registerSNSRecipes = (event) => {
 				'BCB',
 				'DBE'
 			], {
-				A: 'tfc:jute_fiber',
+				A: '#tfg:burlap_fiber',
 				B: 'sns:leather_strip',
 				C: 'sns:unfinished_leather_sack',
 				D: 'minecraft:name_tag',
@@ -68,7 +68,7 @@ const registerSNSRecipes = (event) => {
 		)
 	).id('sns:crafting/leather_sack')
 	
-	event.recipes.tfc.damage_inputs_shaped_crafting(
+	/*event.recipes.tfc.damage_inputs_shaped_crafting(
 		event.shaped('sns:leather_sack', [
 				' A ',
 				'BCB',
@@ -81,7 +81,7 @@ const registerSNSRecipes = (event) => {
 				E: 'tfc:bone_needle'
 			}
 		)
-	).id('sns:crafting/leather_sack_coil')
+	).id('sns:crafting/leather_sack_coil')*/
 	
 	event.recipes.tfc.damage_inputs_shaped_crafting(
 		event.shaped('sns:ore_sack', [
@@ -161,7 +161,7 @@ const registerSNSRecipes = (event) => {
 		itemAsHead: 'gtceu:small_pipe_extruder_mold',
 		results: [{ item: '2x sns:buckle' }],
 		processingTime: 80 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
-	}).id('sns:vi/curving/buckle')
+	}).id('sns:vi/curving/buckle2')
 
 	event.shaped('sns:pack_frame', [
 			'AAA',
@@ -177,11 +177,11 @@ const registerSNSRecipes = (event) => {
 			'BBB',
 			'AAA'
 		], {
-			A: 'tfc:jute_fiber',
+			A: '#tfg:burlap_fiber',
 			B: '#forge:string'
 			
 		}).id('sns:shaped/reinforced_fiber')
-	
+	/*
 	event.shaped('2x sns:reinforced_fiber', [
 			' A ',
 			'BBB',
@@ -191,10 +191,10 @@ const registerSNSRecipes = (event) => {
 			B: '#forge:string',
 			C: '#forge:tools/knives'
 			
-		}).id('sns:shaped/reinforced_fiber_rope')
+		}).id('sns:shaped/reinforced_fiber_rope')*/
 		
 	event.recipes.gtceu.assembler('sns:reinforced_fiber')
-		.itemInputs('2x tfc:jute_fiber', '#forge:string')
+		.itemInputs('2x #tfg:burlap_fiber', '#forge:string')
 		.itemOutputs('sns:reinforced_fiber')
 		.duration(40)
 		.EUt(GTValues.VA[GTValues.LV])
@@ -215,7 +215,6 @@ const registerSNSRecipes = (event) => {
 		.duration(120)
 		.EUt(GTValues.VA[GTValues.LV])
 		
-	
 	event.recipes.gtceu.bender('sns:horseshoe_steel_electric_only')
 		.itemInputs('#forge:rods/steel')
 		.itemOutputs('sns:metal/horseshoe/steel')

kubejs/server_scripts/tfc/tags.js

@@ -332,6 +332,7 @@ const registerTFCItemTags = (event) => {
 	})
 	
 	event.add('tfc:any_knapping', '#tfc:pit_kiln_straw')
+	event.add('tfg:burlap_fiber', 'tfc:jute_fiber')
 }
 
 const registerTFCBlockTags = (event) => {
@@ -603,6 +604,7 @@ const registerTFCPlacedFeatures = (event) => {
 	// Crops
 	event.add('tfc:feature/crops', 'tfg:earth/sunflower_patch')
 	event.add('tfc:feature/crops', 'tfg:earth/rapeseed_patch')
+	event.add('tfc:feature/crops', 'tfg:earth/flax_patch')
 
 	// Other decoration
 	event.add('tfc:in_biome/underground_decoration', 'tfg:glow_lichen')

kubejs/server_scripts/tfg/data.js

@@ -258,6 +258,8 @@ const registerTFGFoodData = (event) => {
 		food.decayModifier(1.5)
 	})
 	
+
+	
 	
 	
 	// high-tech food
@@ -429,6 +431,15 @@ const registerTFGCropRanges = (event) => {
 		climate.hydrationWiggle(7.5)
 		climate.temperatureWiggle(1.5)
 	}, 'tfg:rapeseed')
+	
+	event.climateRange(climate => {
+		climate.minHydration(15)
+		climate.maxHydration(65)
+		climate.minTemperature(-8)
+		climate.maxTemperature(25)
+		climate.hydrationWiggle(6.5)
+		climate.temperatureWiggle(3)
+	}, 'tfg:flax')
 
 	// Mars
 	event.climateRange(climate => {
@@ -523,6 +534,24 @@ const registerTFGFLPlanters = (event) => {
 		],
 		null
 	)
+	
+	event.firmalifePlantable(
+		'tfg:flax_seeds',
+		'large',
+		0,
+		3,
+		0.2,
+		'tfg:flax_seeds',
+		'tfg:flax_product',
+		'nitrogen',
+		[
+			'tfg:block/crop/flax_age_0',
+			'tfg:block/crop/flax_age_1',
+			'tfg:block/crop/flax_age_5_top',
+			'tfg:block/crop/flax_age_6_top'
+		],
+		null
+	)
 
 	event.firmalifePlantable(
 		'betterend:amber_root_seeds',

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -1367,6 +1367,60 @@ function registerTFGMiscellaneousRecipes(event) {
 		B: 'beneath:warped_straw'
 	}).id('tfg:shaped_large_nest_warped')
 		
-	
 	//#endregion
+	
+	//#region flax stuff
+	
+	event.recipes.tfc.scraping(
+		'tfg:flax_waste',
+		'tfg:flax_product',
+		'tfg:item/flax_waste',
+		'tfg:item/flax_product',
+		'2x tfg:flax_line'
+	).id('tfg:scraping/flax_line')
+	
+	event.recipes.tfc.scraping(
+		'tfc:groundcover/humus',
+		'tfg:flax_waste',
+		'tfc:item/groundcover/humus',
+		'tfg:item/flax_waste',
+		'tfg:flax_tow'
+	).id('tfg:scraping/flax_tow')
+	
+	event.recipes.tfc.damage_inputs_shapeless_crafting(
+		event.shapeless('4x tfg:linen_thread', [
+			'tfg:flax_line',
+			'tfc:spindle'
+		]).id('tfg:shapeless/linen_thread')
+	)
+	
+	//#region looming
+	event.recipes.tfc.loom(
+		'1x tfg:linen_cloth',
+		'16x tfg:linen_thread',
+		8,
+		'tfc:block/burlap'
+	)
+	
+	event.recipes.tfc.loom(
+		'1x tfc:burlap_cloth',
+		'16x tfg:flax_tow',
+		12,
+		'tfc:block/burlap'
+	)
+		
+	event.recipes.gtceu.assembler('tfg:assembler/linen_cloth')
+		.itemInputs('16x tfg:linen_thread')
+		.circuit(10)
+		.itemOutputs('tfg:linen_cloth')
+		.duration(100)
+		.EUt(4)
+	
+	event.recipes.gtceu.assembler('tfg:assembler/flax_burlap')
+		.itemInputs('16x tfg:flax_tow')
+		.circuit(10)
+		.itemOutputs('tfc:burlap_cloth')
+		.duration(100)
+		.EUt(4)
+
 }

kubejs/server_scripts/tfg/tags.js

@@ -7,9 +7,11 @@ const registerTFGItemTags = (event) => {
 	//crop stuff
 	event.add('tfc:seeds', 'tfg:sunflower_seeds')
 	event.add('tfc:seeds', 'tfg:rapeseed_seeds')
+	event.add('tfc:seeds', 'tfg:flax_seeds')
 	event.add('tfc:foods', 'tfg:roasted_sunflower_seeds')
 	event.add('tfc:compost_greens_high', 'tfg:rapeseed_product')
 	event.add('tfc:compost_greens_high', 'tfg:sunflower_product')
+	event.add('tfc:compost_greens_high', 'tfg:flax_product')
 	event.add('tfg:water_breathing_ingredients', 'tfg:rapeseed_product')
 	event.add('tfg:night_vision_ingredients', 'tfg:sunflower_product')
 
@@ -101,6 +103,7 @@ const registerTFGItemTags = (event) => {
 	event.add('tfc:sewing_dark_cloth', 'tfg:polycaprolactam_fabric')
 	event.add('forge:string', 'tfg:phantom_thread')
 	event.add('forge:string', 'tfg:polycaprolactam_string')
+	event.add('forge:string', 'firmalife:pineapple_yarn')
 	//#endregion
 
 	// #region Medicines
@@ -448,6 +451,9 @@ const registerTFGBlockTags = (event) => {
 
 	event.add('tfc:crops', 'tfg:sunflower')
 	event.add('tfc:mineable_with_sharp_tool', 'tfg:sunflower')
+	
+	event.add('tfc:crops', 'tfg:flax')
+	event.add('tfc:mineable_with_sharp_tool', 'tfg:flax')
 
 	// #region Nether blocks
 	event.add('minecraft:nether_carver_replaceables', 'tfg:rock/hardened_deepslate')