Fix crash when removing inventory from Inventory Panel network (#243)

dependencies.gradle

@@ -4,13 +4,14 @@ dependencies {
     api('com.github.GTNewHorizons:EnderCore:0.5.14:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.30:dev')
     compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.110-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.11.22:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.11.30:dev")
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.61:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
     api("com.github.GTNewHorizons:TinkersConstruct:1.14.93-GTNH:dev")
 
     devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.30:dev') {transitive = false}
+    compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false}
     runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
     compileOnly("com.github.GTNewHorizons:Backhand:1.8.11:dev") { transitive = false }
     compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-997-GTNH:api') {transitive = false}

src/main/java/crazypants/enderio/EnderIO.java

@@ -214,6 +214,7 @@ public class EnderIO {
     public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify");
     public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi");
     public static final boolean hasHP = Loader.isModLoaded("hodgepodge");
+    public static final boolean hasEtFuturum = Loader.isModLoaded("etfuturum");
     public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins");
     public static final boolean hasAutomagy = Loader.isModLoaded("Automagy");
 

src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java

@@ -6,6 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
@@ -425,7 +427,7 @@ public class NetworkedInventory {
         return inv;
     }
 
-    public ISidedInventory getInventoryRecheck() {
+    public @Nullable ISidedInventory getInventoryRecheck() {
         if (isInvalid()) {
             updateInventory();
         }

src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java

@@ -0,0 +1,22 @@
+package crazypants.enderio.etfuturum;
+
+import net.minecraft.entity.player.EntityPlayer;
+
+import crazypants.enderio.EnderIO;
+import ganymedes01.etfuturum.elytra.IElytraPlayer;
+
+public final class EtFuturumCompat {
+
+    private EtFuturumCompat() {}
+
+    public static boolean isElytraFlying(EntityPlayer player) {
+        return EnderIO.hasEtFuturum && player instanceof IElytraPlayer
+                && ((IElytraPlayer) player).etfu$isElytraFlying();
+    }
+
+    public static void stopElytraFlying(EntityPlayer player) {
+        if (EnderIO.hasEtFuturum && player instanceof IElytraPlayer) {
+            ((IElytraPlayer) player).etfu$setElytraFlying(false);
+        }
+    }
+}

src/main/java/crazypants/enderio/item/KeyTracker.java

@@ -328,8 +328,10 @@ public class KeyTracker {
     }
 
     private void handleGlide() {
-        if (glideKey.isPressed()
-                && DarkSteelController.instance.isGliderUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) {
+        EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+        if (glideKey.isPressed() && DarkSteelController.instance.isGliderUpgradeEquipped(player)
+                && (DarkSteelController.instance.isGlideActive(player)
+                        || DarkSteelController.instance.canActivateGlide(player))) {
             toggleDarkSteelController(Type.GLIDE, "darksteel.upgrade.glider");
         }
     }

src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java

@@ -41,6 +41,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
+import crazypants.enderio.etfuturum.EtFuturumCompat;
 import crazypants.enderio.item.darksteel.PacketUpgradeState.Type;
 import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
 import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade;
@@ -146,6 +147,8 @@ public class DarkSteelController {
     }
 
     public void setActive(EntityPlayer player, Type type, boolean isActive) {
+        if (type == Type.GLIDE && isActive && !canActivateGlide(player)) return;
+
         EnumSet<Type> set = getActiveSet(player);
         if (isActive) {
             set.add(type);
@@ -158,6 +161,10 @@ public class DarkSteelController {
         return isActive(player, Type.GLIDE);
     }
 
+    public boolean canActivateGlide(EntityPlayer player) {
+        return !EtFuturumCompat.isElytraFlying(player);
+    }
+
     public boolean isSpeedActive(EntityPlayer player) {
         return isActive(player, Type.SPEED);
     }
@@ -246,8 +253,10 @@ public class DarkSteelController {
     }
 
     private void updateGlide(EntityPlayer player) {
-        if (!isGlideActive(player) || !isGliderUpgradeEquipped(player)) {
-            return;
+        if (!isGlideActive(player) || !isGliderUpgradeEquipped(player)) return;
+
+        if (EtFuturumCompat.isElytraFlying(player)) {
+            EtFuturumCompat.stopElytraFlying(player);
         }
 
         if (!player.onGround && player.motionY < 0 && !player.isSneaking() && !player.isInWater()) {

src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java

@@ -16,50 +16,53 @@ class NormalInventory extends AbstractInventory {
     @Override
     int scanInventory(InventoryDatabaseServer db) {
         ISidedInventory inv = ni.getInventoryRecheck();
-        int side = ni.getInventorySide();
-        int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
-        if (slotIndices == null || slotIndices.length == 0) {
-            setEmpty(db);
-            return 0;
-        }
-        int count = slotIndices.length;
-        if (count != slotKeys.length) {
-            reset(db, count);
-        }
-        for (int slot = 0; slot < count; slot++) {
-            int invSlot = slotIndices[slot];
-            ItemStack stack = inv.getStackInSlot(invSlot);
-            if (stack != null && !inv.canExtractItem(invSlot, stack, side)) {
-                stack = null;
+        if (inv != null) {
+            int side = ni.getInventorySide();
+            int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
+            if (slotIndices != null && slotIndices.length > 0) {
+                int count = slotIndices.length;
+                if (count != slotKeys.length) {
+                    reset(db, count);
+                }
+                for (int slot = 0; slot < count; slot++) {
+                    int invSlot = slotIndices[slot];
+                    ItemStack stack = inv.getStackInSlot(invSlot);
+                    if (stack != null && !inv.canExtractItem(invSlot, stack, side)) {
+                        stack = null;
+                    }
+                    updateSlot(db, slot, stack);
+                }
+                return count;
             }
-            updateSlot(db, slot, stack);
         }
-        return count;
+
+        setEmpty(db);
+        return 0;
     }
 
     @Override
     public int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) {
         ISidedInventory inv = ni.getInventoryRecheck();
-        int side = ni.getInventorySide();
-        int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
-        if (slotIndices == null || slot >= slotIndices.length) {
-            return 0;
+        if (inv != null) {
+            int side = ni.getInventorySide();
+            int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
+            if (slotIndices != null && slot < slotIndices.length) {
+                int invSlot = slotIndices[slot];
+                ItemStack stack = inv.getStackInSlot(invSlot);
+                if (stack != null && inv.canExtractItem(invSlot, stack, side)
+                        && db.lookupItem(stack, entry, false) == entry) {
+                    int remaining = stack.stackSize;
+                    if (count > remaining) {
+                        count = remaining;
+                    }
+                    ni.itemExtracted(invSlot, count);
+                    remaining -= count;
+                    updateCount(db, slot, entry, remaining);
+                    return count;
+                }
+            }
         }
-        int invSlot = slotIndices[slot];
-        ItemStack stack = inv.getStackInSlot(invSlot);
-        if (stack == null || !inv.canExtractItem(invSlot, stack, side)) {
-            return 0;
-        }
-        if (db.lookupItem(stack, entry, false) != entry) {
-            return 0;
-        }
-        int remaining = stack.stackSize;
-        if (count > remaining) {
-            count = remaining;
-        }
-        ni.itemExtracted(invSlot, count);
-        remaining -= count;
-        updateCount(db, slot, entry, remaining);
-        return count;
+
+        return 0;
     }
 }

src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java

@@ -22,6 +22,7 @@ import crazypants.enderio.machine.alloy.GuiAlloySmelter;
 import crazypants.enderio.machine.recipe.IRecipe;
 import crazypants.enderio.machine.recipe.RecipeInput;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
 
@@ -114,7 +115,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
         drawProgressBar(99, 31, 166, 0, 22, 13, 48, 3);
         AlloySmelterRecipe recipe = (AlloySmelterRecipe) arecipes.get(recipeIndex);
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawString(energyString, 100, 52, 0x808080, false);
+        GuiDraw.drawString(energyString, 100, 52, ColorUtils.neiEnergyString.getColor(), false);
     }
 
     public List<ItemStack> getInputs(RecipeInput input) {

src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java

@@ -24,6 +24,7 @@ import crazypants.enderio.machine.enchanter.EnchanterRecipeManager;
 import crazypants.enderio.machine.enchanter.GuiEnchanter;
 import crazypants.enderio.machine.enchanter.TileEnchanter;
 import crazypants.enderio.machine.recipe.RecipeInput;
+import crazypants.util.ColorUtils;
 
 public class EnchanterRecipeHandler extends TemplateRecipeHandler {
 
@@ -113,7 +114,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler {
     public void drawExtras(int recipeIndex) {
         EnchanterRecipeNEI recipe = (EnchanterRecipeNEI) arecipes.get(recipeIndex);
 
-        GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, 0x808080, false);
+        GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, ColorUtils.neiEnchantString.getColor(), false);
 
         int level = 1;
         List<PositionedStack> ingredients = recipe.getIngredients();

src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java

@@ -25,6 +25,7 @@ import crazypants.enderio.machine.recipe.Recipe;
 import crazypants.enderio.machine.recipe.RecipeInput;
 import crazypants.enderio.machine.recipe.RecipeOutput;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class SagMillRecipeHandler extends TemplateRecipeHandler {
 
@@ -123,7 +124,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler {
 
         MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex);
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawString(energyString, 96, 33, 0x808080, false);
+        GuiDraw.drawString(energyString, 96, 33, ColorUtils.neiEnergyString.getColor(), false);
     }
 
     @Override

src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java

@@ -22,6 +22,7 @@ import crazypants.enderio.machine.slicensplice.ContainerSliceAndSplice;
 import crazypants.enderio.machine.slicensplice.GuiSliceAndSplice;
 import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler {
 
@@ -109,7 +110,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler {
 
         SliceAndSpliceRecipe recipe = (SliceAndSpliceRecipe) arecipes.get(recipeIndex);
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawString(energyString, 100, 57, 0x808080, false);
+        GuiDraw.drawString(energyString, 100, 57, ColorUtils.neiEnergyString.getColor(), false);
     }
 
     public List<ItemStack> getInputs(RecipeInput input) {

src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java

@@ -24,6 +24,7 @@ import crazypants.enderio.machine.MachineRecipeRegistry;
 import crazypants.enderio.machine.soul.GuiSoulBinder;
 import crazypants.enderio.machine.soul.ISoulBinderRecipe;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class SoulBinderRecipeHandler extends TemplateRecipeHandler {
 
@@ -132,7 +133,7 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler {
         SoulBinderRecipeNEI recipe = (SoulBinderRecipeNEI) arecipes.get(recipeIndex);
 
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawStringC(energyString, 83, 45, 0x808080, false);
+        GuiDraw.drawStringC(energyString, 83, 45, ColorUtils.neiEnergyString.getColor(), false);
 
         int cost = recipe.getExperience();
         if (cost > 0) {

src/main/java/crazypants/enderio/nei/VatRecipeHandler.java

@@ -34,6 +34,7 @@ import crazypants.enderio.machine.recipe.RecipeInput;
 import crazypants.enderio.machine.vat.GuiVat;
 import crazypants.enderio.machine.vat.VatRecipeManager;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class VatRecipeHandler extends TemplateRecipeHandler {
 
@@ -183,7 +184,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
         }
 
         String energyString = PowerDisplayUtil.formatPower(rec.energy) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawStringC(energyString, 86, 54, 0x808080, false);
+        GuiDraw.drawStringC(energyString, 86, 54, ColorUtils.neiEnergyString.getColor(), false);
 
         Fluid outputFluid = rec.result.getFluid();
         List<PositionedStack> stacks = rec.getIngredients();
@@ -191,7 +192,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
             float mult = VatRecipeManager.getInstance()
                     .getMultiplierForInput(rec.inFluid.getFluid(), ps.item, outputFluid);
             String str = "x" + mult;
-            GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, 0x808080, false);
+            GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, ColorUtils.neiMultiplierString.getColor(), false);
         }
 
     }

src/main/java/crazypants/util/ColorUtils.java

@@ -8,7 +8,10 @@ public class ColorUtils {
 
     public static final ColorResource
     // spotless:off
-        priorityString  = color.rgb("priorityString",   "0x000000"),
-        suctionString   = color.rgb("suctionString",    "0x000000");
+        priorityString      = color.rgb("priorityString",       "0x000000"),
+        suctionString       = color.rgb("suctionString",        "0x000000"),
+        neiMultiplierString = color.rgb("neiMultiplierString",  "0x808080"),
+        neiEnchantString    = color.rgb("neiEnchantString",     "0x808080"),
+        neiEnergyString     = color.rgb("neiEnergyString",      "0x808080");
     // spotless:on
 }