Use TinySlot instead of IInventory everywhere

Author: SquidDev

src/main/java/org/squiddev/plethora/gameplay/keyboard/ItemKeyboard.java

@@ -153,7 +153,7 @@ private boolean onItemUse(ItemStack stack, World world, EntityPlayer player) {
 			TinySlot slot = NeuralHelpers.getSlot(player);
 			if (slot == null) return false;
 
-			computer = ItemComputerHandler.getServer(slot.getStack(), player, slot.getInventory());
+			computer = ItemComputerHandler.getServer(slot.getStack(), player, slot);
 		}
 
 		if (computer == null) return false;

src/main/java/org/squiddev/plethora/gameplay/neural/ItemComputerHandler.java

@@ -9,6 +9,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import org.squiddev.plethora.utils.DebugLogger;
+import org.squiddev.plethora.utils.TinySlot;
 
 import static org.squiddev.plethora.gameplay.ItemBase.getTag;
 
@@ -26,7 +27,7 @@ public final class ItemComputerHandler {
 	public static final String DIRTY = "dirty";
 	public static final String MODULE_DATA = "module_data";
 
-	public static NeuralComputer getServer(ItemStack stack, EntityLivingBase owner, IInventory inventory) {
+	public static NeuralComputer getServer(ItemStack stack, EntityLivingBase owner, TinySlot inventory) {
 		NBTTagCompound tag = getTag(stack);
 
 		final ServerComputerRegistry manager = ComputerCraft.serverComputerRegistry;

src/main/java/org/squiddev/plethora/gameplay/neural/ItemNeuralConnector.java

@@ -31,7 +31,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla
 		if (!world.isRemote) {
 			TinySlot neuralStack = NeuralHelpers.getSlot(player);
 			if (neuralStack != null) {
-				ServerComputer computer = ItemComputerHandler.getServer(neuralStack.getStack(), player, neuralStack.getInventory());
+				ServerComputer computer = ItemComputerHandler.getServer(neuralStack.getStack(), player, neuralStack);
 				if (computer != null) {
 					computer.turnOn();
 					GuiHandler.openNeuralPlayer(player, world);

src/main/java/org/squiddev/plethora/gameplay/neural/ItemNeuralInterface.java

@@ -91,7 +91,7 @@ public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, En
 		}
 	}
 
-	private void onUpdate(ItemStack stack, IInventory inventory, EntityLivingBase player, boolean forceActive) {
+	private void onUpdate(ItemStack stack, TinySlot inventory, EntityLivingBase player, boolean forceActive) {
 		if (player.worldObj.isRemote) {
 			if (forceActive && player instanceof EntityPlayer) ItemComputerHandler.getClient(stack);
 		} else {
@@ -231,7 +231,7 @@ public BaubleType getBaubleType(ItemStack stack) {
 	@Optional.Method(modid = Baubles.MODID)
 	public void onWornTick(ItemStack stack, EntityLivingBase player) {
 		if (!(player instanceof EntityPlayer)) return;
-		onUpdate(stack, BaublesApi.getBaubles((EntityPlayer) player), player, true);
+		onUpdate(stack, new TinySlot.InventorySlot(stack, BaublesApi.getBaubles((EntityPlayer) player)), player, true);
 	}
 
 	@Override
@@ -309,15 +309,20 @@ public void addInformation(ItemStack stack, EntityPlayer player, List<String> ou
 	@Override
 	public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
 		super.onArmorTick(world, player, stack);
-		onUpdate(stack, player.inventory, player, true);
+		onUpdate(stack, new TinySlot.InventorySlot(stack, player.inventory), player, true);
 	}
 
 	@Override
 	public void onUpdate(ItemStack stack, World world, Entity entity, int um1, boolean um2) {
 		super.onUpdate(stack, world, entity, um1, um2);
 		if (entity instanceof EntityLivingBase) {
-			IInventory inventory = entity instanceof EntityPlayer ? ((EntityPlayer) entity).inventory : null;
-			onUpdate(stack, inventory, (EntityLivingBase) entity, false);
+			TinySlot slot;
+			if (entity instanceof EntityPlayer) {
+				slot = new TinySlot.InventorySlot(stack, ((EntityPlayer) entity).inventory);
+			} else {
+				slot = new TinySlot(stack);
+			}
+			onUpdate(stack, slot, (EntityLivingBase) entity, false);
 		}
 	}
 
@@ -345,7 +350,7 @@ public void onEntityLivingUpdate(LivingEvent.LivingUpdateEvent event) {
 
 		TinySlot slot = NeuralHelpers.getSlot(event.entityLiving);
 		if (slot != null) {
-			onUpdate(slot.getStack(), slot.getInventory(), event.entityLiving, true);
+			onUpdate(slot.getStack(), slot, event.entityLiving, true);
 		}
 	}
 

src/main/java/org/squiddev/plethora/gameplay/neural/NeuralHelpers.java

@@ -61,14 +61,18 @@ public static TinySlot getSlot(EntityLivingBase entity) {
 		ItemStack stack = entity.getEquipmentInSlot(ARMOR_SLOT);
 
 		if (stack != null && stack.getItem() == Registry.itemNeuralInterface) {
-			return new TinySlot(stack, entity instanceof EntityPlayer ? ((EntityPlayer) entity).inventory : null);
+			if (entity instanceof EntityPlayer) {
+				return new TinySlot.InventorySlot(stack, ((EntityPlayer) entity).inventory);
+			} else {
+				return new TinySlot(stack);
+			}
 		}
 
 		if (Loader.isModLoaded(Baubles.MODID) && entity instanceof EntityPlayer) {
 			IInventory inventory = BaublesApi.getBaubles((EntityPlayer) entity);
 			stack = inventory.getStackInSlot(BAUBLES_SLOT);
 			if (stack != null && stack.getItem() == Registry.itemNeuralInterface) {
-				return new TinySlot(stack, inventory);
+				return new TinySlot.InventorySlot(stack, inventory);
 			}
 		}
 

src/main/java/org/squiddev/plethora/utils/TinySlot.java

@@ -5,34 +5,34 @@
 import net.minecraft.item.ItemStack;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
-public final class TinySlot {
-	private final IInventory inventory;
+public class TinySlot {
 	private final ItemStack stack;
 
-	public TinySlot(ItemStack stack, IInventory inventory) {
+	public TinySlot(@Nonnull ItemStack stack) {
 		Preconditions.checkNotNull(stack, "stack cannot be null");
-
-		this.inventory = inventory;
 		this.stack = stack;
 	}
 
-	public TinySlot(ItemStack stack) {
-		this(stack, null);
-	}
-
 	@Nonnull
 	public ItemStack getStack() {
 		return stack;
 	}
 
 	public void markDirty() {
-		if (inventory != null) inventory.markDirty();
 	}
 
-	@Nullable
-	public IInventory getInventory() {
-		return inventory;
+	public static class InventorySlot extends TinySlot {
+		private final IInventory inventory;
+
+		public InventorySlot(@Nonnull ItemStack stack, @Nonnull IInventory inventory) {
+			super(stack);
+			this.inventory = inventory;
+		}
+
+		@Override
+		public void markDirty() {
+			inventory.markDirty();
+		}
 	}
 }