diff options
| author | Blood-Asp <Blood@Asp> | 2015-04-30 19:34:16 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-04-30 19:34:16 +0200 |
| commit | eba3a051ca6f7f65e085c69e382656780ebf1fdb (patch) | |
| tree | d9c7c73ea5a8201c48abbe56fe1fd2a7533c4ae8 /main/java/gregtech/api | |
| parent | 7c0de38a9fe24ef60ab328e074432881ce4fbda4 (diff) | |
| download | GT5-Unofficial-eba3a051ca6f7f65e085c69e382656780ebf1fdb.tar.gz GT5-Unofficial-eba3a051ca6f7f65e085c69e382656780ebf1fdb.tar.bz2 GT5-Unofficial-eba3a051ca6f7f65e085c69e382656780ebf1fdb.zip | |
QChest + Wireless RS
Diffstat (limited to 'main/java/gregtech/api')
3 files changed, 4 insertions, 4 deletions
diff --git a/main/java/gregtech/api/enums/ItemList.java b/main/java/gregtech/api/enums/ItemList.java index 90ece775cb..f93f543b1c 100644 --- a/main/java/gregtech/api/enums/ItemList.java +++ b/main/java/gregtech/api/enums/ItemList.java @@ -643,8 +643,9 @@ public enum ItemList implements IItemContainer { Processing_Array, Distillation_Tower, Energy_LapotronicOrb2, - ZPM2, - NULL; + ZPM2, Quantum_Tank_LV,Quantum_Tank_MV,Quantum_Tank_HV,Quantum_Tank_EV,Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, + + NULL, Cover_RedstoneTransmitterExternal,Cover_RedstoneTransmitterInternal,Cover_RedstoneReceiverExternal,Cover_RedstoneReceiverInternal; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15} diff --git a/main/java/gregtech/api/gui/GT_Container_BasicTank.java b/main/java/gregtech/api/gui/GT_Container_BasicTank.java index 3884ddea66..7fe15f7474 100644 --- a/main/java/gregtech/api/gui/GT_Container_BasicTank.java +++ b/main/java/gregtech/api/gui/GT_Container_BasicTank.java @@ -2,6 +2,7 @@ package gregtech.api.gui; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; +import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest; import java.util.Iterator; @@ -39,7 +40,6 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine { mContent = ((GT_MetaTileEntity_BasicTank)mTileEntity.getMetaTileEntity()).mFluid.amount; else mContent = 0; - Iterator var2 = this.crafters.iterator(); while (var2.hasNext()) { ICrafting var1 = (ICrafting)var2.next(); diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 95d8cc19b2..4411c528df 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -184,7 +184,6 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); if (mOutputFluids != null&&mOutputFluids.length==1) {for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack);} else if(mOutputFluids!=null&&mOutputFluids.length>1){ - System.out.println("addfluids"); addFluidOutputs(mOutputFluids);} mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000))); mOutputItems = null; |