button unification (#1461), fixing beneath wood recipes

CHANGELOG.md

@@ -38,6 +38,7 @@
 - Fixed the electric greenhouse fruit tree recipes making more saplings instead of fruit (#1445) @Pyritie
 - Fixed missing firmalife jam food processor recipes (#1478) @Pyritie
 - Book and quill uses any black dye now (#1506) @Pyritie
+- Button recipe unification (mostly) (#1461) @Pyritie
 ### Translation updates
 - Ukranian @Furryks & @MetEnBouldry
 

kubejs/server_scripts/beneath/recipes.js

@@ -20,6 +20,20 @@ const registerBeneathRecipes = (event) => {
 	event.remove({ id: 'beneath:crafting/hellbricks' })
 	event.remove({ id: 'beneath:crafting/nether_brick' })
 	event.remove({ id: 'beneath:quern/slime' })
+	event.remove({ id: 'beneath:crafting/wood/crimson_planks' })
+	event.remove({ id: 'beneath:crafting/wood/crimson_slab' })
+	event.remove({ id: 'beneath:crafting/wood/crimson_button' })
+	event.remove({ id: 'beneath:crafting/wood/crimson_pressure_plate' })
+	event.remove({ id: 'beneath:crafting/wood/crimson_lumber_log' })
+	event.remove({ id: 'beneath:crafting/wood/crimson_lumber_planks' })
+	event.remove({ id: 'beneath:crafting/wood/crimson_slab_undo' })
+	event.remove({ id: 'beneath:crafting/wood/warped_planks' })
+	event.remove({ id: 'beneath:crafting/wood/warped_slab' })
+	event.remove({ id: 'beneath:crafting/wood/warped_button' })
+	event.remove({ id: 'beneath:crafting/wood/warped_pressure_plate' })
+	event.remove({ id: 'beneath:crafting/wood/warped_lumber_log' })
+	event.remove({ id: 'beneath:crafting/wood/warped_lumber_planks' })
+	event.remove({ id: 'beneath:crafting/wood/warped_slab_undo' })
 	
 	event.shaped('beneath:unposter', [
 		'ABA',
@@ -60,4 +74,64 @@ const registerBeneathRecipes = (event) => {
 	generateGreenHouseRecipe(event, '8x minecraft:crimson_fungus', 'tfg:semiheavy_ammoniacal_water', 16000,
 		'64x beneath:wood/log/crimson', 'tfg:green_house/crimson_fungus', 'ad_astra:mars', 8,
 		'16x minecraft:nether_wart_block', GTValues.VA[GTValues.MV])
+
+	// don't pass in the items like doors, trapdoors etc because beneath already has good recipes for those
+	woodBuilder(event, 'crimson', 'beneath:wood/lumber/crimson', '#tfc:crimson_logs', 'beneath:wood/log/crimson',
+		'beneath:wood/stripped_log/crimson', 'beneath:wood/planks/crimson', null,
+		'beneath:wood/planks/crimson_slab', null, null, null, null, null, 'beneath:wood/planks/crimson_pressure_plate',
+		'beneath:wood/planks/crimson_button')
+
+	event.recipes.gtceu.lathe(`tfg:cutter/crimson_stripped_wood_from_wood`)
+		.itemInputs('beneath:wood/wood/crimson')
+		.itemOutputs('beneath:wood/stripped_wood/crimson')
+		.duration(50)
+		.EUt(GTValues.VA[GTValues.ULV])
+
+	event.custom({
+		type: 'vintageimprovements:turning',
+		ingredients: [{ item: 'beneath:wood/wood/crimson' }],
+		results: [{ item: 'beneath:wood/stripped_wood/crimson' }],
+		processingTime: 50
+	}).id(`tfg:vi/lathe/stripping_crimson_wood`)
+
+	event.shaped('beneath:wood/sewing_table/crimson', [
+		' AB',
+		'CCC',
+		'D D'
+	], {
+		A: '#forge:leather',
+		B: '#forge:shears',
+		C: 'beneath:wood/planks/crimson',
+		D: 'beneath:wood/log/crimson'
+	}).id('tfg:shaped/crimson_sewing_table')
+
+
+	woodBuilder(event, 'warped', 'beneath:wood/lumber/warped', '#tfc:warped_logs', 'beneath:wood/log/warped',
+		'beneath:wood/stripped_log/warped', 'beneath:wood/planks/warped', null,
+		'beneath:wood/planks/warped_slab', null, null, null, null, null, 'beneath:wood/planks/warped_pressure_plate',
+		'beneath:wood/planks/warped_button')
+
+	event.recipes.gtceu.lathe(`tfg:cutter/warped_stripped_wood_from_wood`)
+		.itemInputs('beneath:wood/wood/warped')
+		.itemOutputs('beneath:wood/stripped_wood/warped')
+		.duration(50)
+		.EUt(GTValues.VA[GTValues.ULV])
+
+	event.custom({
+		type: 'vintageimprovements:turning',
+		ingredients: [{ item: 'beneath:wood/wood/warped' }],
+		results: [{ item: 'beneath:wood/stripped_wood/warped' }],
+		processingTime: 50
+	}).id(`tfg:vi/lathe/stripping_warped_wood`)
+
+	event.shaped('beneath:wood/sewing_table/warped', [
+		' AB',
+		'CCC',
+		'D D'
+	], {
+		A: '#forge:leather',
+		B: '#forge:shears',
+		C: 'beneath:wood/planks/warped',
+		D: 'beneath:wood/log/warped'
+	}).id('tfg:shaped/warped_sewing_table')
 }

kubejs/server_scripts/greate/recipes.removes.js

@@ -46,4 +46,6 @@ function removeGreateRecipes(event) {
 	event.remove({ mod: 'greate', type: 'create:deploying' });
 	event.remove({ mod: 'greate', type: 'create:sequenced_assembly' });
 	event.remove({ mod: 'greate', type: 'gtceu:assembler' });
+
+	event.remove({ id: 'greate:cutting/integration/create/cutting/runtime_generated/compat/minecraft/bamboo_planks_to_bamboo_button' })
 }

kubejs/server_scripts/gregtech/recipes.js

@@ -1309,4 +1309,22 @@ const registerGTCEURecipes = (event) => {
 		.outputFluids('gtceu:wood_gas 100')
 		.duration(100)
 		.EUt(GTValues.VA[GTValues.LV])
+
+	
+	// Buttons
+	event.replaceOutput({ id: 'gtceu:cutter/blackstone_button' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button')
+	event.replaceOutput({ id: 'gtceu:cutter/blackstone_button_water' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button')
+	event.replaceOutput({ id: 'gtceu:cutter/blackstone_button_distilled_water' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button')
+	removeCutterRecipe(event, 'blackstone_button')
+	removeCutterRecipe(event, 'blackstone_button_water')
+	removeCutterRecipe(event, 'blackstone_button_distilled_water')
+
+	event.replaceOutput({ id: 'gtceu:cutter/bamboo_button' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button')
+	event.replaceOutput({ id: 'gtceu:cutter/bamboo_button_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button')
+	event.replaceOutput({ id: 'gtceu:cutter/bamboo_button_distilled_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button')
+
+	event.replaceOutput({ id: 'gtceu:cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
+	event.replaceOutput({ id: 'gtceu:cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
+	event.replaceOutput({ id: 'gtceu:cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
+
 }

kubejs/server_scripts/gregtech/recipes.removes.js

@@ -603,6 +603,8 @@ function removeGTCEURecipes(event) {
 	event.remove({ id: 'gtceu:shaped/gear_diamond' })
 	event.remove({ id: 'gtceu:shaped/buzzsaw_blade_diamond' })
 	event.remove({ id: 'gtceu:shaped/purpur_stair_saw' })
+	event.remove({ id: 'gtceu:shaped/bamboo_button' })
+	event.remove({ id: 'gtceu:shaped/treated_button' })
 
 	event.remove({ id: 'gtceu:shapeless/glass_full_dust_flint' })
 
@@ -730,18 +732,18 @@ function removeGTCEURecipes(event) {
 
 	//removes metal armor
 	const armor = [
-    'gtceu:bronze_helmet',
+		'gtceu:bronze_helmet',
-    'gtceu:bronze_chestplate',
+		'gtceu:bronze_chestplate',
-    'gtceu:bronze_leggings',
+		'gtceu:bronze_leggings',
-    'gtceu:bronze_boots',
+		'gtceu:bronze_boots',
-    'gtceu:steel_helmet',
+		'gtceu:steel_helmet',
-    'gtceu:steel_chestplate',
+		'gtceu:steel_chestplate',
-    'gtceu:steel_leggings',
+		'gtceu:steel_leggings',
-    'gtceu:steel_boots',
+		'gtceu:steel_boots',
-    'gtceu:titanium_helmet',
+		'gtceu:titanium_helmet',
-    'gtceu:titanium_chestplate',
+		'gtceu:titanium_chestplate',
-    'gtceu:titanium_leggings',
+		'gtceu:titanium_leggings',
-    'gtceu:titanium_boots'
+		'gtceu:titanium_boots'
 	];
 	armor.forEach(armor => {
 		event.remove({ output: armor})

kubejs/server_scripts/gregtech/utility.js

@@ -323,6 +323,13 @@ function woodBuilder(event, name, lumber, logs, log, stripped_log, plank, stair,
 			.itemOutputs(stripped_log)
 			.duration(50)
 			.EUt(GTValues.VA[GTValues.ULV])
+
+		event.custom({
+			type: 'vintageimprovements:turning',
+			ingredients: [{ item: log }],
+			results: [{ item: stripped_log }],
+			processingTime: 50
+		}).id(`tfg:vi/lathe/stripping_${name}_log`)
 	}
 
 	if (logs && lumber && name) {