Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Engineering table now searches adjacent inventories for resources

Browse source
This commit is contained in:
Calclavia 2014-01-18 16:00:13 +08:00
parent 0f25136871
commit 0666f18a8a
2 changed files with 121 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java
View file

@ -152,9 +152,13 @@ public class BlockEngineeringTable extends BlockRI
while (output != null && (firstLoop || ControlKeyModifer.isControlDown(player)))
{
InventoryUtility.dropItemStack(world, new Vector3(player), output, 0);
tile.onPickUpFromSlot(player, 9, output);
if (output.stackSize > 0)
{
InventoryUtility.dropItemStack(world, new Vector3(player), output, 0);
}
tile.setInventorySlotContents(9, null);
tile.onInventoryChanged();
@ -171,15 +175,25 @@ public class BlockEngineeringTable extends BlockRI
}
@Override
public boolean onUseWrench(World worldorld, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ)
public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
TileEntity tileEntity = worldorld.getBlockTileEntity(x, y, z);
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if (tileEntity instanceof TileEngineeringTable)
{
TileEngineeringTable tile = (TileEngineeringTable) tileEntity;
tile.searchInventories = !tile.searchInventories;
worldorld.markBlockForUpdate(x, y, z);
if (!world.isRemote)
{
if (tile.searchInventories)
player.addChatMessage("Engineering table will now search for nearby inventories for resources.");
else
player.addChatMessage("Engineering table will not search for nearby inventories for resources.");
}
world.markBlockForUpdate(x, y, z);
return true;
}

132
src/main/java/resonantinduction/archaic/engineering/TileEngineeringTable.java
View file

@ -6,6 +6,7 @@ import java.util.Set;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
@ -13,6 +14,8 @@ import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.packet.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import org.apache.commons.lang3.ArrayUtils;
@ -22,6 +25,7 @@ import resonantinduction.archaic.imprint.ItemBlockImprint;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.prefab.ContainerFake;
import resonantinduction.electrical.encoder.coding.args.ArgumentData;
import universalelectricity.api.vector.Vector3;
import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.prefab.slot.ISlotPickResult;
@ -36,7 +40,11 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
{
public static final int CRAFTING_MATRIX_END = 9;
public static final int CRAFTING_OUTPUT_END = CRAFTING_MATRIX_END + 1;
public static final int PLAYER_OUTPUT_END = CRAFTING_OUTPUT_END + 40;
// Relative slot IDs
public static final int CRAFTING_OUTPUT_SLOT = 0;
private static final int IMPRINT_SLOT = 1;
private AutoCraftingManager craftManager;
@ -45,7 +53,7 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
public static final int[] craftingSlots = { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
/** The output inventory containing slots. */
public ItemStack[] output = new ItemStack[1];
public ItemStack[] inventory = new ItemStack[1];
public static int[] inventorySlots;
/** The ability for the engineering table to serach nearby inventories. */
@ -159,12 +167,32 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
}
else if (slot < CRAFTING_OUTPUT_END)
{
return this.output[slot - CRAFTING_MATRIX_END];
return this.inventory[slot - CRAFTING_MATRIX_END];
}
else if (this.invPlayer != null)
else if (slot < PLAYER_OUTPUT_END && invPlayer != null)
{
return this.invPlayer.getStackInSlot(slot - CRAFTING_OUTPUT_END);
}
else if (searchInventories)
{
int idDisplacement = PLAYER_OUTPUT_END;
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
TileEntity tile = new Vector3(this).modifyPositionFromSide(dir).getTileEntity(worldObj);
if (tile instanceof IInventory)
{
IInventory inventory = (IInventory) tile;
int slotID = slot - idDisplacement;
if (slotID < inventory.getSizeInventory())
return inventory.getStackInSlot(slotID);
idDisplacement += inventory.getSizeInventory();
}
}
}
return null;
}
@ -172,24 +200,41 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
@Override
public void setInventorySlotContents(int slot, ItemStack itemStack)
{
if (slot < this.getSizeInventory())
if (slot < CRAFTING_MATRIX_END)
{
if (slot < CRAFTING_MATRIX_END)
{
this.craftingMatrix[slot] = itemStack;
}
else if (slot < CRAFTING_OUTPUT_END)
{
this.output[slot - CRAFTING_MATRIX_END] = itemStack;
}
else if (this.invPlayer != null)
{
this.invPlayer.setInventorySlotContents(slot - CRAFTING_OUTPUT_END, itemStack);
EntityPlayer player = this.invPlayer.player;
this.craftingMatrix[slot] = itemStack;
}
else if (slot < CRAFTING_OUTPUT_END)
{
this.inventory[slot - CRAFTING_MATRIX_END] = itemStack;
}
else if (slot < PLAYER_OUTPUT_END && this.invPlayer != null)
{
this.invPlayer.setInventorySlotContents(slot - CRAFTING_OUTPUT_END, itemStack);
EntityPlayer player = this.invPlayer.player;
if (player instanceof EntityPlayerMP)
if (player instanceof EntityPlayerMP)
{
((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer);
}
}
else if (searchInventories)
{
int idDisplacement = PLAYER_OUTPUT_END;
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
TileEntity tile = new Vector3(this).modifyPositionFromSide(dir).getTileEntity(worldObj);
if (tile instanceof IInventory)
{
((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer);
IInventory inventory = (IInventory) tile;
int slotID = slot - idDisplacement;
if (slotID < inventory.getSizeInventory())
inventory.setInventorySlotContents(slotID, itemStack);
idDisplacement += inventory.getSizeInventory();
}
}
}
@ -255,7 +300,7 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
{
if (!worldObj.isRemote)
{
this.output[CRAFTING_OUTPUT_SLOT] = null;
this.inventory[CRAFTING_OUTPUT_SLOT] = null;
/** Try to craft from crafting grid. If not possible, then craft from imprint. */
boolean didCraft = false;
@ -267,16 +312,16 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
if (matrixOutput != null && this.getCraftingManager().getIdealRecipe(matrixOutput) != null)
{
this.output[CRAFTING_OUTPUT_SLOT] = matrixOutput;
this.inventory[CRAFTING_OUTPUT_SLOT] = matrixOutput;
didCraft = true;
}
// TODO: Change this later.
int imprintInputSlot = 4;
/**
* If output does not exist, try using the filter.
*/
if (!didCraft)
{
ItemStack filterStack = this.craftingMatrix[imprintInputSlot];
ItemStack filterStack = craftingMatrix[4];// this.inventory[IMPRINT_SLOT];
if (filterStack != null && filterStack.getItem() instanceof ItemBlockImprint)
{
@ -291,10 +336,9 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
if (idealRecipe != null)
{
ItemStack recipeOutput = idealRecipe.left();
if (recipeOutput != null & recipeOutput.stackSize > 0)
{
this.output[CRAFTING_OUTPUT_SLOT] = recipeOutput;
this.inventory[CRAFTING_OUTPUT_SLOT] = recipeOutput;
didCraft = true;
break;
}
@ -321,7 +365,10 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
{
this.getCraftingManager().consumeItems(idealRecipeItem.right().clone());
}
else
{
itemStack.stackSize = 0;
}
}
}
}
@ -361,7 +408,7 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
NBTTagList nbtList = nbt.getTagList("Items");
this.craftingMatrix = new ItemStack[9];
this.output = new ItemStack[1];
this.inventory = new ItemStack[1];
for (int i = 0; i < nbtList.tagCount(); ++i)
{
@ -450,12 +497,37 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
@Override
public int[] getCraftingInv()
{
int[] slots = craftingSlots;
if (playerSlots != null)
{
return ArrayUtils.addAll(playerSlots, craftingSlots);
slots = ArrayUtils.addAll(playerSlots, slots);
}
return craftingSlots;
if (searchInventories)
{
int temporaryInvID = PLAYER_OUTPUT_END;
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
TileEntity tile = new Vector3(this).modifyPositionFromSide(dir).getTileEntity(worldObj);
if (tile instanceof IInventory)
{
IInventory inventory = (IInventory) tile;
int[] nearbySlots = new int[inventory.getSizeInventory()];
for (int i = 0; i < inventory.getSizeInventory(); i++)
{
nearbySlots[i] = temporaryInvID++;
}
slots = ArrayUtils.addAll(nearbySlots, slots);
}
}
}
return slots;
}
}