diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2018-02-10 18:30:05 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2018-02-10 18:30:05 -0800 |
| commit | bc99c166844d1e7c0de46e04e115e684c4779187 (patch) | |
| tree | b853543177667f17982c7a32bf89a1cb4f0b9c07 /src/main/java | |
| parent | b29eb9de623e573d37f28472e424a4763960e543 (diff) | |
| download | GT5-Unofficial-bc99c166844d1e7c0de46e04e115e684c4779187.tar.gz GT5-Unofficial-bc99c166844d1e7c0de46e04e115e684c4779187.tar.bz2 GT5-Unofficial-bc99c166844d1e7c0de46e04e115e684c4779187.zip | |
Make LCR accept 6 inputs, any combination of items or liquids; Re-enable High Octane Gas in the LCR
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 26 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 2 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 9d2e7216f7..ea8294d834 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -1498,13 +1498,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> { }
public static class GT_Recipe_Map_LargeChemicalReactor extends GT_Recipe_Map{
- private static int INPUT_COUNT = 2;
+ private static int TOTAL_INPUT_COUNT = 6;
private static int OUTPUT_COUNT = 2;
- private static int FLUID_INPUT_COUNT = 4;
private static int FLUID_OUTPUT_COUNT = 4;
public GT_Recipe_Map_LargeChemicalReactor() {
- super(new HashSet<GT_Recipe>(200), "gt.recipe.largechemicalreactor", "Large Chemical Reactor", null, RES_PATH_GUI + "basicmachines/Default", INPUT_COUNT, OUTPUT_COUNT, 0, 0, 1, E, 1, E, true, true);
+ super(new HashSet<GT_Recipe>(200), "gt.recipe.largechemicalreactor", "Large Chemical Reactor", null, RES_PATH_GUI + "basicmachines/Default", 2, OUTPUT_COUNT, 0, 0, 1, E, 1, E, true, true);
}
@Override
@@ -1594,20 +1593,19 @@ public class GT_Recipe implements Comparable<GT_Recipe> { @Override
public ArrayList<PositionedStack> getInputPositionedStacks() {
- int itemLimit = Math.min(mInputs.length, INPUT_COUNT);
- int fluidLimit = Math.min(mFluidInputs.length, FLUID_INPUT_COUNT);
- ArrayList<PositionedStack> inputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
+ int itemLimit = Math.min(mInputs.length, TOTAL_INPUT_COUNT);
+ int fluidLimit = Math.min(mFluidInputs.length, TOTAL_INPUT_COUNT - itemLimit);
+ int inputlimit = itemLimit + fluidLimit;
+ int j = 0;
+
+ ArrayList<PositionedStack> inputStacks = new ArrayList<PositionedStack>(inputlimit);
- for (int i = 0; i < itemLimit; i++) {
- inputStacks.add(new FixedPositionedStack(this.mInputs[i].copy(), 48 - i * 18, 5));
+ for (int i = 0; i < itemLimit; i++, j++) {
+ inputStacks.add(new FixedPositionedStack(this.mInputs[i].copy(), 48 - j%3 * 18, (j >= 3 ? 5 : 23) ));
}
- for (int i = 0; i < fluidLimit; i++) {
- if (i < 3) {
- inputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 48 - i * 18, 23));
- } else {
- inputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 12, 5));
- }
+ for (int i = 0; i < fluidLimit; i++, j++) {
+ inputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 48 - j%3 * 18, (j >= 3 ? 5 : 23)));
}
return inputStacks;
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index ead0b0d826..c6805223cd 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -3462,7 +3462,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.Naphtha.getFluid(16000), Materials.Gas.getGas(2000), Materials.Methanol.getFluid(1000), Materials.Acetone.getFluid(1000)}, new FluidStack[]{ Materials.GasolineRaw.getFluid(20000)}, null, 100, 480); GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.GasolineRaw.getFluid(10000), Materials.Toluene.getFluid(1000)}, new FluidStack[]{ Materials.GasolineRegular.getFluid(11000)}, null, 10, 480); - //GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.GasolineRegular.getFluid(20000), Materials.Octane.getFluid(2000), Materials.NitrousOxide.getGas(6000), Materials.Toluene.getFluid(1000), Materials.AntiKnock.getFluid(3000L)}, new FluidStack[]{Materials.GasolinePremium.getFluid(32000L)}, null, 50, 1920); + GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.GasolineRegular.getFluid(20000), Materials.Octane.getFluid(2000), Materials.NitrousOxide.getGas(6000), Materials.Toluene.getFluid(1000), Materials.AntiKnock.getFluid(3000L)}, new FluidStack[]{Materials.GasolinePremium.getFluid(32000L)}, null, 50, 1920); } public void addPotionRecipes(String aName,ItemStack aItem){ |