aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/registration
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-10-06 02:50:30 +1000
committerAlkalus <draknyte1@hotmail.com>2017-10-06 02:50:30 +1000
commitab880b63b5aa60b8e3d4f65b38c1d2ec880d1ed2 (patch)
tree596cbe670f424207ecdecf9b10da0d8872a7f062 /src/Java/gtPlusPlus/xmod/gregtech/registration
parent444cddd65e9966ff62ac6064434cec4f867a67ad (diff)
downloadGT5-Unofficial-ab880b63b5aa60b8e3d4f65b38c1d2ec880d1ed2.tar.gz
GT5-Unofficial-ab880b63b5aa60b8e3d4f65b38c1d2ec880d1ed2.tar.bz2
GT5-Unofficial-ab880b63b5aa60b8e3d4f65b38c1d2ec880d1ed2.zip
$ .08 compliance fixes.
% LFTR Changes. It now outputs U233 on average every 10 seconds. % Updated LFTR tool-tip.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java76
1 files changed, 43 insertions, 33 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
index e169a3c0e0..a8c0e45f0b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
@@ -7,18 +7,19 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachin
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class GregtechAdvancedMixer {
private static int mID = 851;
-
+
public static void run(){
generateMixerRecipeMap();
run1();
}
-
+
private static boolean generateMixerRecipeMap(){
if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0){
GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes;
@@ -28,7 +29,7 @@ public class GregtechAdvancedMixer {
for (final GT_Recipe g : x) {
Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.add(g);
}
-
+
if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() > 0){
return true;
}
@@ -36,11 +37,11 @@ public class GregtechAdvancedMixer {
Utils.LOG_INFO("Failed to generate "+ map.mUnlocalizedName +" recipes.");
return false;
}
-
+
}
return true;
}
-
+
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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
@@ -87,33 +88,42 @@ public class GregtechAdvancedMixer {
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.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 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.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 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.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 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.PLATE }).getStackForm(1L));
+
+ if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+ try {
+ 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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 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'),
+ ItemList.valueOf("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.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 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'),
+ ItemList.valueOf("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.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 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'),
+ ItemList.valueOf("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.PLATE }).getStackForm(1L));
+ }
+ catch (Throwable t){}
+ }
+
}
-
}