diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-14 16:35:29 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-14 16:35:29 +1000 |
| commit | 531d043cf40becceceee5028e7ff6e11f553bf77 (patch) | |
| tree | 01b12326f4db9eaf6c44efc0b1450eadd4086a87 /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | 2d6c9e8ac37cf08805f185a76e5e6711a889e40b (diff) | |
| download | GT5-Unofficial-531d043cf40becceceee5028e7ff6e11f553bf77.tar.gz GT5-Unofficial-531d043cf40becceceee5028e7ff6e11f553bf77.tar.bz2 GT5-Unofficial-531d043cf40becceceee5028e7ff6e11f553bf77.zip | |
$ More Tree Farm work.
% Improved scanner tooltips for all Multiblocks.
% Improved Tree Farm GUI.
% Merged TreefarmManager.java into TreeFarmHelper.java.
- Stripped Animal Farm of all logic.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java | 18 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java index 565c378179..3a60a3e93e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java @@ -24,9 +24,9 @@ public class GUI_TreeFarmer extends GT_GUIContainerMetaTile_Machine { this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU; this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU; if (((CONTAINER_TreeFarmer) this.mContainer).mDisplayErrorCode == 0) { - this.fontRendererObj.drawString("Current Power Stored: "+this.storedPower+"EU", 10, 52, 16448255); - this.fontRendererObj.drawString("Max Power Storage: "+this.maxPower+"EU", 10, 60, 16448255); - this.fontRendererObj.drawString("Current operations left: "+(this.storedPower/32), 10, 68, 16448255); + this.fontRendererObj.drawString("Current Power: "+this.storedPower+"EU", 8, 52, 16448255); + this.fontRendererObj.drawString("Max Power: "+this.maxPower+"EU", 8, 60, 16448255); + this.fontRendererObj.drawString("Current operations left: "+(this.storedPower/32), 8, 68, 16448255); } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index ee1ade464d..0eec457d66 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -96,19 +96,11 @@ GT_MetaTileEntity_MultiBlockBase { long second = TimeUnit.SECONDS.toSeconds(seconds) - (TimeUnit.SECONDS.toMinutes(seconds) *60); String[] g = { - "Progress:", - (this.mProgresstime / 20) + "secs", - (this.mMaxProgresstime / 20) + "secs", - "Efficiency:", - (this.mEfficiency / 100.0F) + "%", - "Problems:", - "" + (this.getIdealStatus() - this.getRepairStatus()), - "Total Time Since Build: ", - ""+weeks+" Weeks.", - ""+days+" Days.", - ""+hours+" Hours.", - ""+minutes+" Minutes.", - ""+second+" Seconds.", + "Progress: " + (this.mProgresstime / 20) +" / "+ (this.mMaxProgresstime / 20) + " secs", + "Efficiency: "+(this.mEfficiency / 100.0F) + "%", + "Problems: " + "" + (this.getIdealStatus() - this.getRepairStatus()), + "Total Time Since Built: " + ""+weeks+" Weeks, " + ""+days+" Days, ", + ""+hours+" Hours, " + ""+minutes+" Minutes, " + ""+second+" Seconds.", "Total Time in ticks: "+this.mTotalRunTime}; return g; |