tfc invar (#1502)

CHANGELOG.md

@@ -18,7 +18,11 @@
 - Added melting recipes for all the TFC metal dusts @Pyritie
 - Added mortar and pestle recipes for soybean and olive paste (#1480) @Pyritie
 - Added concrete to the list of valid blocks for GT facades (#1487) @TheAshenWolf
+- Removed Advanced Peripherals' Overpowered End Automata for allowing cheap interdimensional travel
+- Removed Advanced Peripherals' Chunk Controller for allowing too much offline chunkloading, slowing down large servers
+- Added Invar as a TFC-compatible metal (#1496) @Pyritie
 ### Bug fixes
+- Some bug fixes for the electric refrigerators @gustovafing
 - Fixed not being able to craft fine wire in a coiling machine for materials that didn't also have normal wire @Pyritie
 - Fixed cobalt brass and potin double plates not being obtainable until MV @Pyritie
 - Fixed missing recipe for cooking fox meat @Pyritie

kubejs/assets/tfc/lang/en_us.json

@@ -2610,6 +2610,7 @@
   "metal.tfg.red_alloy": "Red Alloy",
   "metal.tfg.tin_alloy": "Tin Alloy",
   "metal.tfg.lead": "Lead",
+  "metal.tfg.invar": "Invar",
   "trim_material.tfc.almandine_tfc": "Almandine",
   "trim_material.tfc.andradite_tfc": "Andradite",
   "trim_material.tfc.blue_topaz_tfc": "Blue Topaz",

kubejs/server_scripts/gregtech/data.js

@@ -115,6 +115,7 @@ const registerGTCEUMetals = (event) => {
 	event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', '#forge:double_ingots/red_alloy', '#forge:plates/red_alloy', 2, 'tfg:red_alloy')
 	event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', '#forge:double_ingots/tin_alloy', '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy')
 	event.metal('gtceu:lead', 330, 0.01729, '#forge:ingots/lead', '#forge:double_ingots/lead', '#forge:plates/lead', 2, 'tfg:lead')
+	event.metal('gtceu:invar', 1494, 0.00741, '#forge:ingots/invar', '#forge:double_ingots/invar', '#forge:plates/invar', 3, 'tfg:invar')
 }
 
 

kubejs/server_scripts/tfc/recipes.materials.js

@@ -10,6 +10,9 @@ function registerTFCMaterialsRecipes(event) {
 			return;
 		}
 		
+		// Add any other early game metals here with GT tools but no TFC ones
+		const onlyHasGTTools = material === GTMaterials.Invar;
+
 		let outputMaterial = (tfcProperty.getOutputMaterial() === null) ? material : tfcProperty.getOutputMaterial()
 
 		// Ingots
@@ -224,7 +227,7 @@ function registerTFCMaterialsRecipes(event) {
 						}
 
 						// Tools (From Double Plate)
-						if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
+						if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
 							//#region Фурма
 
 							// Декрафт инструмента в жидкость
@@ -280,7 +283,7 @@ function registerTFCMaterialsRecipes(event) {
 					}
 
 					// Tools (From Plate)
-					if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
+					if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
 						//#region Удочка
 
 						// Декрафт оголовья в жидкость
@@ -357,6 +360,7 @@ function registerTFCMaterialsRecipes(event) {
 
 					//#region Дубина
 
+					if (!onlyHasGTTools) {
 						// Декрафт инструмента в жидкость
 						event.recipes.tfc.heating(`tfc:metal/mace/${material.getName()}`, tfcProperty.getMeltTemp())
 							.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
@@ -375,14 +379,13 @@ function registerTFCMaterialsRecipes(event) {
 									Item.of('tfc:ceramic/mace_head_mold').strongNBT()
 								]
 							).id(`tfg:tfc/filling/${material.getName()}_mace_head`)
-
 						}
 
 						// Декрафт оголовья в жидкость
 						event.recipes.tfc.heating(`tfc:metal/mace_head/${material.getName()}`, tfcProperty.getMeltTemp())
 							.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
 							.id(`tfc:heating/metal/${material.getName()}_mace_head`)
-
+					}
 					//#endregion
 
 					//#region Мясницкий нож
@@ -672,6 +675,7 @@ function registerTFCMaterialsRecipes(event) {
 				//#endregion
 					
 				// #region mattock
+				if (!onlyHasGTTools) {
 					event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
 						.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
 						.useDurability(true)
@@ -680,6 +684,7 @@ function registerTFCMaterialsRecipes(event) {
 					event.recipes.tfc.heating(`rnr:metal/mattock_head/${material.getName()}`, tfcProperty.getMeltTemp())
 						.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
 						.id(`rnr:heating/metal/${material.getName()}_mattock_head`)
+				}
 				//#endregion
 				
 				// #region screwdriver
@@ -1083,6 +1088,7 @@ function registerTFCMaterialsRecipes(event) {
 					//#region shears 
 
 					// Сварка оголовий
+					if (!onlyHasGTTools) {
 						event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
 							.id(`tfc:welding/${material.getName()}_shears`)
 
@@ -1096,7 +1102,7 @@ function registerTFCMaterialsRecipes(event) {
 							.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
 							.useDurability(true)
 							.id(`tfc:heating/metal/${material.getName()}_shears`)
-
+					}
 					//#endregion
 
 				}
@@ -1105,6 +1111,7 @@ function registerTFCMaterialsRecipes(event) {
 
 				//#region prospector pick
 
+				if (!onlyHasGTTools) {
 					// Декрафт инструмента в жидкость
 					event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
 						.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@@ -1129,11 +1136,11 @@ function registerTFCMaterialsRecipes(event) {
 							]
 						).id(`tfg:tfc/filling/${material.getName()}_propick_head_mold`)
 					}
-
+				}
 				//#endregion
 
 				//#region chisel
-
+				if (!onlyHasGTTools) {
 					// Декрафт инструмента в жидкость
 					event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
 						.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@@ -1158,11 +1165,11 @@ function registerTFCMaterialsRecipes(event) {
 							]
 						).id(`tfg:tfc/filling/${material.getName()}_chisel_head_mold`)
 					}
-
+				}
 				//#endregion
 
 				//#region javelin
-
+				if (!onlyHasGTTools) {
 					// Декрафт инструмента в жидкость
 					event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
 						.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@@ -1187,7 +1194,7 @@ function registerTFCMaterialsRecipes(event) {
 							]
 						).id(`tfg:tfc/filling/${material.getName()}_javelin_head_mold`)
 					}
-
+				}
 				//#endregion
 			}
 		}

kubejs/server_scripts/tfc/recipes.metals.js

@@ -15,6 +15,11 @@ function registerTFCMetalsRecipes(event) {
 		TFC.alloyPart('tfc:cast_iron', 0.45, 0.55)
 	]).id('tfg:alloy/tin_alloy')
 
+	event.recipes.tfc.alloy('tfg:invar', [
+		TFC.alloyPart('tfc:nickel', 0.60, 0.70),
+		TFC.alloyPart('tfc:cast_iron', 0.30, 0.40)
+	]).id('tfg:alloy/invar')
+
 	//#endregion
 
 

kubejs/server_scripts/tfc/tags.js

@@ -73,6 +73,8 @@ const registerTFCItemTags = (event) => {
 	event.add('tfc:pileable_sheets', '#forge:plates')
 	event.add('tfc:pileable_double_ingots', 'gtceu:tin_alloy_double_ingot')
 	event.add('tfc:pileable_double_ingots', 'gtceu:red_alloy_double_ingot')
+	event.add('tfc:pileable_double_ingots', 'gtceu:lead_double_ingot')
+	event.add('tfc:pileable_double_ingots', 'gtceu:invar_double_ingot')
 
 	// Рыба
 	event.add('minecraft:fishes', 'tfc:food/calamari')
@@ -487,6 +489,7 @@ const registerTFCFluidTags = (event) => {
 	event.add('tfc:usable_in_ingot_mold', 'gtceu:red_alloy')
 	event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy')
 	event.add('tfc:usable_in_ingot_mold', 'gtceu:lead')
+	event.add('tfc:usable_in_ingot_mold', 'gtceu:invar')
 
 	event.add('tfc:usable_in_bell_mold', 'gtceu:bronze')
 	event.add('tfc:usable_in_bell_mold', 'gtceu:gold')

kubejs/startup_scripts/gtceu/materials.js

@@ -134,6 +134,7 @@ const registerGTCEuMaterialModification = (event) => {
 	GTMaterials.RedAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(570, 650, 740, 2));
 	GTMaterials.TinAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1000, 1100, 1250, 3));
 	GTMaterials.Lead.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(170, 250, 330, 2));
+	GTMaterials.Invar.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(896, 1195, 1494, 3));
 
 
 	GTMaterials.Gold.addFlags(GENERATE_BELL);
@@ -185,6 +186,7 @@ const registerGTCEuMaterialModification = (event) => {
 	GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR);
 	GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
 	GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS);
+	GTMaterials.Invar.addFlags(GENERATE_DOUBLE_INGOTS, HAS_TFC_TOOL);
 	//
 	//		  /* Superconductors */
 	GTMaterials.ManganesePhosphide.addFlags(GENERATE_FINE_WIRE);