aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-07-02 12:28:40 +0200
committerDream-Master <dream-master@gmx.net>2017-07-02 12:28:40 +0200
commit6e317ed20766688fb020f8b9d1e82983cf9b5425 (patch)
treef9ec8d4ec9f8e3d3ad6530fbb7ba67a92eaaa784 /src/main
parent67e3b7ddc6e5c7b71e2f9ac5e18c5ca99e075149 (diff)
downloadGT5-Unofficial-6e317ed20766688fb020f8b9d1e82983cf9b5425.tar.gz
GT5-Unofficial-6e317ed20766688fb020f8b9d1e82983cf9b5425.tar.bz2
GT5-Unofficial-6e317ed20766688fb020f8b9d1e82983cf9b5425.zip
cherry Pick
9fc84fc1e74bdf81b33ff84d008a1614115a69f1 ff0017de19f80dd70fa646ea8b6464110e64677b c21e9cfc41ea0129aae7ff8bc41aea7eaf73629f @Antifluxfield Please look if i make it right Thanks
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java66
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java53
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java38
3 files changed, 101 insertions, 56 deletions
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
index 5f55e2d6cb..0cbeae6be2 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
@@ -94,19 +94,27 @@ public interface IGT_RecipeAdder {
*
* @param aInput1 must be != null
* @param aInput2 must be != null
- * @param aOutput must be != null
+ * @param aOutput1 must be != null
* @param aDuration must be > 0
*/
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration);
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration, int aEUt);
+ /**
+ * Adds a Chemical Recipe
+ *
+ * @param aInput1 must be != null
+ * @param aInput2 must be != null
+ * @param aOutput1 must be != null
+ * @param aDuration must be > 0
+ */
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration, boolean aBasicOnly);
/**
* Adds a Chemical Recipe
*
* @param aInput1 must be != null
* @param aInput2 must be != null
- * @param aOutput must be != null
+ * @param aOutput1 must be != null
* @param aDuration must be > 0
*/
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration);
@@ -117,18 +125,39 @@ public interface IGT_RecipeAdder {
* @param aInput1 must be != null
* @param aInput2 must be != null
* @param aOutput1 must be != null
+ * @param aDuration must be > 0
+ */
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, boolean aBasicOnly);
+
+ /**
+ * Adds a Chemical Recipe
+ *
+ * @param aInput1 must be != null
+ * @param aInput2 must be != null
+ * @param aOutput1 must be != null
* @param aOutput2 must be != null
* @param aDuration must be > 0
*/
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration);
-
+
+ /**
+ * Adds a Chemical Recipe
+ *
+ * @param aInput1 must be != null
+ * @param aInput2 must be != null
+ * @param aOutput1 must be != null
+ * @param aOutput2 must be != null
+ * @param aDuration must be > 0
+ */
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, boolean aBasicOnly);
+
/**
* Adds Recipes for creating a radically polymerized polymer from a base Material (for example Ethylene -> Polyethylene)
* @param aBasicMaterial The basic Material
* @param aPolymer The polymer
*/
public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, Fluid aPolymer);
-
+
/**
* Adds a Chemical Recipe
*
@@ -140,7 +169,6 @@ public interface IGT_RecipeAdder {
*/
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUtick);
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick, boolean aCleanroom);
/**
* Adds a Chemical Recipe
*
@@ -153,22 +181,22 @@ public interface IGT_RecipeAdder {
*/
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick);
- /**
- + * Adds a Chemical Recipe that only exists in the Large Chemical Reactor
- + *
- + * @param aInputs item inputs
- + * @param aFluidInputs fluid inputs
- + * @param aFluidOutputs fluid outputs
- + * @param aOutputs item outputs
- + * @param aDuration must be > 0
- + * @param aEUtick must be > 0
- + * aInputs and aFluidInputs must contain at least one valid input.
- + * aOutputs and aFluidOutputs must contain at least one valid output.
- + */
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick, boolean aClenroom);
+ /**
+ * Adds a Chemical Recipe that only exists in the Large Chemical Reactor
+ *
+ * @param aInputs item inputs
+ * @param aFluidInputs fluid inputs
+ * @param aFluidOutputs fluid outputs
+ * @param aOutputs item outputs
+ * @param aDuration must be > 0
+ * @param aEUtick must be > 0
+ * aInputs and aFluidInputs must contain at least one valid input.
+ * aOutputs and aFluidOutputs must contain at least one valid output.
+ */
public boolean addMultiblockChemicalRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUtick);
-
/**
* Adds a Blast Furnace Recipe
*
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 2fce33cf69..a45ef2896b 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -93,51 +93,68 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
return addChemicalRecipe(aInput1, aInput2, null, null, aOutput, aDuration);
}
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration, int aEUt) {
- return addChemicalRecipe(aInput1, aInput2, null, null, aOutput, aDuration, aEUt);
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration, boolean aBasicOnly) {
+ return addChemicalRecipe(aInput1, aInput2, null, null, aOutput, aDuration, aBasicOnly);
}
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration) {
return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, 30);
}
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, boolean aBasicOnly) {
+ return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, 30, aBasicOnly);
+ }
+
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration) {
return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aOutput2, aDuration, 30);
}
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, boolean aBasicOnly) {
+ return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aOutput2, aDuration, 30, aBasicOnly);
+ }
+
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUTick) {
return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, GT_Values.NI, aDuration, aEUTick);
}
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick) {
- return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aOutput2, aDuration, aEUtick, false);
+
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUTick, boolean aBasicOnly) {
+ return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, GT_Values.NI, aDuration, aEUTick, aBasicOnly);
}
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick, boolean aCleanroom) {
+
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick){
+ return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aOutput2, aDuration, aEUtick, false, false);
+ }
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick, boolean aCleanroom){
+ return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aOutput2, aDuration, aEUtick, true, false);
+ }
+
+ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick, boolean aCleanroom, boolean aBasicOnly) {
if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput == null) && (aOutput2 == null) && (aFluidOutput == null))) {
- return false;
+ return false;
}
if ((aOutput != null || aOutput2 != null) && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aOutput, aDuration)) <= 0)) {
- return false;
+ return false;
}
if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
return false;
}
if (aEUtick <= 0) {
- return false;
+ return false;
}
- GT_Recipe.GT_Recipe_Map.sChemicalRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput, aOutput2}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUtick, aCleanroom ? -200 : 0);
- GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe(false, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput, aOutput2}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUtick, 0);
+ GT_Recipe.GT_Recipe_Map.sChemicalRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput, aOutput2}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUtick, aCleanroom ? 200:0);
+ if (!aBasicOnly) GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe(false, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput, aOutput2}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUtick, 0);
return true;
}
public boolean addMultiblockChemicalRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUtick){
- if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)) {
- return false;
- }
- if (aEUtick <= 0) {
- return false;
- }
- GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUtick, 0);
- return true;
+ if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)) {
+ return false;
+ }
+ if (aEUtick <= 0) {
+ return false;
+ }
+ GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUtick, 0);
+ return true;
}
@Override
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 5f247ce174..6471ed4d81 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -2044,9 +2044,9 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSG, 3L),
ItemList.Electric_Motor_LuV.get(2, new Object(){}),
ItemList.Electric_Piston_LuV.get(1, new Object(){}),
- ItemList.Circuit_Masterquantumcomputer.get(2, null),
- ItemList.Circuit_Quantumcomputer.get(2, null),
- ItemList.Circuit_Nanoprocessor.get(6,null),
+ ItemList.Circuit_Masterquantumcomputer.get(2),
+ ItemList.Circuit_Quantumcomputer.get(2),
+ ItemList.Circuit_Nanoprocessor.get(6),
GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(576),
Materials.Lubricant.getFluid(250)}, ItemList.Robot_Arm_LuV.get(1, new Object[]{}), 600, 6000);
@@ -2057,9 +2057,9 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSE, 3L),
ItemList.Electric_Motor_ZPM.get(2, new Object(){}),
ItemList.Electric_Piston_ZPM.get(1, new Object(){}),
- ItemList.Circuit_Masterquantumcomputer.get(4, null),
- ItemList.Circuit_Quantumcomputer.get(4, null),
- ItemList.Circuit_Nanoprocessor.get(12,null),
+ ItemList.Circuit_Masterquantumcomputer.get(4),
+ ItemList.Circuit_Quantumcomputer.get(4),
+ ItemList.Circuit_Nanoprocessor.get(12),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(1152),
Materials.Lubricant.getFluid(750)}, ItemList.Robot_Arm_ZPM.get(1, new Object[]{}), 600, 24000);
@@ -2070,9 +2070,9 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3L),
ItemList.Electric_Motor_UV.get(2, new Object(){}),
ItemList.Electric_Piston_UV.get(1, new Object(){}),
- ItemList.Circuit_Crystalcomputer.get(8, null),
- ItemList.Circuit_Crystalprocessor.get(8, null),
- ItemList.Circuit_Nanoprocessor.get(24,null),
+ ItemList.Circuit_Crystalcomputer.get(8),
+ ItemList.Circuit_Crystalprocessor.get(8),
+ ItemList.Circuit_Nanoprocessor.get(24),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 6L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2304),
Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1, new Object[]{}), 600, 100000);
@@ -2090,7 +2090,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Motor_LuV.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 8L),
ItemList.Gravistar.get(1, new Object(){}),
- ItemList.Circuit_Nanoprocessor.get(7,null),
+ ItemList.Circuit_Nanoprocessor.get(7),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@@ -2103,7 +2103,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Motor_ZPM.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8L),
ItemList.Gravistar.get(2, new Object(){}),
- ItemList.Circuit_Quantumcomputer.get(7, null),
+ ItemList.Circuit_Quantumcomputer.get(7),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@@ -2116,7 +2116,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Motor_UV.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8L),
ItemList.Gravistar.get(4, new Object(){}),
- ItemList.Circuit_Crystalcomputer.get(7, null),
+ ItemList.Circuit_Crystalcomputer.get(7),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@@ -2131,7 +2131,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Motor_LuV.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 8L),
ItemList.Gravistar.get(1, new Object(){}),
- ItemList.Circuit_Nanoprocessor.get(7,null),
+ ItemList.Circuit_Nanoprocessor.get(7),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@@ -2144,7 +2144,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Motor_ZPM.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8L),
ItemList.Gravistar.get(2, new Object(){}),
- ItemList.Circuit_Quantumcomputer.get(7, null),
+ ItemList.Circuit_Quantumcomputer.get(7),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@@ -2157,7 +2157,7 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Electric_Motor_UV.get(1, new Object(){}),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8L),
ItemList.Gravistar.get(4, new Object(){}),
- ItemList.Circuit_Crystalcomputer.get(7, null),
+ ItemList.Circuit_Crystalcomputer.get(7),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@@ -2172,7 +2172,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSG, 6L),
ItemList.QuantumStar.get(2, new Object(){}),
ItemList.Emitter_LuV.get(4, new Object(){}),
- ItemList.Circuit_Masterquantumcomputer.get(8, null),
+ ItemList.Circuit_Masterquantumcomputer.get(8),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@@ -2186,7 +2186,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 6L),
ItemList.Gravistar.get(1, new Object(){}),
ItemList.Emitter_ZPM.get(4, new Object(){}),
- ItemList.Circuit_Crystalcomputer.get(16, null),
+ ItemList.Circuit_Crystalcomputer.get(16),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
@@ -2204,7 +2204,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L),
ItemList.Gravistar.get(2, new Object(){}),
ItemList.Emitter_UV.get(4, new Object(){}),
- ItemList.Circuit_Neuroprocessor.get(64, null),
+ ItemList.Circuit_Neuroprocessor.get(64),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
@@ -2638,7 +2638,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addChemicalRecipe(Materials.CarbonMonoxide.getCells(1), GT_Values.NI, Materials.Methanol.getFluid(1000), Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(1), 300);
GT_Values.RA.addChemicalRecipe(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(10), Materials.Oxygen.getGas(2000), Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(1), 100);
GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(10), Materials.Ethylene.getGas(1000), Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(2), 100);
- GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(2), Materials.Ethylene.getCells(1), GT_Values.NF, Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(3), 100);
+ GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(2), Materials.Ethylene.getCells(1), GT_Values.NF, Materials.AceticAcid.getFluid(1000), Materials.Empty.getCells(3), 100, true);
GT_Values.RA.addFermentingRecipe(Materials.Biomass.getFluid(100), Materials.FermentedBiomass.getFluid(100), 150, false);
GT_Values.RA.addFermentingRecipe(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 100), Materials.FermentedBiomass.getFluid(100), 150, false);