Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #537 from Muramasa-/DieselGenerator

Browse source 
Fuel efficiency changes for Large Diesel Engine
This commit is contained in:
Blood-Asp 2016-06-24 00:41:46 +02:00 committed by GitHub
commit df6e07b5cd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
View file

@ -76,22 +76,21 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
FluidStack tLiquid; FluidStack tLiquid;
if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null) { //Create fluidstack from current recipe if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null) { //Create fluidstack from current recipe
if (hatchFluid1.isFluidEqual(tLiquid)) { //Has a diesel fluid if (hatchFluid1.isFluidEqual(tLiquid)) { //Has a diesel fluid
fuelConsumption = tLiquid.amount = boostEu ? 8192 / aFuel.mSpecialValue : 2048 / aFuel.mSpecialValue; //Calc fuel consumption fuelConsumption = tLiquid.amount = boostEu ? (4096 / aFuel.mSpecialValue) : (2048 / aFuel.mSpecialValue); //Calc fuel consumption
if(depleteInput(tLiquid)) { //Deplete that amount if(depleteInput(tLiquid)) { //Deplete that amount
if(tFluids.contains(Materials.Oxygen.getGas(1L))) { //Has oxygen? boostEu = depleteInput(Materials.Oxygen.getGas(2L));
if(depleteInput(Materials.Oxygen.getGas((8192 / aFuel.mSpecialValue) / 4))) boostEu = true;
} else boostEu = false;
if(tFluids.contains(Materials.Lubricant.getFluid(1L))) { //Has lubricant? if(tFluids.contains(Materials.Lubricant.getFluid(1L))) { //Has lubricant?
//Deplete Lubricant. 1000L should = 1 hour of runtime (if baseEU = 2048) //Deplete Lubricant. 1000L should = 1 hour of runtime (if baseEU = 2048)
if(mRuntime % 72 == 0 || mRuntime == 0) depleteInput(Materials.Lubricant.getFluid(boostEu ? 4 : 1)); if(mRuntime % 72 == 0 || mRuntime == 0) depleteInput(Materials.Lubricant.getFluid(boostEu ? 2 : 1));
} else return false; } else return false;
fuelValue = aFuel.mSpecialValue; fuelValue = aFuel.mSpecialValue;
fuelRemaining = hatchFluid1.amount; //Record available fuel fuelRemaining = hatchFluid1.amount; //Record available fuel
this.mEUt = mEfficiency < 2000 ? 0 : (int) (2048 * ((float) mEfficiency / 10000)); //Output 0 if startup is less than 20% this.mEUt = mEfficiency < 2000 ? 0 : (int) (2048 * ((float) mEfficiency / 10000)); //Output 0 if startup is less than 20%
this.mProgresstime = 1; this.mProgresstime = 1;
this.mMaxProgresstime = 1; this.mMaxProgresstime = 1;
this.mEfficiencyIncrease = 50; this.mEfficiencyIncrease = 15;
return true; return true;
} }
} }
@ -100,6 +99,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
} }
} }
this.mEUt = 0; this.mEUt = 0;
this.mEfficiency = 0;
return false; return false;
} }
@ -209,7 +209,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
} }
public int getMaxEfficiency(ItemStack aStack) { public int getMaxEfficiency(ItemStack aStack) {
return boostEu ? 40000 : 10000; return boostEu ? 30000 : 10000;
} }
@Override @Override