aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/recipe
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-09-14 18:04:41 +1000
committerAlkalus <draknyte1@hotmail.com>2017-09-14 18:04:41 +1000
commit566d184c1185f08be31b8e3a65d58c1c65872e0a (patch)
treec770760cac7435bb4bb7eea19920944f51aa1fe3 /src/Java/gtPlusPlus/core/recipe
parentb99d0579ec290bee71618f5c3b125294d152bfea (diff)
downloadGT5-Unofficial-566d184c1185f08be31b8e3a65d58c1c65872e0a.tar.gz
GT5-Unofficial-566d184c1185f08be31b8e3a65d58c1c65872e0a.tar.bz2
GT5-Unofficial-566d184c1185f08be31b8e3a65d58c1c65872e0a.zip
+ Recipe for Sub-Station controller.
$ Added a fix for the vanadium plate recipe not generating.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java29
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java44
2 files changed, 45 insertions, 28 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 20c7acc5e4..a7d8ccb702 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -8,6 +8,7 @@ import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
+import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.item.ItemUtils;
@@ -44,6 +45,7 @@ public class RECIPES_GREGTECH {
mixerRecipes();
macerationRecipes();
centrifugeRecipes();
+ benderRecipes();
addFuels();
}
@@ -303,7 +305,7 @@ public class RECIPES_GREGTECH {
230); //EU
}catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
-
+
//(NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
try {
CORE.RA.addDehydratorRecipe(
@@ -322,7 +324,7 @@ public class RECIPES_GREGTECH {
120); //EU
}catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
-
+
}
}
@@ -425,15 +427,15 @@ public class RECIPES_GREGTECH {
addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), ItemUtils.getItemStackOfAmountFromOreDict("plateVanadiumGallium", 8), FluidUtils.getFluidStack("molten.tantalum", 144*4), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8), 32, 128);
addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("nitrogen", 1000), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 256);
addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, GregtechItemList.Casing_Power_SubStation.get(4), 80, 128);
- }
-
+ }
+
private static boolean addAR(ItemStack inputA, ItemStack inputB, ItemStack outputA, int seconds, int voltage){
//return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
- return addAR(inputA, inputB, null, outputA, seconds*20, voltage);
+ return addAR(inputA, inputB, null, outputA, seconds*20, voltage);
}
-
+
private static boolean addAR(ItemStack inputA, ItemStack inputB, FluidStack inputFluidA, ItemStack outputA, int seconds, int voltage){
-//return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
+ //return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage);
return GT_Values.RA.addAssemblerRecipe(inputA, inputB, inputFluidA, outputA, seconds*20, voltage);
}
@@ -501,7 +503,7 @@ public class RECIPES_GREGTECH {
},
new int[]{2000, 1000, 250, 250, 250, 250, 500},
0);
-
+
HotFuel.addNewHotFuel(
FluidUtils.getFluidStack("ic2pahoehoelava", 83),
GT_Values.NF,
@@ -513,14 +515,14 @@ public class RECIPES_GREGTECH {
},
new int[]{1000, 500, 125, 1850},
0);
-
+
/*HotFuel.addNewHotFuel(
FluidUtils.getFluidStack("ic2hotcoolant", 100),
GT_Values.NF,
new ItemStack[]{},
new int[]{},
0);*/
-
+
//CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2);
@@ -716,6 +718,13 @@ public class RECIPES_GREGTECH {
30);
}
+ private static void benderRecipes(){
+
+ if (CORE.configSwitches.enableMultiblock_PowerSubstation){
+ GT_Values.RA.addBenderRecipe(ItemUtils.getItemStackOfAmountFromOreDict("ingotVanadium", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 1), 8, 16);
+ }
+ }
+
private static void compressorRecipes(){
GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallClay", 4), ItemUtils.getItemStackOfAmountFromOreDict("plateClay", 1));
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 13a2d1445f..a5a996ba7a 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -914,63 +914,71 @@ public class RECIPES_Machines {
//LFTR Control Circuit
ItemStack circuitT5 = ItemList.Circuit_Master.get(1);
GT_Values.RA.addAssemblerRecipe(circuitT5, CI.fieldGenerator_HV, controlCircuit, 240*20, 500);
-
-
+
+
//Fission Fuel Plant
RecipeUtils.addShapedGregtechRecipe(
CI.getTieredCircuit(5), CI.craftingToolSolderingIron, CI.getTieredCircuit(5),
"plateDenseTungstenSteel", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDenseTungstenSteel",
"gearStellite", CI.machineHull_LuV, "gearStellite",
GregtechItemList.Industrial_FuelRefinery.get(1));
-
+
ItemStack mInnerTank;
-
+
if (CORE.GTNH || !CORE.configSwitches.enableMachine_FluidTanks){
mInnerTank = ItemList.Quantum_Tank_LV.get(1);
}
else {
mInnerTank = GregtechItemList.GT_FluidTank_EV.get(1);
}
-
+
//Incoloy Casing
RecipeUtils.addShapedGregtechRecipe(
"plateIncoloyDS", "pipeHugeStaballoy", "plateIncoloyDS",
"gearIncoloyDS", mInnerTank, "gearIncoloyDS",
"plateIncoloyDS", "pipeHugeStaballoy", "plateIncoloyDS",
GregtechItemList.Casing_Refinery_Internal.get(1));
-
+
//Hastelloy-N Sealant Casing
RecipeUtils.addShapedGregtechRecipe(
"plateIncoloyMA956", "plateHastelloyN", "plateIncoloyMA956",
"plateHastelloyN", "frameGtHastelloyC276", "plateHastelloyN",
"plateIncoloyMA956", "plateHastelloyN", "plateIncoloyMA956",
GregtechItemList.Casing_Refinery_External.get(1));
-
+
//Hastelloy-X Structural Casing
RecipeUtils.addShapedGregtechRecipe(
"ringInconel792", "gearHastelloyX", CI.component_Plate[5],
CI.craftingToolHammer_Hard, "frameGtHastelloyC276", CI.craftingToolWrench,
CI.component_Plate[5], CI.getTieredMachineCasing(4), "ringInconel792",
GregtechItemList.Casing_Refinery_Structural.get(1));
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
}
-
+
if (CORE.configSwitches.enableMultiblock_PowerSubstation){
+
+ }
RecipeUtils.recipeBuilder(
null, "plateIncoloy020", null,
"plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020",
null, "plateIncoloy020", null,
GregtechItemList.Casing_Power_SubStation.get(1));
- }
-
+
+ RecipeUtils.recipeBuilder(
+ "plateIncoloyMA956", GregtechItemList.Battery_RE_EV_Lithium.get(1), "plateIncoloyMA956",
+ GregtechItemList.Casing_Power_SubStation.get(1), GregtechItemList.Casing_Vanadium_Redox.get(1), GregtechItemList.Casing_Power_SubStation.get(1),
+ "plateIncoloy020", "plateIncoloyMA956", "plateIncoloy020",
+ GregtechItemList.PowerSubStation.get(1));
+
+
}
Utils.LOG_INFO("Done loading recipes for the Various machine blocks.");
}