merge

kubejs/server_scripts/gregtech/recipes.js

@@ -99,6 +99,10 @@ const registerGTCEURecipes = (event) => {
 		.duration(720)
 		.EUt(30)
 
+	// Add circuit to gregtech salt water mixer recipe
+	event.remove({ id: 'gtceu:mixer/salt_water' })
+	generateMixerRecipe(event, ['2x #forge:dusts/salt'], Fluid.of('minecraft:water', 1000), [], 1, Fluid.of('gtceu:salt_water', 1000), 40, 7, 64, 'tfg:gtceu/salt_water')
+
 	//#endregion
 
 	//#region Выход: Каменный стержень
@@ -1085,6 +1089,42 @@ const registerGTCEURecipes = (event) => {
 
 	//#endregion
 
+	//#region Credits
+
+	event.remove({ id: 'gtceu:forming_press/credit_cupronickel' })
+
+	event.recipes.gtceu.forming_press('gtceu:copper_credit')
+		.itemInputs('#forge:ingots/copper')
+		.notConsumable('gtceu:credit_casting_mold')
+		.itemOutputs('8x gtceu:copper_credit')
+		.duration(50)
+		.EUt(2)
+
+	event.recipes.tfc.anvil('8x gtceu:copper_credit', '#forge:ingots/copper', ['bend_last', 'punch_not_last', 'draw_not_last'])
+		.tier(1)
+		.id(`tfc:anvil/copper_credit`)
+
+	event.recipes.tfc.heating('gtceu:copper_credit', GTMaterials.Copper.getProperty(TFGPropertyKey.TFC_PROPERTY).getMeltTemp())
+		.resultFluid(Fluid.of(GTMaterials.Copper.getFluid(), 144 / 8))
+		.id(`tfc:heating/copper_credit`)
+
+	event.custom({
+		type: 'vintageimprovements:curving',
+		ingredients: [{ tag: 'forge:ingots/copper' }],
+		itemAsHead: 'gtceu:credit_casting_mold',
+		results: [{ item: 'gtceu:copper_credit', count: 8 }],
+		processingTime: 50
+	}).id(`tfg:vi/curving/copper_credit`)
+
+	event.recipes.gtceu.extractor('gtceu:copper_credit')
+		.itemInputs('gtceu:copper_credit')
+		.outputFluids(Fluid.of(GTMaterials.Copper.getFluid(), 144 / 8))
+		.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
+		.duration(10)
+		.EUt(2)
+
+	//#endregion
+
 	// TODO: Greate again...
 	event.shapeless('gtceu:programmed_circuit', ['minecraft:stick', '#forge:tools/wrenches'])
 		.id('tfg:shapeless/programmed_circuit_from_stick')

kubejs/server_scripts/gregtech/recipes.materials.js

@@ -401,6 +401,10 @@ function registerGTCEUMetalRecipes(event) {
 		if (!material.hasProperty(PropertyKey.BLAST)) {
 			event.smelting(ingotItem, normalOreItem).id(`gtceu:smelting/smelt_raw_${material.getName()}_ore_to_ingot`)
 		}
+
+		// Remove ore block recipes
+		event.remove({ id: `gtceu:compressor/compress_${material.getName()}_to_raw_ore_block` })
+		event.remove({ id: `gtceu:forge_hammer/decompress_${material.getName()}_to_raw_ore` })
 	}
 
 	const processRichRawOre = (material) => {

kubejs/server_scripts/gregtech/recipes.tfcmetals.js

@@ -2,7 +2,7 @@
 
 function registerGTCEuTFCMetalsRecipes(event)
 {
-		//#region LV hull
+	//#region LV hull
 
 	event.replaceInput('gtceu:shaped/lv_machine_hull', '#forge:plates/wrought_iron', '#forge:plates/red_steel')
 

kubejs/server_scripts/gregtech/utility.js

@@ -34,7 +34,7 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id) => {
 		.chancedOutput(input, 7500, 0)
 		.chancedOutput(input, 5000, 0)
 		.duration(36000) // 30 mins
-		.EUt(72)
+		.EUt(GTValues.VA[GTValues.LV])
 
 	// С удобрением
 	event.recipes.gtceu.greenhouse(`${id}_fertilized`)
@@ -46,7 +46,7 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id) => {
 		.chancedOutput(input, 8500, 0)
 		.chancedOutput(input, 6000, 0)
 		.duration(12000) // 10 mins
-		.EUt(196)
+		.EUt(GTValues.VA[GTValues.LV])
 }
 
 const getFillingNBT = (material, amount) => {
@@ -164,12 +164,8 @@ function generatePlatedBlockRecipe(event, material) {
 		.EUt(GTValues.VA[GTValues.LV])
 }
 
-//const $MRM = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistryManager')
-
 function forEachMaterial(iterator) {
-	//if (GTMaterialRegistry.getPhase() === $MRM.Phase.CLOSED || GTMaterialRegistry.getPhase() === $MRM.Phase.FROZEN) {
-		GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
-			iterator(material)
-		})
-	//}
+	for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) {
+		iterator(material)
+	}
 }