diff options
author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2022-03-14 14:30:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-14 14:30:46 +0100 |
commit | 90ee08a0c37b55ff34d682f37b43bebb827378d9 (patch) | |
tree | e924fba30ae590e2ffd8b57874a5542a900c5dce /src/main/java | |
parent | b9de712dcfb935861059cb92a60c0d698cd302d4 (diff) | |
download | GT5-Unofficial-90ee08a0c37b55ff34d682f37b43bebb827378d9.tar.gz GT5-Unofficial-90ee08a0c37b55ff34d682f37b43bebb827378d9.tar.bz2 GT5-Unofficial-90ee08a0c37b55ff34d682f37b43bebb827378d9.zip |
Add flow rate of oil rigs in the tricorder info (#981)
* Add info to tricorder
* Add number formatting
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index 3e144d7a1a..6ce1aec3f9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -21,9 +21,10 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import static gregtech.api.enums.GT_Values.VN; -import static gregtech.api.enums.GT_Values.debugDriller; +import static gregtech.api.enums.GT_Values.*; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_DRILL_ACTIVE_GLOW; @@ -35,6 +36,7 @@ import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation; public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_DrillerBase { private final ArrayList<Chunk> mOilFieldChunks = new ArrayList<>(); private int mOilId = 0; + private int mOilFlow = 0; private int chunkRangeConfig = getRangeInChunks(); @@ -274,15 +276,18 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D for( Chunk tChunk : emptyChunks) { mOilFieldChunks.remove( tChunk ); } + mOilFlow = tOil.amount; return tOil.amount == 0 ? null : tOil; } @Override public String[] getInfoData() { - return new String[]{ - EnumChatFormatting.BLUE+StatCollector.translateToLocal("GT5U.machines.oilfluidpump")+EnumChatFormatting.RESET, - StatCollector.translateToLocal("GT5U.machines.workarea")+": " + EnumChatFormatting.GREEN + (chunkRangeConfig)+ " x " + (chunkRangeConfig) + - EnumChatFormatting.RESET+" " + StatCollector.translateToLocal("GT5U.machines.chunks") - }; + List<String> l = new ArrayList<>(Arrays.asList(EnumChatFormatting.BLUE + StatCollector.translateToLocal("GT5U.machines.oilfluidpump") + EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.workarea") + ": " + EnumChatFormatting.GREEN + (chunkRangeConfig) + " x " + (chunkRangeConfig) + + EnumChatFormatting.RESET + " " + StatCollector.translateToLocal("GT5U.machines.chunks"), + "Drilling fluid: " + EnumChatFormatting.GREEN + (mOilId > 0 ? FluidRegistry.getFluid(mOilId).getName() : "None") + EnumChatFormatting.RESET, + "Drilling flow: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mMaxProgresstime > 0 ? (mOilFlow / this.mMaxProgresstime) : 0) + EnumChatFormatting.RESET + " L/t")); + l.addAll(Arrays.asList(super.getInfoData())); + return l.toArray(new String[0]); } } |