aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/registration
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2018-05-13 01:46:31 +1000
committerGitHub <noreply@github.com>2018-05-13 01:46:31 +1000
commit4d15336cfb84a61d7609d75c683f21ea084f47bb (patch)
tree1e3e837486ab8843bd97951d3f0cfdf2f69dc0d5 /src/Java/gtPlusPlus/xmod/gregtech/registration
parent3ce52cc43f1b41ec0b4f9486afc188bd4d11c055 (diff)
downloadGT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.tar.gz
GT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.tar.bz2
GT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.zip
Codeenvy (#273)
+ Added recipes for all Advanced Multis. + Added new casings for Advanced EBF. + Added Turbine Animations. + Added recipe for the Air Intake Hatch. + Added new textures for the Adv. Vac. Freezer and casings. % Gave old Adv. Vac. Freezer texture to Adv. EBF. % Swapped recipe materials for Adv. Vac. and EBF. + Added a book for Power Storage Solutions. + Added book for the FFPP. - Removed some useless Meta Tiles. (This removes advanced Mixer recipes, but not the tiles themselves.) $ Fixed issue with AIC tooltip. $ Fixed some chemical processing recipes. #266 $ Fixed Large Auto-Assembler Name. $ Possible fix for #239. $ Other Bug Fixes. $ Fixed Old School Circuits breaking Integrated Circuit Recipes. % Made all FFPP recipes require/produces 1/10th of the original fluid amounts. #268 % Made Adv. EBF. Use new casing textures. % Streamlined Old School Circuit function call locations to a single handler. % Cleaned up ASM Logging.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/registration')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java22
2 files changed, 13 insertions, 11 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index ed37d901ad..7bee8f41d5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -75,6 +75,6 @@ public class Gregtech4Content {
// Gregtech 4 Multiblock Auto-Crafter
Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter.");
GregtechItemList.GT4_Multi_Crafter.set(
- new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Asesembler v1.01").getStackForm(1L));
+ new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Assembler v1.01").getStackForm(1L));
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
index dc79b3953b..5db800d82a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
@@ -17,10 +17,12 @@ public class GregtechAdvancedMixer {
private static int mID = 851;
public static void run(){
- generateMixerRecipeMap();
+ //generateMixerRecipeMap();
run1();
}
-
+
+ private static GT_Recipe_Map map = GT_Recipe.GT_Recipe_Map.sMixerRecipes;
+
private static boolean generateMixerRecipeMap(){
if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0){
GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes;
@@ -45,7 +47,7 @@ public class GregtechAdvancedMixer {
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,
+ "Basic Combiner", 1, "Indeed, It does blend!", map, 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'),
@@ -54,7 +56,7 @@ public class GregtechAdvancedMixer {
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
+ "Advanced Combiner I", 2, "Indeed, It does blend!", map, 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'),
@@ -63,7 +65,7 @@ public class GregtechAdvancedMixer {
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
+ "Advanced Combiner II", 3, "Indeed, It does blend!", map, 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'),
@@ -72,7 +74,7 @@ public class GregtechAdvancedMixer {
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
+ "Super Combiner I", 4, "Indeed, It does blend!", map, 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'),
@@ -81,7 +83,7 @@ public class GregtechAdvancedMixer {
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).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!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
+ "Super Combiner II", 5, "Indeed, It does blend!", map, 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'),
@@ -93,7 +95,7 @@ public class GregtechAdvancedMixer {
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,
+ "Mega Combiner I", 6, "Indeed, It does blend!", map, 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'),
@@ -103,7 +105,7 @@ public class GregtechAdvancedMixer {
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,
+ "Mega Combiner II", 7, "Indeed, It does blend!", map, 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'),
@@ -113,7 +115,7 @@ public class GregtechAdvancedMixer {
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,
+ "Ultra Combiner I", 8, "Indeed, It does blend!", map, 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'),