summaryrefslogtreecommitdiff
path: root/ihl/processing
diff options
context:
space:
mode:
authorFoghrye4 <foghrye4@gmail.com>2017-05-31 21:23:10 +0300
committerFoghrye4 <foghrye4@gmail.com>2017-05-31 21:23:10 +0300
commit50d62a1298f05d6d440a5bc261a0fdf9ffece893 (patch)
treea23ad25c213978306a5c9f5e747566b01802078b /ihl/processing
parentec543445cec03fb1d638fd8aab87daebb3b1c534 (diff)
energy net fix attempt
Diffstat (limited to 'ihl/processing')
-rw-r--r--ihl/processing/chemistry/ChemicalReactorTileEntity.java15
-rw-r--r--ihl/processing/chemistry/FractionatorBottomTileEntity.java4
2 files changed, 3 insertions, 16 deletions
diff --git a/ihl/processing/chemistry/ChemicalReactorTileEntity.java b/ihl/processing/chemistry/ChemicalReactorTileEntity.java
index a124265..7de2ccf 100644
--- a/ihl/processing/chemistry/ChemicalReactorTileEntity.java
+++ b/ihl/processing/chemistry/ChemicalReactorTileEntity.java
@@ -196,20 +196,7 @@ public class ChemicalReactorTileEntity extends BasicElectricMotorTileEntity impl
@Override
public List[] getInput()
{
- for(int i=0;i<fluidTank.getNumberOfFluids();i++)
- {
- for(int i1=0;i1<fluidTank.getNumberOfFluids();i1++)
- {
- if(i!=i1)
- {
- if(ChemicalReactorTileEntity.recipeManager.getOutputFor(Arrays.asList(new FluidStack[]{fluidTank.getFluid(i),fluidTank.getFluid(i1)}), this.input.getItemStackList())!=null)
- {
- return new List[] {Arrays.asList(new FluidStack[]{fluidTank.getFluid(i),fluidTank.getFluid(i1)}), this.input.getItemStackList()};
- }
- }
- }
- }
- return new List[] {Arrays.asList(new FluidStack[]{fluidTank.getFluid()}), this.input.getItemStackList()};
+ return new List[] {fluidTank.getFluidList(), this.input.getItemStackList()};
}
@Override
diff --git a/ihl/processing/chemistry/FractionatorBottomTileEntity.java b/ihl/processing/chemistry/FractionatorBottomTileEntity.java
index 288924e..eeabf61 100644
--- a/ihl/processing/chemistry/FractionatorBottomTileEntity.java
+++ b/ihl/processing/chemistry/FractionatorBottomTileEntity.java
@@ -114,8 +114,8 @@ public class FractionatorBottomTileEntity extends TileEntityInventory implements
FluidStack fsCurrentInput = this.fluidTank.getFluid();
if(fsCurrentInput!=null && fsCurrentInput.amount>100 && systemHeat>0)
{
- UniversalRecipeOutput rOutput = FractionatorBottomTileEntity.recipeManager.getOutputFor(Arrays.asList(new FluidStack [] {this.fluidTank.getFluid()}),null);
- UniversalRecipeInput rInput = FractionatorBottomTileEntity.recipeManager.getRecipeInput(Arrays.asList(new FluidStack [] {this.fluidTank.getFluid()}),null);
+ UniversalRecipeOutput rOutput = FractionatorBottomTileEntity.recipeManager.getOutputFor(this.fluidTank.getFluidList(),null);
+ UniversalRecipeInput rInput = FractionatorBottomTileEntity.recipeManager.getRecipeInput(this.fluidTank.getFluidList(),null);
if(rOutput!=null)
{
IRecipeInputFluid input = rInput.getFluidInputs().get(0);