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

Derp

Browse source
This commit is contained in:
Muramasa 2016-05-23 18:40:01 +01:00
parent 960087a0a8
commit cddca6e2be
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import java.util.Collection;
public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlockBase { public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlockBase {
protected int fuelConsumption = 0; protected int fuelConsumption = 0;
protected int fuelRemaining = 0; protected int fuelRemaining = 0;
protected boolean enableTurboOut = false;
public GT_MetaTileEntity_DieselEngine(int aID, String aName, String aNameRegional) { public GT_MetaTileEntity_DieselEngine(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional); super(aID, aName, aNameRegional);
@ -70,33 +71,33 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
ArrayList<FluidStack> tFluids = getStoredFluids(); ArrayList<FluidStack> tFluids = getStoredFluids();
Collection<GT_Recipe> tRecipeList = GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList; Collection<GT_Recipe> tRecipeList = GT_Recipe.GT_Recipe_Map.sDieselFuels.mRecipeList;
//TODO Better method to detect turbine item. This will do for testing.
if(tHatches.size() > 0) { if(tHatches.size() > 0) {
if(tHatches.get(0).getStackInSlot(0) != null) { if (tHatches.get(0).getStackInSlot(0) != null) {
ItemStack hatchStack = tHatches.get(0).getStackInSlot(0); ItemStack hatchStack = tHatches.get(0).getStackInSlot(0);
if(hatchStack.getItem() instanceof GT_MetaGenerated_Tool) { //Has a GT tool if (hatchStack.getItem() instanceof GT_MetaGenerated_Tool) { //Has a GT tool
GT_MetaGenerated_Tool hatchTool = (GT_MetaGenerated_Tool)tHatches.get(0).getStackInSlot(0).getItem(); GT_MetaGenerated_Tool hatchTool = (GT_MetaGenerated_Tool) tHatches.get(0).getStackInSlot(0).getItem();
if(GT_MetaGenerated_Tool.getPrimaryMaterial(hatchStack).mDurability > 0) enableTurboOut = true;
}
}
}
//TODO Better method to detect turbine item. This will do for testing. int baseEUt = enableTurboOut ? 8192 : 2048; //Choose base output
int baseEUt = GT_MetaGenerated_Tool.getPrimaryMaterial(hatchStack).mDurability > 0 ? 8192 : 2048; //Choose base output if(tFluids.size() > 0 && tRecipeList != null) { //Does input hatch have a diesel fuel?
for (FluidStack hatchFluid1 : tFluids) { //Loops through hatches
if(tFluids.size() > 0 && tRecipeList != null) { //Does input hatch have a diesel fuel? for(GT_Recipe aFuel : tRecipeList) { //Loops through diesel fuel recipes
for (FluidStack hatchFluid1 : tFluids) { //Loops through hatches FluidStack tLiquid;
for(GT_Recipe aFuel : tRecipeList) { //Loops through diesel fuel recipes if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null) { //Create fluidstack from current recipe
FluidStack tLiquid; if (hatchFluid1.isFluidEqual(tLiquid)) { //Has a diesel fluid
if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null) { //Create fluidstack from current recipe System.out.println("Fuel Value: "+aFuel.mSpecialValue); //For testing, needs to be removed
if (hatchFluid1.isFluidEqual(tLiquid)) { //Has a diesel fluid fuelConsumption = tLiquid.amount = baseEUt / aFuel.mSpecialValue; //Calc fuel consumption
System.out.println("Fuel Value: "+aFuel.mSpecialValue); //For testing, needs to be removed depleteInput(tLiquid); //Deplete that amount
fuelConsumption = tLiquid.amount = baseEUt / aFuel.mSpecialValue; //Calc fuel consumption fuelRemaining = hatchFluid1.amount; //Record available fuel
depleteInput(tLiquid); //Deplete that amount this.mProgresstime = 1;
fuelRemaining = hatchFluid1.amount; //Record available fuel this.mMaxProgresstime = 1;
this.mProgresstime = 1; this.mEfficiencyIncrease = 10;
this.mMaxProgresstime = 1; this.mEUt = mEfficiency < 2000 ? 0 : (int)(baseEUt * ((float)mEfficiency / 10000)); //Output 0 if startup is less than 20%
this.mEfficiencyIncrease = 10; return true;
this.mEUt = mEfficiency < 2000 ? 0 : (int)(baseEUt * ((float)mEfficiency / 10000)); //Output 0 if startup is less than 20%
return true;
}
}
}
} }
} }
} }