aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/recipes
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-02-05 05:50:54 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-02-05 05:50:54 +0000
commitf18c0e23ce7602f66bb2cf50216d51413147034b (patch)
treec2897e909ab1d88d857426a524e97fe2966915de /src/Java/gtPlusPlus/xmod/gregtech/recipes
parent61cda77c86ca4c20ece74fa97156db6909749742 (diff)
downloadGT5-Unofficial-f18c0e23ce7602f66bb2cf50216d51413147034b.tar.gz
GT5-Unofficial-f18c0e23ce7602f66bb2cf50216d51413147034b.tar.bz2
GT5-Unofficial-f18c0e23ce7602f66bb2cf50216d51413147034b.zip
+ Added recipes for ULV generators.
+ Added recipes for New batteries and their components. (To be use in the charger packs). % Mildly adjusted Circuit programmer recipe. % Adjusted Plasma hatch to be output only. $ Fixed bad tooltips on material blocks/frames. $ Fixed Lang formatting issue.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/recipes')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index ace4876639..8f3e49d7b7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -750,7 +750,22 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return CORE.RA.addComponentMakerRecipe(aInputs, aInputFluid, aOutput1, aDuration, aEUt);
}
- public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
+ public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs_OLD, ItemStack aOutput, int aDuration, int aEUt) {
+
+ FluidStack[] aFluidInputs = new FluidStack[4];
+ if (aFluidInputs_OLD != null) {
+ int aC = 0;
+ for (FluidStack s : aFluidInputs) {
+ if (aC > 3) {
+ break;
+ }
+ if (s != null) {
+ aFluidInputs[aC++] = s;
+ }
+ }
+ }
+
+
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
if (aInputs.length < 6 && aFluidInputs.length < 2) {
ItemStack[] aInputStack = new ItemStack[] {aResearchItem, aInputs[0], aInputs[1], aInputs[2], aInputs[3], aInputs[4]};