diff options
Diffstat (limited to 'src/main/java/tileentities')
| -rw-r--r-- | src/main/java/tileentities/GTMTE_FluidMultiStorage.java | 2 | ||||
| -rw-r--r-- | src/main/java/tileentities/GTMTE_SOFuelCellMK1.java | 19 | ||||
| -rw-r--r-- | src/main/java/tileentities/GTMTE_SOFuelCellMK2.java | 19 |
3 files changed, 19 insertions, 21 deletions
diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java index 945309ad80..221fd03a49 100644 --- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java @@ -343,7 +343,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { runningCostAcc += 4.0f;
fluidCapacityAcc += (float) STORAGE_FIELD4.getCapacity();
} else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
- .equals(STORAGE_FIELD4.getUnlocalizedName())) {
+ .equals(STORAGE_FIELD5.getUnlocalizedName())) {
runningCostAcc += 8.0f;
fluidCapacityAcc += (float) STORAGE_FIELD5.getCapacity();
} else {
diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java index 9aa0a5c01d..197799149c 100644 --- a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java +++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java @@ -35,9 +35,9 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { private final int CASING_META = 1;
private final int CASING_TEXTURE_ID = 49;
- private final int OXYGEN_PER_TICK = 20;
+ private final int OXYGEN_PER_SEC = 400;
private final int EU_PER_TICK = 1024;
- private final int STEAM_PER_TICK = 900;
+ private final int STEAM_PER_SEC = 18000;
public GTMTE_SOFuelCellMK1(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
@@ -60,8 +60,8 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { b.addInfo("Oxidizes gas fuels to generate electricity without polluting the environment")
.addInfo("Consumes 29,480EU worth of fuel with up to 97% efficiency each second")
.addInfo("Steam production requires the SOFC to heat up completely first")
- .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Steam")
- .addInfo("Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas")
+ .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam")
+ .addInfo("Additionally requires " + OXYGEN_PER_SEC + "L/s Oxygen gas")
.addSeparator()
.beginStructureBlock(3, 3, 5)
.addController("Front Center")
@@ -119,22 +119,21 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { if((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null
&& hatchFluid.isFluidEqual(liquid)) {
- liquid.amount = EU_PER_TICK / aFuel.mSpecialValue;
+ liquid.amount = Math.round((EU_PER_TICK * 20) / aFuel.mSpecialValue);
if(super.depleteInput(liquid)) {
- if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_TICK))) {
+ if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) {
super.mEUt = 0;
super.mEfficiency = 0;
return false;
}
super.mEUt = EU_PER_TICK;
- super.mProgresstime = 1;
- super.mMaxProgresstime = 1;
- super.mEfficiencyIncrease = 5;
+ super.mMaxProgresstime = 20;
+ super.mEfficiencyIncrease = 40;
if(super.mEfficiency == getMaxEfficiency(null)) {
- super.addOutput(GT_ModHandler.getSteam(STEAM_PER_TICK));
+ super.addOutput(GT_ModHandler.getSteam(STEAM_PER_SEC));
}
return true;
}
diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java index 3ecba204ce..de8b37cb85 100644 --- a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java +++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java @@ -35,9 +35,9 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { final int CASING_META = 0;
final int CASING_TEXTURE_ID = 48;
- private final int OXYGEN_PER_TICK = 100;
+ private final int OXYGEN_PER_SEC = 2000;
private final int EU_PER_TICK = 24576; // 100% Efficiency, 3A IV
- private final int STEAM_PER_TICK = 4800; // SH Steam (10,800EU/t @ 150% Efficiency)
+ private final int STEAM_PER_SEC = 96000; // SH Steam (10,800EU/t @ 150% Efficiency)
public GTMTE_SOFuelCellMK2(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
@@ -60,8 +60,8 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { b.addInfo("Oxidizes gas fuels to generate electricity without polluting the environment")
.addInfo("Consumes 442,200EU worth of fuel with up to 97% efficiency each second")
.addInfo("Steam production requires the SOFC to heat up completely first")
- .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Steam")
- .addInfo("Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas")
+ .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam")
+ .addInfo("Additionally requires " + OXYGEN_PER_SEC + "L/s Oxygen gas")
.addSeparator()
.beginStructureBlock(3, 3, 5)
.addController("Front Center")
@@ -119,22 +119,21 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { if((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null
&& hatchFluid.isFluidEqual(liquid)) {
- liquid.amount = EU_PER_TICK / aFuel.mSpecialValue;
+ liquid.amount = Math.round((EU_PER_TICK * 20) / aFuel.mSpecialValue);
if(super.depleteInput(liquid)) {
- if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_TICK))) {
+ if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) {
super.mEUt = 0;
super.mEfficiency = 0;
return false;
}
super.mEUt = EU_PER_TICK;
- super.mProgresstime = 1;
- super.mMaxProgresstime = 1;
- super.mEfficiencyIncrease = 20;
+ super.mMaxProgresstime = 20;
+ super.mEfficiencyIncrease = 80;
if(super.mEfficiency == getMaxEfficiency(null)) {
- super.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", STEAM_PER_TICK));
+ super.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", STEAM_PER_SEC));
}
return true;
}
|