aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-08-01 21:15:46 +0200
committerDream-Master <dream-master@gmx.net>2017-08-01 21:15:46 +0200
commit82a449df7e89c961f87bcc25c1a52913bec04b02 (patch)
treebba70fb16ead84f6e72fbf871035503202a9b494 /src/main/java/gregtech/common
parentd90f10f3d4585535b54c85823bea6898a92e9b91 (diff)
downloadGT5-Unofficial-82a449df7e89c961f87bcc25c1a52913bec04b02.tar.gz
GT5-Unofficial-82a449df7e89c961f87bcc25c1a52913bec04b02.tar.bz2
GT5-Unofficial-82a449df7e89c961f87bcc25c1a52913bec04b02.zip
cherry pick
Commit: 6a1d32e4a3a48b4f7c18e352a4d2efe260994ba8 [6a1d32e] Overhauled the Wetware Circuit recipes They no longer need beer. Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java12
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java1
2 files changed, 13 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 8d8b27c07e..3b7959398a 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -323,6 +323,18 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
return true;
}
+ public boolean addAssemblerRecipe(ItemStack[] aInputs, Object aOreDict, int aAmount, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt){
+ for(ItemStack tStack : GT_OreDictUnificator.getOres(aOreDict)){
+ if(GT_Utility.isStackValid(tStack)) {
+ ItemStack[] extendedInputs = new ItemStack[aInputs.length + 1];
+ System.arraycopy(aInputs, 0, extendedInputs, 0, aInputs.length);
+ extendedInputs[aInputs.length] = GT_Utility.copyAmount(aAmount, tStack);
+ addAssemblerRecipe(extendedInputs, aFluidInput, aOutput1, aDuration, aEUt);
+ }
+ }
+ return true;
+ }
+
public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt) {
if ((aInput1 == null) || (aOutput1 == null)) {
return false;
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
index 97b34a79c4..7b68568e53 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
@@ -56,6 +56,7 @@ public class GT_MetaGenerated_Item_03
// ItemList.Circuit_Parts_Capacitor.set(addItem(tLastID = 19, "Capacitor", "Electronic Component", o)); //wiring ev
ItemList.Circuit_Parts_CapacitorSMD.set(addItem(tLastID = 20, "SMD Capacitor", "Electronic Component", o));
ItemList.Circuit_Parts_GlassFiber.set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o));
+ ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o));
/**