+ Added Advanced Mixers, which can mix 4 inputs with up to 4 outputs.

3 files changed, 98 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index d1ceef98bb..9236aa53e5 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -96,6 +96,7 @@ public class COMPAT_HANDLER {
 			GregtechIndustrialThermalCentrifuge.run();
 			GregtechIndustrialWashPlant.run();
 			GregtechSemiFluidgenerators.run();
+			GregtechAdvancedMixer.run();
 
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index c1413be384..2032555a7f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -246,7 +246,12 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Industrial_WashPlant, 
 	
 	//Semi-Fluid generators
-	Generator_SemiFluid_LV, Generator_SemiFluid_MV, Generator_SemiFluid_HV,
+	Generator_SemiFluid_LV, Generator_SemiFluid_MV, Generator_SemiFluid_HV, 
+	
+	//Advanced Mixer 4x4
+	Machine_Advanced_LV_Mixer, Machine_Advanced_MV_Mixer, Machine_Advanced_HV_Mixer, 
+	Machine_Advanced_EV_Mixer, Machine_Advanced_IV_Mixer, Machine_Advanced_LuV_Mixer, 
+	Machine_Advanced_ZPM_Mixer, Machine_Advanced_UV_Mixer,
 	
 	
 	
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
new file mode 100644
index 0000000000..a09a9674de
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
@@ -0,0 +1,91 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+
+public class GregtechAdvancedMixer {
+
+	private static int mID = 851;
+	
+	public static void run(){
+		run1();
+	}
+	
+	private static void run1(){
+		GregtechItemList.Machine_Advanced_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.01",
+				"Basic Combiner", 1, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_LV_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+		GregtechItemList.Machine_Advanced_MV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.02",
+				"Advanced Combiner I", 2, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_MV_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+		GregtechItemList.Machine_Advanced_HV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.03",
+				"Advanced Combiner II", 3, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_HV_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+		GregtechItemList.Machine_Advanced_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.04",
+				"Super Combiner I", 4, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_EV_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+		GregtechItemList.Machine_Advanced_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.05",
+				"Super Combiner II", 5, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_IV_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+		GregtechItemList.Machine_Advanced_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.06",
+				"Mega Combiner I", 6, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_LuV_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+		GregtechItemList.Machine_Advanced_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.07",
+				"Mega Combiner II", 7, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_ZPM_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+		GregtechItemList.Machine_Advanced_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.08",
+				"Ultra Combiner I", 8, "Indeed, It does blend!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"MixerAdvanced.png", "", false, false, 0, "MIXER",
+				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						ItemList.Machine_UV_Mixer, Character.valueOf('E'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L));
+	}
+	
+}