+ Enabled MAX Tier components by default, recipes for 5.9 branch can be changed, but currently serve no use.

% Changed colouring of MAX tier components

3 files changed, 62 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/item/general/BufferCore.java b/src/Java/gtPlusPlus/core/item/general/BufferCore.java
index 6343ede855..42f8c99c70 100644
--- a/src/Java/gtPlusPlus/core/item/general/BufferCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/BufferCore.java
@@ -2,6 +2,8 @@ package gtPlusPlus.core.item.general;
 
 import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
 
@@ -79,8 +81,11 @@ public class BufferCore extends BaseItemWithDamageValue{
 		else if (coreTier == 9){
 			HEX_OxFFFFFF = 0xffff00;
 		}
-		else if (coreTier == 10){
+		/*else if (coreTier == 10){
 			HEX_OxFFFFFF = 0xff0000;
+		}*/
+		else if (coreTier == 10){
+			HEX_OxFFFFFF = Utils.rgbtoHexValue(MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250));
 		}
 		else {
 			HEX_OxFFFFFF = 0xffffff;
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index f5e3fd1ad5..d0e6d35321 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -91,6 +91,9 @@ public class RECIPES_MachineComponents {
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 			run();	
 		}
+		else {
+			onlyMaxComponents();
+		}
 		GregtechMachinePhase();
 	}
 
@@ -274,6 +277,49 @@ public class RECIPES_MachineComponents {
 		Utils.LOG_INFO("Done loading recipes for the Various machine components.");
 
 	}		
+	
+	private static void onlyMaxComponents(){
+		UtilsRecipe.addShapedGregtechRecipe(
+				cableTier10, wireTier10, rodTier10a,
+				wireTier10, rodTier10b, wireTier10,
+				rodTier10a, wireTier10, cableTier10,
+				RECIPE_CONSTANTS.electricMotor_MAX);
+		UtilsRecipe.addShapedGregtechRecipe(
+				cableTier10, rotorTier10, itemRubberRing,
+				craftingToolScrewdriver, pipeTier10, craftingToolWrench,
+				itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10,
+				RECIPE_CONSTANTS.electricPump_MAX);
+		UtilsRecipe.addShapedGregtechRecipe(
+				plateTier10, plateTier10, plateTier10,
+				cableTier10, rodTier10a, rodTier10a,
+				cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10,
+				RECIPE_CONSTANTS.electricPiston_MAX);
+		UtilsRecipe.addShapedGregtechRecipe(
+				cableTier10, cableTier10, cableTier10,
+				RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX,
+				RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a,
+				RECIPE_CONSTANTS.robotArm_MAX);
+		UtilsRecipe.addShapedGregtechRecipe(
+				plateRubber, plateRubber, plateRubber,
+				RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX,
+				plateRubber, plateRubber, plateRubber,
+				RECIPE_CONSTANTS.conveyorModule_MAX);
+		UtilsRecipe.addShapedGregtechRecipe(
+				rodTier10c, rodTier10c, circuitTier10,
+				cableTier10, circuitTier9, rodTier10c,
+				circuitTier10, cableTier10, rodTier10c,
+				RECIPE_CONSTANTS.emitter_MAX);
+		UtilsRecipe.addShapedGregtechRecipe(
+				wireTier10, circuitTier10, wireTier10,
+				circuitTier10, circuitTier9, circuitTier10,
+				wireTier10, circuitTier10, wireTier10,
+				RECIPE_CONSTANTS.fieldGenerator_MAX);
+		UtilsRecipe.addShapedGregtechRecipe(
+				plateTier10, null, circuitTier9,
+				plateTier10, rodTier10c, null,
+				circuitTier10, plateTier10, plateTier10,
+				RECIPE_CONSTANTS.sensor_MAX);
+	}
 
 	private static void GregtechMachinePhase(){
 		Utils.LOG_INFO("Adding Gregtech machine recipes for the circuits.");
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
index df945bf9ec..b294dd9cef 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
@@ -76,6 +76,16 @@ public class RECIPE_CONSTANTS {
 		sensor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
 		sensor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
 		sensor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
+		
+		//Max Tier Components Blood Never added... Useless, lol.
+		electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
+		electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
+		electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1);
+		robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1);
+		conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1);
+		emitter_MAX = GregtechItemList.Emitter_MAX.get(1);
+		fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1);
+		sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
 	}
 	
 	private static void registerGTStandardComponents(){