Little cleanup on crate code
This commit is contained in:
Robert S
parent
6119f44947
commit
847c182571
1 changed files with 208 additions and 243 deletions
|
|
@ -1,6 +1,7 @@
|
|||
package resonantinduction.archaic.crate;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
|
|
@ -15,276 +16,240 @@ import calclavia.lib.utility.inventory.IExtendedStorage;
|
|||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
||||
/**
|
||||
* Basic single stack inventory.
|
||||
/** Basic single stack inventory.
|
||||
*
|
||||
* TODO: Add filter-locking feature. Put filter in, locks the crate to only use that item.
|
||||
*
|
||||
* @author DarkGuardsman
|
||||
*/
|
||||
* @author DarkGuardsman */
|
||||
public class TileCrate extends TileExternalInventory implements IPacketReceiver, IExtendedStorage
|
||||
{
|
||||
/*
|
||||
* TODO
|
||||
* Fix issues with ItemStacks with NBT tags having issues
|
||||
* Fix possible render issues with some items
|
||||
* Yell at MachineMuse for her items rendering threw walls
|
||||
* Add support to disable sides of crates when rendering items are unwanted
|
||||
* Simplify item rendering to decrease graphic lag
|
||||
* Add crafting manger to prevent crafting with full crates
|
||||
* As well keep item stacks when upgrade crate threw crafting
|
||||
* Add upgrade item for crate
|
||||
* Add crate swapping in which an advanced can trade place with a basic while keeping inventory
|
||||
* at the locaiton
|
||||
*/
|
||||
/** Collective total stack of all inv slots */
|
||||
private ItemStack sampleStack;
|
||||
/** Collective total stack of all inv slots */
|
||||
private ItemStack sampleStack;
|
||||
|
||||
/** delay from last click */
|
||||
public long prevClickTime = -1000;
|
||||
/** max meta size of the crate */
|
||||
public static final int maxSize = 2;
|
||||
/** delay from last click */
|
||||
public long prevClickTime = -1000;
|
||||
/** max meta size of the crate */
|
||||
public static final int maxSize = 2;
|
||||
|
||||
@Override
|
||||
public InventoryCrate getInventory()
|
||||
{
|
||||
if (this.inventory == null)
|
||||
{
|
||||
inventory = new InventoryCrate(this);
|
||||
}
|
||||
return (InventoryCrate) this.inventory;
|
||||
}
|
||||
@Override
|
||||
public InventoryCrate getInventory()
|
||||
{
|
||||
if (this.inventory == null)
|
||||
{
|
||||
inventory = new InventoryCrate(this);
|
||||
}
|
||||
return (InventoryCrate) this.inventory;
|
||||
}
|
||||
|
||||
/** Gets the sample stack that represent the total inv */
|
||||
public ItemStack getSampleStack()
|
||||
{
|
||||
if (this.sampleStack == null)
|
||||
{
|
||||
this.buildSampleStack();
|
||||
}
|
||||
return this.sampleStack;
|
||||
}
|
||||
/** Gets the sample stack that represent the total inventory */
|
||||
public ItemStack getSampleStack()
|
||||
{
|
||||
if (this.sampleStack == null)
|
||||
{
|
||||
this.buildSampleStack();
|
||||
}
|
||||
return this.sampleStack;
|
||||
}
|
||||
|
||||
/**
|
||||
* Turns the inventory array into a single stack of matching items. This assumes that all items
|
||||
* in the crate are the same TODO eject minority items and only keep the majority that are the
|
||||
* same to prevent duplication issues
|
||||
* TODO: Add Force?
|
||||
* @param force - force a rebuild of the inventory from the single stack created
|
||||
*/
|
||||
public void buildSampleStack()
|
||||
{
|
||||
ItemStack stack = null;
|
||||
/** Builds the sample stack using the inventory as a point of reference. Assumes all items match
|
||||
* each other, and only takes into account stack sizes */
|
||||
public void buildSampleStack()
|
||||
{
|
||||
ItemStack newSampleStack = null;
|
||||
boolean rebuildBase = false;
|
||||
|
||||
boolean rebuildBase = false;
|
||||
/* Creates the sample stack that is used as a collective itemstack */
|
||||
for (int slot = 0; slot < this.getSizeInventory(); slot++)
|
||||
{
|
||||
ItemStack slotStack = this.getInventory().getContainedItems()[slot];
|
||||
if (slotStack != null && Item.itemsList[slotStack.itemID] != null && slotStack.stackSize > 0)
|
||||
{
|
||||
if (newSampleStack == null)
|
||||
newSampleStack = slotStack.copy();
|
||||
else
|
||||
newSampleStack.stackSize += slotStack.stackSize;
|
||||
|
||||
/* Creates the sample stack that is used as a collective itemstack */
|
||||
for (int i = 0; i < this.getInventory().getContainedItems().length; i++)
|
||||
{
|
||||
ItemStack s = this.getInventory().getContainedItems()[i];
|
||||
if (s != null && s.itemID > 0 && s.stackSize > 0)
|
||||
{
|
||||
if (stack == null)
|
||||
{
|
||||
stack = s.copy();
|
||||
}
|
||||
else
|
||||
{
|
||||
stack.stackSize += this.getInventory().getContainedItems()[i].stackSize;
|
||||
}
|
||||
if (this.getInventory().getContainedItems()[i].stackSize > this.getInventory().getContainedItems()[i].getMaxStackSize())
|
||||
{
|
||||
rebuildBase = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (stack == null || stack.itemID == 0 || stack.stackSize == 0)
|
||||
{
|
||||
this.sampleStack = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.sampleStack = stack.copy();
|
||||
}
|
||||
/* if one stack is over sized this rebuilds the inv to redistribute the items in the slots */
|
||||
if ((rebuildBase || this.getInventory().getContainedItems().length > this.getSlotCount()) && this.sampleStack != null)
|
||||
{
|
||||
this.getInventory().buildInventory(this.sampleStack);
|
||||
}
|
||||
}
|
||||
if (slotStack.stackSize > slotStack.getMaxStackSize())
|
||||
rebuildBase = true;
|
||||
}
|
||||
}
|
||||
if (newSampleStack == null || newSampleStack.itemID == 0 || newSampleStack.stackSize <= 0)
|
||||
this.sampleStack = null;
|
||||
else
|
||||
this.sampleStack = newSampleStack.copy();
|
||||
|
||||
/** Adds an item to the stack */
|
||||
public void addToStack(ItemStack stack, int amount)
|
||||
{
|
||||
if (stack != null)
|
||||
{
|
||||
this.addToStack(new ItemStack(stack.stackSize, amount, stack.getItemDamage()));
|
||||
}
|
||||
}
|
||||
/* Rebuild inventory if the inventory is not valid */
|
||||
if (this.sampleStack != null && (rebuildBase || this.getInventory().getContainedItems().length > this.getSizeInventory()))
|
||||
{
|
||||
this.getInventory().buildInventory(this.sampleStack);
|
||||
}
|
||||
}
|
||||
|
||||
/** Adds the stack to the sample stack */
|
||||
public void addToStack(ItemStack stack)
|
||||
{
|
||||
if (stack != null)
|
||||
{
|
||||
this.buildSampleStack();
|
||||
boolean flag = false;
|
||||
@Override
|
||||
public ItemStack addStackToStorage(ItemStack stack)
|
||||
{
|
||||
return BlockCrate.addStackToCrate(this, stack);
|
||||
}
|
||||
|
||||
if (this.sampleStack == null)
|
||||
{
|
||||
this.sampleStack = stack;
|
||||
flag = true;
|
||||
}
|
||||
else if (this.sampleStack.isItemEqual(stack) || OreDictionary.getOreID(sampleStack) == OreDictionary.getOreID(stack))
|
||||
{
|
||||
this.sampleStack.stackSize += stack.stackSize;
|
||||
flag = true;
|
||||
}
|
||||
/** Adds an item to the stack */
|
||||
public void addToStack(ItemStack stack, int amount)
|
||||
{
|
||||
if (stack != null)
|
||||
{
|
||||
ItemStack newStack = stack.copy();
|
||||
newStack.stackSize = amount;
|
||||
this.addToStack(newStack);
|
||||
}
|
||||
}
|
||||
|
||||
if (flag)
|
||||
{
|
||||
this.getInventory().buildInventory(this.sampleStack);
|
||||
}
|
||||
}
|
||||
}
|
||||
/** Adds the stack to the sample stack */
|
||||
public void addToStack(ItemStack stack)
|
||||
{
|
||||
if (stack != null && stack.stackSize > 0)
|
||||
{
|
||||
if (this.getSampleStack() == null)
|
||||
{
|
||||
this.sampleStack = stack;
|
||||
getInventory().buildInventory(getSampleStack());
|
||||
}
|
||||
else if (this.getSampleStack().isItemEqual(stack) || OreDictionary.getOreID(getSampleStack()) == OreDictionary.getOreID(stack))
|
||||
{
|
||||
getSampleStack().stackSize += stack.stackSize;
|
||||
getInventory().buildInventory(getSampleStack());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onInventoryChanged()
|
||||
{
|
||||
super.onInventoryChanged();
|
||||
@Override
|
||||
public void onInventoryChanged()
|
||||
{
|
||||
super.onInventoryChanged();
|
||||
|
||||
if (worldObj != null && !worldObj.isRemote)
|
||||
{
|
||||
PacketHandler.sendPacketToClients(getDescriptionPacket(), this.worldObj);
|
||||
}
|
||||
}
|
||||
if (worldObj != null && !worldObj.isRemote)
|
||||
{
|
||||
PacketHandler.sendPacketToClients(getDescriptionPacket(), this.worldObj);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canStore(ItemStack stack, int slot, ForgeDirection side)
|
||||
{
|
||||
return sampleStack == null || stack != null && (stack.isItemEqual(sampleStack) || OreDictionary.getOreID(sampleStack) == OreDictionary.getOreID(stack));
|
||||
}
|
||||
@Override
|
||||
public boolean canStore(ItemStack stack, int slot, ForgeDirection side)
|
||||
{
|
||||
return getSampleStack() == null || stack != null && (stack.isItemEqual(getSampleStack()) || OreDictionary.getOreID(getSampleStack()) == OreDictionary.getOreID(stack));
|
||||
}
|
||||
|
||||
/** Gets the current slot count for the crate */
|
||||
public int getSlotCount()
|
||||
{
|
||||
if (this.worldObj == null)
|
||||
{
|
||||
return TileCrate.getSlotCount(TileCrate.maxSize);
|
||||
}
|
||||
return TileCrate.getSlotCount(this.getBlockMetadata());
|
||||
}
|
||||
/** Gets the current slot count for the crate */
|
||||
public int getSlotCount()
|
||||
{
|
||||
if (this.worldObj == null)
|
||||
{
|
||||
return TileCrate.getSlotCount(TileCrate.maxSize);
|
||||
}
|
||||
return TileCrate.getSlotCount(this.getBlockMetadata());
|
||||
}
|
||||
|
||||
/** Gets the slot count for the crate meta */
|
||||
public static int getSlotCount(int metadata)
|
||||
{
|
||||
if (metadata >= 2)
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
else if (metadata >= 1)
|
||||
{
|
||||
return 64;
|
||||
}
|
||||
return 32;
|
||||
}
|
||||
/** Gets the slot count for the crate meta */
|
||||
public static int getSlotCount(int metadata)
|
||||
{
|
||||
if (metadata >= 2)
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
else if (metadata >= 1)
|
||||
{
|
||||
return 64;
|
||||
}
|
||||
return 32;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canUpdate()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
int ddd = 0;
|
||||
@Override
|
||||
public void onReceivePacket(ByteArrayDataInput data, EntityPlayer player, Object... extra)
|
||||
{
|
||||
if (this.worldObj.isRemote)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (data.readBoolean())
|
||||
{
|
||||
this.sampleStack = ItemStack.loadItemStackFromNBT(PacketHandler.readNBTTagCompound(data));
|
||||
this.sampleStack.stackSize = data.readInt();
|
||||
//player.sendChatToPlayer(ChatMessageComponent.createFromText("Crate Packet " + (ddd++)));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.sampleStack = null;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public boolean canUpdate()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
{
|
||||
this.buildSampleStack();
|
||||
ItemStack stack = this.getSampleStack();
|
||||
if (stack != null)
|
||||
{
|
||||
return ResonantInduction.PACKET_TILE.getPacket(this, true, stack.writeToNBT(new NBTTagCompound()), stack.stackSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
return ResonantInduction.PACKET_TILE.getPacket(this, false);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void onReceivePacket(ByteArrayDataInput data, EntityPlayer player, Object... extra)
|
||||
{
|
||||
if (this.worldObj.isRemote)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (data.readBoolean())
|
||||
{
|
||||
this.sampleStack = ItemStack.loadItemStackFromNBT(PacketHandler.readNBTTagCompound(data));
|
||||
this.sampleStack.stackSize = data.readInt();
|
||||
}
|
||||
else
|
||||
{
|
||||
this.sampleStack = null;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** NBT Data */
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbt)
|
||||
{
|
||||
super.readFromNBT(nbt);
|
||||
/* Load current two inv methods */
|
||||
ItemStack stack = null;
|
||||
int count = nbt.getInteger("Count");
|
||||
if (nbt.hasKey("itemID"))
|
||||
{
|
||||
stack = new ItemStack(nbt.getInteger("itemID"), count, nbt.getInteger("itemMeta"));
|
||||
}
|
||||
else
|
||||
{
|
||||
stack = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("stack"));
|
||||
if (stack != null)
|
||||
{
|
||||
stack.stackSize = count;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
{
|
||||
this.buildSampleStack();
|
||||
ItemStack stack = this.getSampleStack();
|
||||
if (stack != null)
|
||||
{
|
||||
return ResonantInduction.PACKET_TILE.getPacket(this, true, stack.writeToNBT(new NBTTagCompound()), stack.stackSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
return ResonantInduction.PACKET_TILE.getPacket(this, false);
|
||||
}
|
||||
}
|
||||
|
||||
/* Only load sample stack if the read stack is valid */
|
||||
if (stack != null && stack.itemID != 0 && stack.stackSize > 0)
|
||||
{
|
||||
this.sampleStack = stack;
|
||||
this.getInventory().buildInventory(this.sampleStack);
|
||||
}
|
||||
/** NBT Data */
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbt)
|
||||
{
|
||||
super.readFromNBT(nbt);
|
||||
/* Load current two inv methods */
|
||||
ItemStack stack = null;
|
||||
int count = nbt.getInteger("Count");
|
||||
if (nbt.hasKey("itemID"))
|
||||
{
|
||||
stack = new ItemStack(nbt.getInteger("itemID"), count, nbt.getInteger("itemMeta"));
|
||||
}
|
||||
else
|
||||
{
|
||||
stack = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("stack"));
|
||||
if (stack != null)
|
||||
{
|
||||
stack.stackSize = count;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
/* Only load sample stack if the read stack is valid */
|
||||
if (stack != null && stack.itemID != 0 && stack.stackSize > 0)
|
||||
{
|
||||
this.sampleStack = stack;
|
||||
this.getInventory().buildInventory(this.sampleStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbt)
|
||||
{
|
||||
super.writeToNBT(nbt);
|
||||
/* Re-Build sample stack for saving */
|
||||
this.buildSampleStack();
|
||||
ItemStack stack = this.getSampleStack();
|
||||
/* Save sample stack */
|
||||
if (stack != null)
|
||||
{
|
||||
nbt.setInteger("Count", stack.stackSize);
|
||||
nbt.setCompoundTag("stack", stack.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbt)
|
||||
{
|
||||
super.writeToNBT(nbt);
|
||||
/* Re-Build sample stack for saving */
|
||||
this.buildSampleStack();
|
||||
ItemStack stack = this.getSampleStack();
|
||||
/* Save sample stack */
|
||||
if (stack != null)
|
||||
{
|
||||
nbt.setInteger("Count", stack.stackSize);
|
||||
nbt.setCompoundTag("stack", stack.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack addStackToStorage(ItemStack stack)
|
||||
{
|
||||
return BlockCrate.addStackToCrate(this, stack);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue