diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-10-20 16:46:22 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-10-20 16:46:22 +0200 |
| commit | 6fcb3e194a4ab05695108072f3cad45d13a0a23d (patch) | |
| tree | 5cb0c14ec53c31a840e561aa3b2c8612996458c4 /src/main/java | |
| parent | 1231a3653f17411fb770af9cbed6089a47c96172 (diff) | |
| parent | c8d18356f792de670e8a9b37fb4fe64fd54031cc (diff) | |
| download | GT5-Unofficial-6fcb3e194a4ab05695108072f3cad45d13a0a23d.tar.gz GT5-Unofficial-6fcb3e194a4ab05695108072f3cad45d13a0a23d.tar.bz2 GT5-Unofficial-6fcb3e194a4ab05695108072f3cad45d13a0a23d.zip | |
Merge branch 'experimental' into GT_dev
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 90834a3d16..e1db9d54f6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -248,7 +248,10 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity if (tierOverclock() == 2) { return mStartEnergy < 160000000 ? 2 : 1; } - return mStartEnergy < 160000000 ? 4 : mStartEnergy < 320000000 ? 2 : 1; + if (this.tierOverclock() == 4) { + return (mStartEnergy < 160000000 ? 4 : (mStartEnergy < 320000000 ? 2 : 1)); + } + return (mStartEnergy < 160000000) ? 8 : ((mStartEnergy < 320000000) ? 4 : (mStartEnergy < 640000000) ? 2 : 1); } @Override @@ -442,7 +445,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity @Override public String[] getInfoData() { - String tier = tier() == 6 ? EnumChatFormatting.RED+"I"+EnumChatFormatting.RESET : tier() == 7 ? EnumChatFormatting.YELLOW+"II"+EnumChatFormatting.RESET : EnumChatFormatting.GRAY+"III"+EnumChatFormatting.RESET; + String tier = tier() == 6 ? EnumChatFormatting.RED+"I"+EnumChatFormatting.RESET : tier() == 7 ? EnumChatFormatting.YELLOW+"II"+EnumChatFormatting.RESET : tier() == 8 ? EnumChatFormatting.GRAY+"III"+EnumChatFormatting.RESET : "IV"; float plasmaOut = 0; int powerRequired = 0; if (this.mLastRecipe != null) { |