diff options
| author | sasha0552 <admin@sasha0552.org> | 2023-08-28 12:01:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 14:01:41 +0200 |
| commit | 8e6ddecbbf05a6f322f239b9ce1b34af6fd8a5d8 (patch) | |
| tree | 0b943015905f2a1bb537b145a82dc538a4a92bd6 /src/main/java | |
| parent | fcabdab7829bbb56812a77561cb355dc877c90ce (diff) | |
| download | GT5-Unofficial-8e6ddecbbf05a6f322f239b9ce1b34af6fd8a5d8.tar.gz GT5-Unofficial-8e6ddecbbf05a6f322f239b9ce1b34af6fd8a5d8.tar.bz2 GT5-Unofficial-8e6ddecbbf05a6f322f239b9ce1b34af6fd8a5d8.zip | |
Make UCFE use TecTech's new power API (#204)
* Make UCFE use TecTech's new power API
* Wrap numbers using formatNumbers
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java index 0bc623c2b6..fbc2b985a1 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java @@ -52,17 +52,18 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB protected final double ROCKET_EFFICIENCY_COEFFICIENT = 0.005D; protected final double EFFICIENCY_CEILING = 1.5D; - private long lEUt; private long tEff; private IStructureDefinition<UniversalChemicalFuelEngine> multiDefinition = null; public UniversalChemicalFuelEngine(String name) { super(name); + super.useLongPower = true; } public UniversalChemicalFuelEngine(int id, String name, String nameRegional) { super(id, name, nameRegional); + super.useLongPower = true; } public final boolean addMaintenance(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { @@ -181,7 +182,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB @Override public int getPollutionPerTick(ItemStack aStack) { - return (int) Math.sqrt(this.mEUt) / 20; + return (int) Math.sqrt(this.getPowerFlow()) / 20; } @Override @@ -228,8 +229,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB consumeAllLiquid(tFuel); consumeAllLiquid(getPromoter()); - this.mEUt = (int) (FuelAmount * recipe.mSpecialValue / 20.0D); - this.lEUt = (long) ((long) FuelAmount * recipe.mSpecialValue / 20.0D); + this.setPowerFlow((long) ((long) FuelAmount * recipe.mSpecialValue / 20.0D)); this.mMaxProgresstime = 20; this.updateSlots(); return CheckRecipeResultRegistry.GENERATING; @@ -245,8 +245,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB consumeAllLiquid(tFuel); consumeAllLiquid(getPromoter()); - this.mEUt = (int) (FuelAmount * recipe.mSpecialValue / 20.0D); - this.lEUt = (long) ((long) FuelAmount * recipe.mSpecialValue / 20.0D); + this.setPowerFlow((long) ((long) FuelAmount * recipe.mSpecialValue / 20.0D)); this.mMaxProgresstime = 20; this.updateSlots(); return CheckRecipeResultRegistry.GENERATING; @@ -264,8 +263,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB consumeAllLiquid(tFuel); consumeAllLiquid(getPromoter()); - this.mEUt = (int) (FuelAmount * recipe.mSpecialValue * 3 / 20.0D); - this.lEUt = (long) ((long) FuelAmount * recipe.mSpecialValue * 3 / 20.0D); + this.setPowerFlow((long) ((long) FuelAmount * recipe.mSpecialValue * 3 / 20.0D)); this.mMaxProgresstime = 20; this.updateSlots(); return CheckRecipeResultRegistry.GENERATING; @@ -287,20 +285,23 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB @Override public String[] getInfoData() { String[] info = super.getInfoData(); - info[4] = "Probably makes: " + EnumChatFormatting.RED + this.lEUt + EnumChatFormatting.RESET + " EU/t"; + info[4] = "Probably makes: " + EnumChatFormatting.RED + + GT_Utility.formatNumbers(this.getPowerFlow()) + + EnumChatFormatting.RESET + + " EU/t"; info[6] = "Problems: " + EnumChatFormatting.RED - + (this.getIdealStatus() - this.getRepairStatus()) + + GT_Utility.formatNumbers(this.getIdealStatus() - this.getRepairStatus()) + EnumChatFormatting.RESET + " Efficiency: " + EnumChatFormatting.YELLOW - + tEff / 100D + + GT_Utility.formatNumbers(tEff / 100D) + EnumChatFormatting.RESET + " %"; return info; } void addAutoEnergy() { - long exEU = lEUt * tEff / 10000; + long exEU = this.getPowerFlow() * tEff / 10000; if (!mDynamoHatches.isEmpty()) { GT_MetaTileEntity_Hatch_Dynamo tHatch = mDynamoHatches.get(0); if (tHatch.maxEUOutput() * tHatch.maxAmperesOut() >= exEU) { |