diff options
author | Blood Asp <Blood@Asp> | 2015-04-23 20:38:52 +0200 |
---|---|---|
committer | Blood Asp <Blood@Asp> | 2015-04-23 20:38:52 +0200 |
commit | 88b575ed3cccba9fd37eae4f6b4d91f72c31fd27 (patch) | |
tree | 04dcde36abcd26113bb6c0fbbf8bbcf69e172ace /main/java/gregtech/common/tileentities/machines/multi | |
parent | 7224ac4299098c70efae9dbd04c50a97e3f5f583 (diff) | |
download | GT5-Unofficial-88b575ed3cccba9fd37eae4f6b4d91f72c31fd27.tar.gz GT5-Unofficial-88b575ed3cccba9fd37eae4f6b4d91f72c31fd27.tar.bz2 GT5-Unofficial-88b575ed3cccba9fd37eae4f6b4d91f72c31fd27.zip |
Fix compatibility with forge older than 1355
Diffstat (limited to 'main/java/gregtech/common/tileentities/machines/multi')
-rw-r--r-- | main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 1dbf25e584..5e8cf38a8f 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -233,9 +233,9 @@ public boolean isCorrectMachinePart(ItemStack aStack) {return true;} public boolean checkRecipe(ItemStack aStack) { if(this.mLastRecipe!=null){; for(GT_MetaTileEntity_Hatch_Input tInput : this.mInputHatches){ - if(tInput.mFluid!=null&& tInput.mFluid!=null&&tInput.mFluid.getFluidID()==this.mLastRecipe.mFluidInputs[0].getFluidID()&&tInput.mFluid.amount>=this.mLastRecipe.mFluidInputs[0].amount){ + if(tInput.mFluid!=null&& tInput.mFluid!=null&&tInput.mFluid.getFluid().getID()==this.mLastRecipe.mFluidInputs[0].getFluid().getID()&&tInput.mFluid.amount>=this.mLastRecipe.mFluidInputs[0].amount){ for(GT_MetaTileEntity_Hatch_Input tInput2 : this.mInputHatches){ - if(tInput2.mFluid!=null&& tInput2.mFluid!=null&&tInput2.mFluid.getFluidID()==this.mLastRecipe.mFluidInputs[1].getFluidID()&&tInput2.mFluid.amount>=this.mLastRecipe.mFluidInputs[1].amount&&getMaxInputVoltage()>=this.mLastRecipe.mEUt){ + if(tInput2.mFluid!=null&& tInput2.mFluid!=null&&tInput2.mFluid.getFluid().getID()==this.mLastRecipe.mFluidInputs[1].getFluid().getID()&&tInput2.mFluid.amount>=this.mLastRecipe.mFluidInputs[1].amount&&getMaxInputVoltage()>=this.mLastRecipe.mEUt){ tInput.drain(this.mLastRecipe.mFluidInputs[0].amount, true); tInput2.drain(this.mLastRecipe.mFluidInputs[1].amount, true); this.mEUt = -(this.mLastRecipe.mEUt*tierOverclock()); @@ -255,11 +255,11 @@ public boolean checkRecipe(ItemStack aStack) { FluidStack tFluid = tRecipe.mFluidInputs[0]; if(tFluid!=null){ for(GT_MetaTileEntity_Hatch_Input tInput : this.mInputHatches){ - if(tFluid.fluid !=null&& tInput.getFluid()!=null && tFluid.fluid.getID()==tInput.getFluid().getFluidID()&&tFluid.amount<=tInput.getFluid().amount){ + if(tFluid.fluid !=null&& tInput.getFluid()!=null && tFluid.fluid.getID()==tInput.getFluid().getFluid().getID()&&tFluid.amount<=tInput.getFluid().amount){ FluidStack tFluid2 = tRecipe.mFluidInputs[1]; if(tFluid2!=null){ for(GT_MetaTileEntity_Hatch_Input tInput2 : this.mInputHatches){ - if(tFluid2.fluid !=null&& tInput2.getFluid()!=null&&tFluid2.fluid.getID()==tInput2.getFluid().getFluidID()&&tFluid2.amount<=tInput2.getFluid().amount&&getMaxInputVoltage()>=tRecipe.mEUt&&this.mEUStore>=tRecipe.mSpecialValue){ + if(tFluid2.fluid !=null&& tInput2.getFluid()!=null&&tFluid2.fluid.getID()==tInput2.getFluid().getFluid().getID()&&tFluid2.amount<=tInput2.getFluid().amount&&getMaxInputVoltage()>=tRecipe.mEUt&&this.mEUStore>=tRecipe.mSpecialValue){ tInput.drain(tFluid.amount, true); tInput2.drain(tFluid2.amount, true); this.mLastRecipe=tRecipe; |