diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-03-23 12:16:21 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2017-03-23 13:59:16 +0100 |
| commit | 7c67f95c9301117e60bd75f053b22e7bb8a4fad3 (patch) | |
| tree | 3b70870f052b8bf005fa0c66126462fae54f294f /src/main | |
| parent | 9c91a6cea22db5e6e5403fa60b58caf59820cb3b (diff) | |
| download | GT5-Unofficial-7c67f95c9301117e60bd75f053b22e7bb8a4fad3.tar.gz GT5-Unofficial-7c67f95c9301117e60bd75f053b22e7bb8a4fad3.tar.bz2 GT5-Unofficial-7c67f95c9301117e60bd75f053b22e7bb8a4fad3.zip | |
Small fusion reactor fixes
Diffstat (limited to 'src/main')
5 files changed, 11 insertions, 4 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 ec1a53c0ec..bfdaa2e962 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java @@ -34,6 +34,13 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255); } } + if(this.mContainer.mEnergy > 160000000 && this.mContainer.mEnergy < 160010000) + fontRendererObj.drawString("160,000,000 EU", 50, 155, 0x00ff0000); + else if(this.mContainer.mEnergy > 320000000 && this.mContainer.mEnergy < 320010000) + 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 fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", 50, 155, 0x00ff0000); } } 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 d5f53fee12..b34b2dc85b 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 @@ -252,7 +252,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity if (tFluidList.size() > 1) { FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]); GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[8], tFluids, new ItemStack[]{}); - if (tRecipe == null && !mRunningOnLoad) { + if ((tRecipe == null && !mRunningOnLoad) || (maxEUStore() < tRecipe.mSpecialValue)) { turnCasingActive(false); this.mLastRecipe = null; return false; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 39d38e9bd3..0f9fe133b3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC @Override public long maxEUStore() { - return 160000000L * (Math.min(16, this.mEnergyHatches.size())) / 16L; + return 160003000L * (Math.min(16, this.mEnergyHatches.size())) / 16L; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index 1fd1ca7576..ea44772d77 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC @Override public long maxEUStore() { - return 320000000L * (Math.min(16, this.mEnergyHatches.size())) / 16L; + return 320006000L * (Math.min(16, this.mEnergyHatches.size())) / 16L; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index 9d1a9a9579..870ac54846 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC @Override public long maxEUStore() { - return 640000000L * (Math.min(16, this.mEnergyHatches.size())) / 16L; + return 640010000L * (Math.min(16, this.mEnergyHatches.size())) / 16L; } @Override |