diff options
| author | Dream-Master <dream-master@gmx.net> | 2015-12-10 01:12:42 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2015-12-10 01:12:42 +0100 |
| commit | 55ed43f4ce02da937bc6104bbcea08c8d0377796 (patch) | |
| tree | 1b939ae3538d675c8d89a0a2bfcd40961ee6f0de /src/main/java/gregtech/common/tileentities | |
| parent | 2cab6b81666d27f4212b5dfbb2919969cfe52e31 (diff) | |
| download | GT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.tar.gz GT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.tar.bz2 GT5-Unofficial-55ed43f4ce02da937bc6104bbcea08c8d0377796.zip | |
Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
2 files changed, 4 insertions, 3 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 c49fe6fe05..10d045d515 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 @@ -244,7 +244,7 @@ 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; + return mStartEnergy < 160000000 ? 4 : mStartEnergy < 320000000 ? 2 : 1; } @Override diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index a05ca2baf4..a920f55096 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -136,6 +136,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach } if (this.mItemStack != null) { this.mInventory[2] = this.mItemStack.copy(); + this.mInventory[2].stackSize = Math.min(mItemStack.getMaxStackSize(), this.mItemCount); } else { this.mInventory[2] = null; } @@ -164,12 +165,12 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return true; + return aIndex==1; } @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return true; + return aIndex==0&&(mInventory[0]==null||GT_Utility.areStacksEqual(this.mInventory[0], aStack)); } @Override |