Merge remote-tracking branch 'upstream/experimental' into experimental

45 files changed, 1657 insertions, 1918 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
index 12d839d221..6b1ee8c941 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
@@ -2,7 +2,6 @@ package gregtech.common.tileentities.machines;
 
 import appeng.api.AEApi;
 import appeng.api.networking.GridFlags;
-import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.networking.security.IActionHost;
 import appeng.api.networking.security.MachineSource;
@@ -21,8 +20,11 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_HATCH;
@@ -30,6 +32,10 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_HATCH;
 public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatch_OutputBus {
     private BaseActionSource requestSource = null;
     private AENetworkProxy gridProxy = null;
+    ItemStack cachedStack = null;
+    long lastOutputTick = 0;
+    long tickCounter = 0;
+    boolean lastOutputFailed = false;
 
     public GT_MetaTileEntity_Hatch_OutputBus_ME(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, 1, new String[]{
@@ -37,7 +43,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     }
 
     public GT_MetaTileEntity_Hatch_OutputBus_ME(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, aDescription, 0, aTextures);
+        super(aName, aTier, 0, aDescription, aTextures);
     }
 
     @Override
@@ -65,12 +71,16 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     public boolean storeAll(ItemStack aStack) {
         if (!GregTech_API.mAE2)
             return false;
-        int tTotal = aStack.stackSize;
-        int tStored = store(aStack);
-        aStack.stackSize -= tStored;
-        return tTotal == tStored;
+        aStack.stackSize = store(aStack);
+        return aStack.stackSize == 0;
     }
 
+    /**
+     * Attempt to store items in connected ME network. Returns how many items did not fit (if the network was down e.g.)
+     *
+     * @param stack  input stack
+     * @return amount of items left over
+     */
     @Optional.Method(modid = "appliedenergistics2")
     public int store(final ItemStack stack) {
         if (stack == null)
@@ -78,17 +88,66 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
         try {
             AENetworkProxy proxy = getProxy();
             if (proxy == null)
-                return stack.stackSize;
-            IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory();
-            final IEnergySource src = proxy.getEnergy();
-            IAEItemStack toStore = AEApi.instance().storage().createItemStack(stack);
-            IAEItemStack rest = Platform.poweredInsert( src, sg, toStore, getRequest());
-            if (rest != null)
-                return (int)rest.getStackSize();
+            {
+                lastOutputFailed = true;
+                int cacheSize = cachedStack == null ? 0 : cachedStack.stackSize;
+                cachedStack = null;
+                return stack.stackSize + cacheSize;
+            }
+            if (lastOutputFailed) // if last output failed, don't buffer
+            {
+                IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory();
+                IAEItemStack toStore = AEApi.instance().storage().createItemStack(stack);
+                IAEItemStack rest = Platform.poweredInsert(proxy.getEnergy(), sg, toStore, getRequest());
+                if (rest != null && rest.getStackSize() > 0)
+                    return (int) rest.getStackSize();
+                else
+                    lastOutputFailed = false;
+            }
+            else if (cachedStack != null && ((tickCounter > (lastOutputTick+20)) || !cachedStack.isItemEqual(stack)))
+            {
+                lastOutputTick = tickCounter;
+                boolean sameStack = cachedStack.isItemEqual(stack);
+                if (sameStack)
+                    cachedStack.stackSize += stack.stackSize;
+                IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory();
+                IAEItemStack toStore = AEApi.instance().storage().createItemStack(cachedStack);
+                IAEItemStack rest = Platform.poweredInsert(proxy.getEnergy(), sg, toStore, getRequest());
+                if (rest != null && rest.getStackSize() > 0)
+                {
+                    lastOutputFailed = true;
+                    if (sameStack) // return all that was cached to sender
+                    {
+                        cachedStack = null;
+                        return (int) rest.getStackSize();
+                    }
+                    else // leave the cache, and return input to sender
+                    {
+                        cachedStack.stackSize = (int)rest.getStackSize();
+                        return stack.stackSize;
+                    }
+                }
+                else
+                {
+                    if (!sameStack)
+                        cachedStack = stack.copy();
+                    else
+                        cachedStack = null;
+                    return 0;
+                }
+            }
+            else
+            {
+                if (cachedStack == null)
+                    cachedStack = stack.copy();
+                else
+                    cachedStack.stackSize += stack.stackSize;
+            }
             return 0;
         }
         catch( final GridAccessException ignored )
         {
+            lastOutputFailed = true;
         }
         return stack.stackSize;
     }
@@ -128,4 +187,63 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {
     }
+
+    @Optional.Method(modid = "appliedenergistics2")
+    private void flushCachedStack()
+    {
+        if (cachedStack == null)
+            return;
+        AENetworkProxy proxy = getProxy();
+        if (proxy == null) {
+            lastOutputFailed = true;
+            return;
+        }
+        try {
+            IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory();
+            IAEItemStack toStore = AEApi.instance().storage().createItemStack(cachedStack);
+            IAEItemStack rest = Platform.poweredInsert(proxy.getEnergy(), sg, toStore, getRequest());
+            if (rest != null && rest.getStackSize() > 0) {
+                lastOutputFailed = true;
+                cachedStack.stackSize = (int) rest.getStackSize();
+            }
+            else
+                cachedStack = null;
+        }
+        catch( final GridAccessException ignored )
+        {
+            lastOutputFailed = true;
+        }
+        lastOutputTick = tickCounter;
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        tickCounter = aTick;
+        if (tickCounter > (lastOutputTick + 40))
+            flushCachedStack();
+        super.onPostTick(aBaseMetaTileEntity, aTick);
+    }
+
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT)
+    {
+        super.saveNBTData(aNBT);
+        if (cachedStack != null) {
+            NBTTagCompound tTag = new NBTTagCompound();
+            cachedStack.writeToNBT(tTag);
+            aNBT.setTag("cachedStack", tTag);
+        }
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        NBTBase t = aNBT.getTag("cachedStack");
+        if (t instanceof NBTTagCompound)
+            cachedStack = GT_Utility.loadItem((NBTTagCompound)t);
+    }
+
+    public boolean isLastOutputFailed() {
+        return lastOutputFailed;
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
index b820dd44fd..b79869497a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -19,18 +19,13 @@ import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
+import gregtech.api.util.extensions.ArrayExt;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -172,9 +167,6 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi
         )
             return DID_NOT_FIND_RECIPE;
 
-        if (checkTier(is))
-            return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
-
         Integer handleHardOverride = handleHardOverride(is);
         if (handleHardOverride != null)
             return handleHardOverride;
@@ -234,24 +226,38 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi
             if (GT_Utility.isStackInvalid(recipe.inputs[i]) || recipe.inputs[i].stackSize < 1)
                 recipe.inputs[i] = null;
 
-        recipe.inputs = GT_Utility.getArrayListWithoutNulls(recipe.inputs).toArray(new ItemStack[0]);
+        recipe.inputs = ArrayExt.withoutNulls(recipe.inputs, ItemStack[]::new);
     }
 
     private int checkRecipeMap() {
         GT_Recipe gt_recipe = GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.findRecipe(this.getBaseMetaTileEntity(), true, this.maxEUInput(), null, this.getAllInputs());
         if (gt_recipe == null)
             return DID_NOT_FIND_RECIPE;
-        if (gt_recipe.isRecipeInputEqual(false, null, this.getAllInputs()))
-            return setOutputsAndTime(gt_recipe.mOutputs, gt_recipe.mInputs[0].stackSize)
-                    ? FOUND_AND_SUCCESSFULLY_USED_RECIPE
-                    : FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+        if (gt_recipe.isRecipeInputEqual(false, null, this.getAllInputs())) {
+            if (gt_recipe.mSpecialValue == -100) {
+                // Bypass standard disassembler restrictions.
+                this.getInputAt(0).stackSize -= gt_recipe.mInputs[0].stackSize;
+                System.arraycopy(gt_recipe.mOutputs, 0, this.mOutputItems, 0, gt_recipe.mOutputs.length);
+
+                this.calculateOverclockedNess(gt_recipe);
+                return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
+            } else {
+                return setOutputsAndTime(gt_recipe.mOutputs, gt_recipe.mInputs[0].stackSize)
+                        ? FOUND_AND_SUCCESSFULLY_USED_RECIPE
+                        : FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+            }
+        }
 
         return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
     }
 
     private boolean setOutputsAndTime(ItemStack[] inputs, int stackSize){
-        if (this.getInputAt(0).stackSize >= stackSize)
-            this.getInputAt(0).stackSize -= stackSize;
+        ItemStack machineInput = this.getInputAt(0);
+        if (checkTier(machineInput))
+            return false;
+
+        if (machineInput.stackSize >= stackSize)
+            machineInput.stackSize -= stackSize;
         else
             return false;
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
index 01f136747c..803bc7e163 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
@@ -87,9 +87,9 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
     public String[] getInfoData() {
         return new String[]{
                 "Coordinates:",
-                "X: "+EnumChatFormatting.GREEN+ this.mTargetX+EnumChatFormatting.RESET,
-                "Y: "+EnumChatFormatting.GREEN+ this.mTargetY+EnumChatFormatting.RESET,
-                "Z: "+EnumChatFormatting.GREEN+ this.mTargetZ+EnumChatFormatting.RESET,
+                "X: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetX) + EnumChatFormatting.RESET,
+                "Y: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetY) + EnumChatFormatting.RESET,
+                "Z: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetZ) + EnumChatFormatting.RESET,
                 "Dimension: " + EnumChatFormatting.GREEN+this.mTargetD+EnumChatFormatting.RESET,
                 "Dimension Valid: " + (GT_Utility.isRealDimension(this.mTargetD) ? EnumChatFormatting.GREEN+"Yes"+EnumChatFormatting.RESET : EnumChatFormatting.RED+"No"+EnumChatFormatting.RESET),
                 "Dimension Registered: " + (DimensionManager.isDimensionRegistered(this.mTargetD) ? EnumChatFormatting.GREEN+"Yes"+EnumChatFormatting.RESET : EnumChatFormatting.RED+"No"+EnumChatFormatting.RESET)
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index e1dfc32aba..431241eb84 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -366,7 +366,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
     }
 
     private boolean hasValidFluid() {
-        return (!GT_Utility.isBlockInvalid(this.mPrimaryPumpedBlock) && !GT_Utility.isBlockInvalid(this.mSecondaryPumpedBlock));
+        return mPrimaryPumpedBlock != null && mSecondaryPumpedBlock != null;
     }
 
     private boolean moveOneDown() {
@@ -522,7 +522,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
             return;
 
         Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ);
-        if (GT_Utility.isBlockValid(aBlock)) {
+        if (aBlock != null) {
             if ((aBlock == Blocks.water) || (aBlock == Blocks.flowing_water)) {
                 this.mPrimaryPumpedBlock = Blocks.water;
                 this.mSecondaryPumpedBlock = Blocks.flowing_water;
@@ -549,7 +549,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
 
         Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ);
 
-        return GT_Utility.isBlockValid(aBlock) &&
+        return aBlock != null &&
                 (aBlock == Blocks.water ||
                         aBlock == Blocks.flowing_water ||
                         aBlock == Blocks.lava ||
@@ -565,7 +565,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
 
         Block aBlock = getBaseMetaTileEntity().getBlock(aX, aY, aZ);
 
-        if ((GT_Utility.isBlockValid(aBlock)) && ((this.mPrimaryPumpedBlock == aBlock) || (this.mSecondaryPumpedBlock == aBlock))) {
+        if (aBlock != null && ((this.mPrimaryPumpedBlock == aBlock) || (this.mSecondaryPumpedBlock == aBlock))) {
             boolean isWaterOrLava = ((this.mPrimaryPumpedBlock == Blocks.water || this.mPrimaryPumpedBlock == Blocks.lava));
 
             if (isWaterOrLava && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) != 0) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 11430c6862..eba61ad1b1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -86,7 +86,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                     if (tIndividual != null) {
                         if (tIndividual.analyze()) {
                             getFillableStack().amount -= 100;
-                            this.mOutputItems[0] = GT_Utility.copy(aStack);
+                            this.mOutputItems[0] = GT_Utility.copyOrNull(aStack);
                             aStack.stackSize = 0;
                             NBTTagCompound tNBT = new NBTTagCompound();
                             tIndividual.writeToNBT(tNBT);
@@ -97,7 +97,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                                 return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
                             return 2;
                         }
-                        this.mOutputItems[0] = GT_Utility.copy(aStack);
+                        this.mOutputItems[0] = GT_Utility.copyOrNull(aStack);
                         aStack.stackSize = 0;
                         this.mMaxProgresstime = 1;
                         this.mEUt = 1;
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index 7d6c0a29ed..eb59f1f7e5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -188,9 +188,9 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
     public String[] getInfoData() {
         return new String[]{
                 "Coordinates:",
-                "X: "+ EnumChatFormatting.GREEN+ this.mTargetX+EnumChatFormatting.RESET,
-                "Y: "+EnumChatFormatting.GREEN+ this.mTargetY+EnumChatFormatting.RESET,
-                "Z: "+EnumChatFormatting.GREEN+ this.mTargetZ+EnumChatFormatting.RESET,
+                "X: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetX) + EnumChatFormatting.RESET,
+                "Y: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetY) + EnumChatFormatting.RESET,
+                "Z: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.mTargetZ) + EnumChatFormatting.RESET,
                 "Dimension: " + EnumChatFormatting.GREEN+this.mTargetD+EnumChatFormatting.RESET,
                 "Dimension Valid: " + (GT_Utility.isRealDimension(this.mTargetD) ? EnumChatFormatting.GREEN+"Yes"+EnumChatFormatting.RESET : EnumChatFormatting.RED+"No"+EnumChatFormatting.RESET),
                 "Dimension Registered: " + (DimensionManager.isDimensionRegistered(this.mTargetD) ? EnumChatFormatting.GREEN+"Yes"+EnumChatFormatting.RESET : EnumChatFormatting.RED+"No"+EnumChatFormatting.RESET)
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AbstractMultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AbstractMultiFurnace.java
index 1ac4df6d73..2409c1660c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AbstractMultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AbstractMultiFurnace.java
@@ -1,16 +1,13 @@
 package gregtech.common.tileentities.machines.multi;
 
-import gregtech.api.GregTech_API;
 import gregtech.a