Initial 1.7 commit

This commit is contained in:
Chicken-Bomes committed 2014-04-07 14:02:47 +10:00
1 parent 34154fc011
commit ca675b5f31
72 files changed
+2967 -3335

No files matched your search

+7 -7
View File
@@ -76,11 +76,11 @@ public class InventoryCopy implements IInventory
public void setInventorySlotContents(int slot, ItemStack stack)
{
items[slot] = stack;
onInventoryChanged();
markDirty();
}
@Override
public String getInvName()
public String getInventoryName()
{
return "copy";
}
@@ -91,12 +91,13 @@ public class InventoryCopy implements IInventory
return true;
}
public void openChest()
@Override
public void openInventory()
{
}
@Override
public void closeChest()
public void closeInventory()
{
}
@@ -106,9 +107,8 @@ public class InventoryCopy implements IInventory
return 64;
}
@Override
public void onInventoryChanged()
public void markDirty()
{
}
@@ -119,7 +119,7 @@ public class InventoryCopy implements IInventory
}
@Override
public boolean isInvNameLocalized()
public boolean hasCustomInventoryName()
{
return true;
}
+7 -7
View File
@@ -28,7 +28,7 @@ public class InventoryNBT implements IInventory
private void readNBT()
{
if(tag.hasKey("items"))
InventoryUtils.readItemStacksFromTag(items, tag.getTagList("items"));
InventoryUtils.readItemStacksFromTag(items, tag.getTagList("items", 10));
}
@Override
@@ -59,11 +59,11 @@ public class InventoryNBT implements IInventory
public void setInventorySlotContents(int slot, ItemStack stack)
{
items[slot] = stack;
onInventoryChanged();
markDirty();
}
@Override
public String getInvName()
public String getInventoryName()
{
return "NBT";
}
@@ -75,7 +75,7 @@ public class InventoryNBT implements IInventory
}
@Override
public void onInventoryChanged()
public void markDirty()
{
writeNBT();
}
@@ -87,12 +87,12 @@ public class InventoryNBT implements IInventory
}
@Override
public void openChest()
public void openInventory()
{
}
@Override
public void closeChest()
public void closeInventory()
{
}
@@ -103,7 +103,7 @@ public class InventoryNBT implements IInventory
}
@Override
public boolean isInvNameLocalized()
public boolean hasCustomInventoryName()
{
return true;
}
@@ -83,11 +83,11 @@ public class InventorySimple implements IInventory
public void setInventorySlotContents(int slot, ItemStack stack)
{
items[slot] = stack;
onInventoryChanged();
markDirty();
}
@Override
public String getInvName()
public String getInventoryName()
{
return name;
}
@@ -105,12 +105,12 @@ public class InventorySimple implements IInventory
}
@Override
public void openChest()
public void openInventory()
{
}
@Override
public void closeChest()
public void closeInventory()
{
}
@@ -121,13 +121,13 @@ public class InventorySimple implements IInventory
}
@Override
public boolean isInvNameLocalized()
public boolean hasCustomInventoryName()
{
return true;
}
@Override
public void onInventoryChanged()
public void markDirty()
{
}
}
+126 -147
View File
@@ -5,44 +5,54 @@ import com.google.common.base.Objects;
import codechicken.lib.vec.Vector3;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryLargeChest;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagInt;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagShort;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
public class InventoryUtils
{
/**
* Constructor for ItemStack with tag
*/
public static ItemStack newItemStack(Item item, int size, int damage, NBTTagCompound tag) {
ItemStack stack = new ItemStack(item, size, damage);
stack.stackTagCompound = tag;
return stack;
}
/**
* Gets the actual damage of an item without asking the Item
*/
public static int actualDamage(ItemStack stack) {
return Items.diamond.getDamage(stack);
}
/**
* Static default implementation for IInventory method
*/
public static ItemStack decrStackSize(IInventory inv, int slot, int size)
{
public static ItemStack decrStackSize(IInventory inv, int slot, int size) {
ItemStack item = inv.getStackInSlot(slot);
if(item != null)
{
if(item.stackSize <= size)
{
ItemStack itemstack = item;
if (item != null) {
if (item.stackSize <= size) {
inv.setInventorySlotContents(slot, null);
inv.onInventoryChanged();
return itemstack;
inv.markDirty();
return item;
}
ItemStack itemstack1 = item.splitStack(size);
if(item.stackSize == 0)
{
if (item.stackSize == 0)
inv.setInventorySlotContents(slot, null);
}
inv.onInventoryChanged();
inv.markDirty();
return itemstack1;
}
return null;
@@ -51,8 +61,7 @@ public class InventoryUtils
/**
* Static default implementation for IInventory method
*/
public static ItemStack getStackInSlotOnClosing(IInventory inv, int slot)
{
public static ItemStack getStackInSlotOnClosing(IInventory inv, int slot) {
ItemStack stack = inv.getStackInSlot(slot);
inv.setInventorySlotContents(slot, null);
return stack;
@@ -61,56 +70,50 @@ public class InventoryUtils
/**
* @return The quantity of items from addition that can be added to base
*/
public static int incrStackSize(ItemStack base, ItemStack addition)
{
public static int incrStackSize(ItemStack base, ItemStack addition) {
if (canStack(base, addition))
return incrStackSize(base, addition.stackSize);
return 0;
}
/**
* @return The quantity of items from addition that can be added to base
*/
public static int incrStackSize(ItemStack base, int addition)
{
public static int incrStackSize(ItemStack base, int addition) {
int totalSize = base.stackSize + addition;
if (totalSize <= base.getMaxStackSize())
return addition;
else if (base.stackSize < base.getMaxStackSize())
return base.getMaxStackSize() - base.stackSize;
return 0;
}
/**
* NBT item saving function
*/
public static NBTTagList writeItemStacksToTag(ItemStack[] items)
{
public static NBTTagList writeItemStacksToTag(ItemStack[] items) {
return writeItemStacksToTag(items, 64);
}
/**
* NBT item saving function with support for stack sizes > 32K
*/
public static NBTTagList writeItemStacksToTag(ItemStack[] items, int maxQuantity)
{
public static NBTTagList writeItemStacksToTag(ItemStack[] items, int maxQuantity) {
NBTTagList tagList = new NBTTagList();
for(int i = 0; i < items.length; i++)
{
if (items[i] != null)
{
for (int i = 0; i < items.length; i++) {
if (items[i] != null) {
NBTTagCompound tag = new NBTTagCompound();
tag.setShort("Slot", (short) i);
items[i].writeToNBT(tag);
if(maxQuantity > Short.MAX_VALUE)
if (maxQuantity > Short.MAX_VALUE)
tag.setInteger("Quantity", items[i].stackSize);
else if(maxQuantity > Byte.MAX_VALUE)
else if (maxQuantity > Byte.MAX_VALUE)
tag.setShort("Quantity", (short) items[i].stackSize);
tagList.appendTag(tag);
}
}
@@ -120,29 +123,20 @@ public class InventoryUtils
/**
* NBT item loading function with support for stack sizes > 32K
*/
public static void readItemStacksFromTag(ItemStack[] items, NBTTagList tagList)
{
for(int i = 0; i < tagList.tagCount(); i++)
{
NBTTagCompound tag = (NBTTagCompound) tagList.tagAt(i);
public static void readItemStacksFromTag(ItemStack[] items, NBTTagList tagList) {
for (int i = 0; i < tagList.tagCount(); i++) {
NBTTagCompound tag = tagList.getCompoundTagAt(i);
int b = tag.getShort("Slot");
items[b] = ItemStack.loadItemStackFromNBT(tag);
if(tag.hasKey("Quantity"))
{
NBTBase qtag = tag.getTag("Quantity");
if(qtag instanceof NBTTagInt)
items[b].stackSize = ((NBTTagInt)qtag).data;
else if(qtag instanceof NBTTagShort)
items[b].stackSize = ((NBTTagShort)qtag).data;
}
if (tag.hasKey("Quantity"))
items[b].stackSize = ((NBTBase.NBTPrimitive) tag.getTag("Quantity")).func_150287_d();
}
}
/**
* Spawns an itemstack in the world at a location
*/
public static void dropItem(ItemStack stack, World world, Vector3 dropLocation)
{
public static void dropItem(ItemStack stack, World world, Vector3 dropLocation) {
EntityItem item = new EntityItem(world, dropLocation.x, dropLocation.y, dropLocation.z, stack);
item.motionX = world.rand.nextGaussian() * 0.05;
item.motionY = world.rand.nextGaussian() * 0.05 + 0.2F;
@@ -153,11 +147,10 @@ public class InventoryUtils
/**
* Copies an itemstack with a new quantity
*/
public static ItemStack copyStack(ItemStack stack, int quantity)
{
if(stack == null)
public static ItemStack copyStack(ItemStack stack, int quantity) {
if (stack == null)
return null;
stack = stack.copy();
stack.stackSize = quantity;
return stack;
@@ -166,102 +159,87 @@ public class InventoryUtils
/**
* Gets the maximum quantity of an item that can be inserted into inv
*/
public static int getInsertibleQuantity(InventoryRange inv, ItemStack stack)
{
public static int getInsertibleQuantity(InventoryRange inv, ItemStack stack) {
int quantity = 0;
stack = copyStack(stack, Integer.MAX_VALUE);
for(int slot : inv.slots)
quantity+=fitStackInSlot(inv, slot, stack);
for (int slot : inv.slots)
quantity += fitStackInSlot(inv, slot, stack);
return quantity;
}
public static int getInsertibleQuantity(IInventory inv, ItemStack stack)
{
public static int getInsertibleQuantity(IInventory inv, ItemStack stack) {
return getInsertibleQuantity(new InventoryRange(inv), stack);
}
public static int fitStackInSlot(InventoryRange inv, int slot, ItemStack stack)
{
public static int fitStackInSlot(InventoryRange inv, int slot, ItemStack stack) {
ItemStack base = inv.inv.getStackInSlot(slot);
if(!canStack(base, stack) || !inv.canInsertItem(slot, stack))
if (!canStack(base, stack) || !inv.canInsertItem(slot, stack))
return 0;
int fit = base != null ? incrStackSize(base, inv.inv.getInventoryStackLimit()-base.stackSize) : inv.inv.getInventoryStackLimit();
int fit = base != null ? incrStackSize(base, inv.inv.getInventoryStackLimit() - base.stackSize) : inv.inv.getInventoryStackLimit();
return Math.min(fit, stack.stackSize);
}
public static int fitStackInSlot(IInventory inv, int slot, ItemStack stack)
{
public static int fitStackInSlot(IInventory inv, int slot, ItemStack stack) {
return fitStackInSlot(new InventoryRange(inv), slot, stack);
}
/**
* @param simulate. If set to true, no items will actually be inserted
* @param simulate If set to true, no items will actually be inserted
* @return The number of items unable to be inserted
*/
public static int insertItem(InventoryRange inv, ItemStack stack, boolean simulate)
{
public static int insertItem(InventoryRange inv, ItemStack stack, boolean simulate) {
stack = stack.copy();
for(int pass = 0; pass < 2; pass++)
{
for(int slot : inv.slots)
{
for (int pass = 0; pass < 2; pass++) {
for (int slot : inv.slots) {
ItemStack base = inv.inv.getStackInSlot(slot);
int fit = fitStackInSlot(inv, slot, stack);
if(fit == 0)
if (fit == 0)
continue;
if(base != null)
{
stack.stackSize-=fit;
if(!simulate)
{
base.stackSize+=fit;
if (base != null) {
stack.stackSize -= fit;
if (!simulate) {
base.stackSize += fit;
inv.inv.setInventorySlotContents(slot, base);
}
}
else if(pass == 1)
{
if(!simulate)
} else if (pass == 1) {
if (!simulate)
inv.inv.setInventorySlotContents(slot, copyStack(stack, fit));
stack.stackSize-=fit;
stack.stackSize -= fit;
}
if(stack.stackSize == 0)
if (stack.stackSize == 0)
return 0;
}
}
return stack.stackSize;
}
public static int insertItem(IInventory inv, ItemStack stack, boolean simulate)
{
public static int insertItem(IInventory inv, ItemStack stack, boolean simulate) {
return insertItem(new InventoryRange(inv), stack, simulate);
}
/**
* Gets the stack in slot if it can be extracted
*/
public static ItemStack getExtractableStack(InventoryRange inv, int slot)
{
public static ItemStack getExtractableStack(InventoryRange inv, int slot) {
ItemStack stack = inv.inv.getStackInSlot(slot);
if(stack == null || !inv.canExtractItem(slot, stack))
if (stack == null || !inv.canExtractItem(slot, stack))
return null;
return stack;
}
public static ItemStack getExtractableStack(IInventory inv, int slot)
{
public static ItemStack getExtractableStack(IInventory inv, int slot) {
return getExtractableStack(new InventoryRange(inv), slot);
}
public static boolean areStacksIdentical(ItemStack stack1, ItemStack stack2)
{
if(stack1 == null || stack2 == null)
public static boolean areStacksIdentical(ItemStack stack1, ItemStack stack2) {
if (stack1 == null || stack2 == null)
return stack1 == stack2;
return stack1.itemID == stack2.itemID
return stack1.getItem() == stack2.getItem()
&& stack1.getItemDamage() == stack2.getItemDamage()
&& stack1.stackSize == stack2.stackSize
&& Objects.equal(stack1.getTagCompound(), stack2.getTagCompound());
@@ -270,53 +248,46 @@ public class InventoryUtils
/**
* Gets an IInventory from a coordinate with support for double chests
*/
public static IInventory getInventory(World world, int x, int y, int z)
{
TileEntity tile = world.getBlockTileEntity(x, y, z);
if(!(tile instanceof IInventory))
public static IInventory getInventory(World world, int x, int y, int z) {
TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof IInventory))
return null;
if(tile instanceof TileEntityChest)
if (tile instanceof TileEntityChest)
return getChest((TileEntityChest) tile);
return (IInventory)tile;
return (IInventory) tile;
}
public static final ForgeDirection[] chestSides = new ForgeDirection[]{ForgeDirection.WEST, ForgeDirection.EAST, ForgeDirection.NORTH, ForgeDirection.SOUTH};
public static IInventory getChest(TileEntityChest chest)
{
for(ForgeDirection fside : chestSides)
{
if(chest.worldObj.getBlockId(chest.xCoord+fside.offsetX, chest.yCoord+fside.offsetY, chest.zCoord+fside.offsetZ) == chest.getBlockType().blockID)
return new InventoryLargeChest("container.chestDouble",
(TileEntityChest)chest.worldObj.getBlockTileEntity(chest.xCoord+fside.offsetX, chest.yCoord+fside.offsetY, chest.zCoord+fside.offsetZ), chest);
public static IInventory getChest(TileEntityChest chest) {
for (ForgeDirection fside : chestSides) {
if (chest.getWorldObj().getBlock(chest.xCoord + fside.offsetX, chest.yCoord + fside.offsetY, chest.zCoord + fside.offsetZ) == chest.getBlockType())
return new InventoryLargeChest("container.chestDouble",
(TileEntityChest) chest.getWorldObj().getTileEntity(chest.xCoord + fside.offsetX, chest.yCoord + fside.offsetY, chest.zCoord + fside.offsetZ), chest);
}
return chest;
}
public static boolean canStack(ItemStack stack1, ItemStack stack2)
{
return stack1 == null || stack2 == null ||
(stack1.itemID == stack2.itemID &&
(!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) &&
ItemStack.areItemStackTagsEqual(stack2, stack1)) &&
stack1.isStackable();
public static boolean canStack(ItemStack stack1, ItemStack stack2) {
return stack1 == null || stack2 == null ||
(stack1.getItem() == stack2.getItem() &&
(!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) &&
ItemStack.areItemStackTagsEqual(stack2, stack1)) &&
stack1.isStackable();
}
/**
* Consumes one item from slot in inv with support for containers.
*/
public static void consumeItem(IInventory inv, int slot)
{
public static void consumeItem(IInventory inv, int slot) {
ItemStack stack = inv.getStackInSlot(slot);
Item item = stack.getItem();
if(item.hasContainerItem())
{
ItemStack container = item.getContainerItemStack(stack);
if (item.hasContainerItem(stack)) {
ItemStack container = item.getContainerItem(stack);
inv.setInventorySlotContents(slot, container);
}
else
{
} else {
inv.decrStackSize(slot, 1);
}
}
@@ -324,8 +295,7 @@ public class InventoryUtils
/**
* Gets the size of the stack in a slot. Returns 0 on null stacks
*/
public static int stackSize(IInventory inv, int slot)
{
public static int stackSize(IInventory inv, int slot) {
ItemStack stack = inv.getStackInSlot(slot);
return stack == null ? 0 : stack.stackSize;
}
@@ -333,21 +303,30 @@ public class InventoryUtils
/**
* Drops all items from inv using getStackInSlotOnClosing
*/
public static void dropOnClose(EntityPlayer player, IInventory inv)
{
for (int i = 0; i < inv.getSizeInventory(); i++)
{
public static void dropOnClose(EntityPlayer player, IInventory inv) {
for (int i = 0; i < inv.getSizeInventory(); i++) {
ItemStack stack = inv.getStackInSlotOnClosing(i);
if (stack != null)
player.dropPlayerItem(stack);
player.dropPlayerItemWithRandomChoice(stack, false);
}
}
/**
* Gets the actual damage of an item without asking the Item
*/
public static int actualDamage(ItemStack stack)
{
return Item.diamond.getDamage(stack);
public static NBTTagCompound savePersistant(ItemStack stack, NBTTagCompound tag) {
stack.writeToNBT(tag);
tag.removeTag("id");
tag.setString("name", Item.itemRegistry.getNameForObject(stack.getItem()));
return tag;
}
public static ItemStack loadPersistant(NBTTagCompound tag) {
String name = tag.getString("name");
Item item = (Item) Item.itemRegistry.getObject(name);
if(item == null) return null;
int count = tag.hasKey("Count") ? tag.getByte("Count") : 1;
int damage = tag.hasKey("Damage") ? tag.getShort("Damage") : 0;
ItemStack stack = new ItemStack(item, count, damage);
if(tag.hasKey("tag", 10))
stack.stackTagCompound = tag.getCompoundTag("tag");
return stack;
}
}
+34 -34
View File
@@ -1,9 +1,12 @@
package codechicken.lib.inventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import com.google.common.base.Objects;
import net.minecraftforge.oredict.OreDictionary;
import static codechicken.lib.inventory.InventoryUtils.*;
/**
@@ -11,55 +14,52 @@ import static codechicken.lib.inventory.InventoryUtils.*;
*/
public class ItemKey implements Comparable<ItemKey>
{
public ItemStack item;
public ItemStack stack;
private int hashcode = 0;
public ItemKey(ItemStack k)
{
item = k;
public ItemKey(ItemStack k) {
stack = k;
}
public ItemKey(int id, int damage)
{
this(new ItemStack(id, 1, damage));
public ItemKey(Item item, int damage) {
this(new ItemStack(item, 1, damage));
}
public ItemKey(int id, int damage, NBTTagCompound compound)
{
this(id, damage);
item.setTagCompound(compound);
public ItemKey(Item item, NBTTagCompound tag) {
this(item, OreDictionary.WILDCARD_VALUE, tag);
}
public ItemKey(Item item, int damage, NBTTagCompound tag) {
this(item, damage);
stack.setTagCompound(tag);
}
@Override
public boolean equals(Object obj)
{
if(!(obj instanceof ItemKey))
public boolean equals(Object obj) {
if (!(obj instanceof ItemKey))
return false;
ItemKey k = (ItemKey)obj;
return item.itemID == k.item.itemID &&
actualDamage(item) == actualDamage(k.item) &&
Objects.equal(item.stackTagCompound, k.item.stackTagCompound);
ItemKey k = (ItemKey) obj;
return stack.getItem() == k.stack.getItem() &&
actualDamage(stack) == actualDamage(k.stack) &&
Objects.equal(stack.stackTagCompound, k.stack.stackTagCompound);
}
@Override
public int hashCode()
{
return hashcode != 0 ? hashcode : (hashcode = Objects.hashCode(item.itemID, actualDamage(item), item.stackTagCompound));
public int hashCode() {
return hashcode != 0 ? hashcode : (hashcode = Objects.hashCode(stack.getItem(), actualDamage(stack), stack.stackTagCompound));
}
public int compareInt(int a, int b)
{
public int compareInt(int a, int b) {
return a == b ? 0 : a < b ? -1 : 1;
}
@Override
public int compareTo(ItemKey o)
{
if(item.itemID != o.item.itemID)
return compareInt(item.itemID, o.item.itemID);
if(actualDamage(item) != actualDamage(o.item))
return compareInt(actualDamage(item), actualDamage(o.item));
public int compareTo(ItemKey o) {
if (stack.getItem() != o.stack.getItem())
return compareInt(Item.getIdFromItem(stack.getItem()), Item.getIdFromItem(o.stack.getItem()));
if (actualDamage(stack) != actualDamage(o.stack))
return compareInt(actualDamage(stack), actualDamage(o.stack));
return 0;
}
}