Copy itemstacks into TransitRequest, to avoid external modification. Part of #4912

This commit is contained in:
Thiakil committed 2018-04-27 17:21:54 +08:00
1 parent db15de4271
commit bbce7030eb
1 file changed
+157 -157
@@ -1,157 +1,157 @@
package mekanism.common.content.transporter;
import java.util.HashMap;
import java.util.Map;
import mekanism.common.content.transporter.Finder.FirstFinder;
import mekanism.common.util.InventoryUtils;
import mekanism.common.util.StackUtils;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler;
public class TransitRequest
{
public Map<ItemStack, Integer> itemMap = new HashMap<>();
public boolean isEmpty()
{
return itemMap.isEmpty();
}
public void setItem(ItemStack stack, int slot)
{
itemMap.put(stack, slot);
}
public ItemStack getSingleStack()
{
return itemMap.keySet().iterator().next();
}
public boolean hasType(ItemStack stack)
{
for(ItemStack s : itemMap.keySet())
{
if(InventoryUtils.areItemsStackable(stack, s))
{
return true;
}
}
return false;
}
public static TransitRequest getFromTransport(TransporterStack stack)
{
return getFromStack(stack.itemStack);
}
public static TransitRequest getFromStack(ItemStack stack)
{
TransitRequest ret = new TransitRequest();
ret.setItem(stack, -1);
return ret;
}
public static TransitRequest getTopStacks(TileEntity tile, EnumFacing side, int amount)
{
return getTopStacks(tile, side, amount, new FirstFinder());
}
public static TransitRequest getTopStacks(TileEntity tile, EnumFacing side, int amount, Finder finder)
{
TransitRequest ret = new TransitRequest();
if(tile instanceof ISidedInventory)
{
ISidedInventory sidedInventory = (ISidedInventory)tile;
int[] slots = sidedInventory.getSlotsForFace(side.getOpposite());
if(slots != null)
{
for(int get = slots.length - 1; get >= 0; get--)
{
int slotID = slots[get];
if(!sidedInventory.getStackInSlot(slotID).isEmpty() && sidedInventory.getStackInSlot(slotID).getCount() > 0)
{
ItemStack toSend = sidedInventory.getStackInSlot(slotID).copy();
toSend.setCount(Math.min(amount, toSend.getCount()));
if(!ret.hasType(toSend) && sidedInventory.canExtractItem(slotID, toSend, side.getOpposite()) && finder.modifies(toSend))
{
ret.setItem(toSend, slotID);
}
}
}
}
}
else if(tile instanceof IInventory)
{
IInventory inventory = InventoryUtils.checkChestInv((IInventory)tile);
for(int i = inventory.getSizeInventory() - 1; i >= 0; i--)
{
if(!inventory.getStackInSlot(i).isEmpty() && inventory.getStackInSlot(i).getCount() > 0)
{
ItemStack toSend = inventory.getStackInSlot(i).copy();
toSend.setCount(Math.min(amount, toSend.getCount()));
if(!ret.hasType(toSend) && finder.modifies(toSend))
{
ret.setItem(toSend, i);
}
}
}
}
else if(InventoryUtils.isItemHandler(tile, side.getOpposite()))
{
IItemHandler inventory = InventoryUtils.getItemHandler(tile, side.getOpposite());
for(int i = inventory.getSlots() - 1; i >= 0; i--)
{
ItemStack stack = inventory.extractItem(i, amount, true);
if(!stack.isEmpty() && !ret.hasType(stack) && finder.modifies(stack))
{
ret.setItem(stack, i);
}
}
}
return ret;
}
public static class TransitResponse
{
public static final TransitResponse EMPTY = new TransitResponse(-1, ItemStack.EMPTY);
public int slotID;
public ItemStack stack = ItemStack.EMPTY;
public TransitResponse(int s, ItemStack i)
{
slotID = s;
stack = i;
}
public boolean isEmpty()
{
return stack.isEmpty();
}
public ItemStack getRejected(ItemStack orig)
{
return StackUtils.size(orig, orig.getCount() - stack.getCount());
}
public InvStack getInvStack(TileEntity tile, EnumFacing side)
{
return new InvStack(tile, slotID, stack, side);
}
}
}
package mekanism.common.content.transporter;
import java.util.HashMap;
import java.util.Map;
import mekanism.common.content.transporter.Finder.FirstFinder;
import mekanism.common.util.InventoryUtils;
import mekanism.common.util.StackUtils;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler;
public class TransitRequest
{
public Map<ItemStack, Integer> itemMap = new HashMap<>();
public boolean isEmpty()
{
return itemMap.isEmpty();
}
public void setItem(ItemStack stack, int slot)
{
itemMap.put(stack.copy(), slot);
}
public ItemStack getSingleStack()
{
return itemMap.keySet().iterator().next();
}
public boolean hasType(ItemStack stack)
{
for(ItemStack s : itemMap.keySet())
{
if(InventoryUtils.areItemsStackable(stack, s))
{
return true;
}
}
return false;
}
public static TransitRequest getFromTransport(TransporterStack stack)
{
return getFromStack(stack.itemStack);
}
public static TransitRequest getFromStack(ItemStack stack)
{
TransitRequest ret = new TransitRequest();
ret.setItem(stack, -1);
return ret;
}
public static TransitRequest getTopStacks(TileEntity tile, EnumFacing side, int amount)
{
return getTopStacks(tile, side, amount, new FirstFinder());
}
public static TransitRequest getTopStacks(TileEntity tile, EnumFacing side, int amount, Finder finder)
{
TransitRequest ret = new TransitRequest();
if(tile instanceof ISidedInventory)
{
ISidedInventory sidedInventory = (ISidedInventory)tile;
int[] slots = sidedInventory.getSlotsForFace(side.getOpposite());
if(slots != null)
{
for(int get = slots.length - 1; get >= 0; get--)
{
int slotID = slots[get];
if(!sidedInventory.getStackInSlot(slotID).isEmpty() && sidedInventory.getStackInSlot(slotID).getCount() > 0)
{
ItemStack toSend = sidedInventory.getStackInSlot(slotID).copy();
toSend.setCount(Math.min(amount, toSend.getCount()));
if(!ret.hasType(toSend) && sidedInventory.canExtractItem(slotID, toSend, side.getOpposite()) && finder.modifies(toSend))
{
ret.setItem(toSend, slotID);
}
}
}
}
}
else if(tile instanceof IInventory)
{
IInventory inventory = InventoryUtils.checkChestInv((IInventory)tile);
for(int i = inventory.getSizeInventory() - 1; i >= 0; i--)
{
if(!inventory.getStackInSlot(i).isEmpty() && inventory.getStackInSlot(i).getCount() > 0)
{
ItemStack toSend = inventory.getStackInSlot(i).copy();
toSend.setCount(Math.min(amount, toSend.getCount()));
if(!ret.hasType(toSend) && finder.modifies(toSend))
{
ret.setItem(toSend, i);
}
}
}
}
else if(InventoryUtils.isItemHandler(tile, side.getOpposite()))
{
IItemHandler inventory = InventoryUtils.getItemHandler(tile, side.getOpposite());
for(int i = inventory.getSlots() - 1; i >= 0; i--)
{
ItemStack stack = inventory.extractItem(i, amount, true);
if(!stack.isEmpty() && !ret.hasType(stack) && finder.modifies(stack))
{
ret.setItem(stack, i);
}
}
}
return ret;
}
public static class TransitResponse
{
public static final TransitResponse EMPTY = new TransitResponse(-1, ItemStack.EMPTY);
public int slotID;
public ItemStack stack = ItemStack.EMPTY;
public TransitResponse(int s, ItemStack i)
{
slotID = s;
stack = i;
}
public boolean isEmpty()
{
return stack.isEmpty();
}
public ItemStack getRejected(ItemStack orig)
{
return StackUtils.size(orig, orig.getCount() - stack.getCount());
}
public InvStack getInvStack(TileEntity tile, EnumFacing side)
{
return new InvStack(tile, slotID, stack, side);
}
}
}