diff options
| author | miozune <miozune@gmail.com> | 2022-08-02 17:34:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 10:34:54 +0200 |
| commit | 50a5f9f5df5fc7d3690d9c8b3bfff67e69f4df73 (patch) | |
| tree | fed6ac3684989ef619876e99159e5467caece595 /src/main/java/gregtech/common/gui | |
| parent | 89bf9ba2b6fe2e7c8217f78389318ec5140be0c5 (diff) | |
| download | GT5-Unofficial-50a5f9f5df5fc7d3690d9c8b3bfff67e69f4df73.tar.gz GT5-Unofficial-50a5f9f5df5fc7d3690d9c8b3bfff67e69f4df73.tar.bz2 GT5-Unofficial-50a5f9f5df5fc7d3690d9c8b3bfff67e69f4df73.zip | |
Fusion fixes (#1181)
* Allow storing `long` energy
* Fix hardcoded voltage limit for searching recipe
* Fix reactor might run without consuming energy
* Fix weird charging rate limit
Diffstat (limited to 'src/main/java/gregtech/common/gui')
| -rw-r--r-- | src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java index d6fd5da3ce..55c144356a 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java @@ -43,8 +43,10 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi fontRendererObj.drawString("320,000,000 EU", 50, 155, 0x00ff0000); else if(this.mContainer.mEnergy > 640000000 && this.mContainer.mEnergy < 640010000) fontRendererObj.drawString("640,000,000 EU", 50, 155, 0x00ff0000); + else if(this.mContainer.mEnergyLong > 5120000000L && this.mContainer.mEnergyLong < 5120080000L) + fontRendererObj.drawString("5,120,000,000 EU", 50, 155, 0x00ff0000); else - fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", 50, 155, 0x00ff0000); + fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergyLong) + " EU", 50, 155, 0x00ff0000); } } @@ -55,7 +57,7 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); if (this.mContainer != null) { - double tScale = (double) this.mContainer.mEnergy / (double) this.mContainer.mStorage; + double tScale = (double) this.mContainer.mEnergyLong / (double) this.mContainer.mStorageLong; drawTexturedModalRect(x + 5, y + 156, 0, 251, Math.min(147, (int) (tScale * 148)), 5); } } |