From 01c8701b68986ccfa83e902515716838d6829311 Mon Sep 17 00:00:00 2001 From: Onyx Date: Tue, 1 Dec 2015 20:55:30 +0000 Subject: - Fixed all of the bugs mentioned on github - Added new config options - Rabbits paw now increases the chance of spawning hearts, rather than itself spawning some - Hearts now have a much lower chance to spawn by default - You can no longer increase your health past 20 hearts (aka double the default health) - The guide now also shows the total number of pages on each tab - A new luck stat has been added to the Curse API - Cleaned up the code a bit (removed unused methods, imports etc) - The displayer's info now has a purple solid color background; the text also has a much closer shadow and now shrinks in height as well as in width when too big - I have modified the potion list to use Mithion's code, credits have been given --- .../jewelrycraft/client/JewelryInventory.java | 330 ++++++++++----------- 1 file changed, 165 insertions(+), 165 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java') diff --git a/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java b/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java index cf8543e..895b345 100644 --- a/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java +++ b/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java @@ -1,166 +1,166 @@ -package darkknight.jewelrycraft.client; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import darkknight.jewelrycraft.item.ItemBracelet; -import darkknight.jewelrycraft.item.ItemEarrings; -import darkknight.jewelrycraft.item.ItemNecklace; -import darkknight.jewelrycraft.item.ItemRing; -import darkknight.jewelrycraft.util.PlayerUtils; -import darkknight.jewelrycraft.util.Variables; - -public class JewelryInventory implements IInventory -{ - public EntityPlayer player; - public ItemStack[] inventory = new ItemStack[18]; - - /** - * @param player - */ - public JewelryInventory(EntityPlayer player) - { - this.player = player; - NBTTagCompound nbt = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); - for(int i = 0; i < 18; i++) - inventory[i] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("ext" + i)); - } - - /** - * @return - */ - @Override - public int getSizeInventory() - { - return inventory.length; - } - - /** - * @param slot - * @return - */ - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory[slot]; - } - - /** - * @param slot - * @param amount - * @return - */ - @Override - public ItemStack decrStackSize(int slot, int amount) - { - ItemStack stack = getStackInSlot(slot); - if (stack != null) if (stack.stackSize > amount){ - stack = stack.splitStack(amount); - markDirty(); - }else setInventorySlotContents(slot, null); - return stack; - } - - /** - * @param slot - * @return - */ - @Override - public ItemStack getStackInSlotOnClosing(int slot) - { - ItemStack stack = getStackInSlot(slot); - setInventorySlotContents(slot, null); - return stack; - } - - /** - * @param slot - * @param stack - */ - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory[slot] = stack; - if (stack != null && stack.stackSize > getInventoryStackLimit()) stack.stackSize = getInventoryStackLimit(); - markDirty(); - } - - /** - * @return - */ - @Override - public String getInventoryName() - { - return "Jewelry"; - } - - /** - * @return - */ - @Override - public boolean hasCustomInventoryName() - { - return false; - } - - /** - * @return - */ - @Override - public int getInventoryStackLimit() - { - return 1; - } - - /** - * - */ - @Override - public void markDirty() - { - NBTTagCompound nbt = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); - for(int i = 0; i < 18; i++) - if (inventory[i] != null) nbt.setTag("ext" + i, inventory[i].writeToNBT(nbt.getCompoundTag("ext" + i))); - else nbt.removeTag("ext" + i); - } - - /** - * @param player - * @return - */ - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return true; - } - - /** - * - */ - @Override - public void openInventory() - {} - - /** - * - */ - @Override - public void closeInventory() - {} - - /** - * @param slot - * @param stack - * @return - */ - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - if (slot >= 0 && slot <= 9 && stack.getItem() instanceof ItemRing) return true; - else if (slot >= 10 && slot <= 13 && stack.getItem() instanceof ItemBracelet) return true; - else if (slot >= 14 && slot <= 16 && stack.getItem() instanceof ItemNecklace) return true; - else if (slot == 17 && stack.getItem() instanceof ItemEarrings) return true; - return false; - } +package darkknight.jewelrycraft.client; + +import darkknight.jewelrycraft.item.ItemBracelet; +import darkknight.jewelrycraft.item.ItemEarrings; +import darkknight.jewelrycraft.item.ItemNecklace; +import darkknight.jewelrycraft.item.ItemRing; +import darkknight.jewelrycraft.util.PlayerUtils; +import darkknight.jewelrycraft.util.Variables; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class JewelryInventory implements IInventory +{ + public EntityPlayer player; + public ItemStack[] inventory = new ItemStack[18]; + + /** + * @param player + */ + public JewelryInventory(EntityPlayer player) + { + this.player = player; + NBTTagCompound nbt = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); + for(int i = 0; i < 18; i++) + inventory[i] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("ext" + i)); + } + + /** + * @return + */ + @Override + public int getSizeInventory() + { + return inventory.length; + } + + /** + * @param slot + * @return + */ + @Override + public ItemStack getStackInSlot(int slot) + { + return inventory[slot]; + } + + /** + * @param slot + * @param amount + * @return + */ + @Override + public ItemStack decrStackSize(int slot, int amount) + { + ItemStack stack = getStackInSlot(slot); + if (stack != null) if (stack.stackSize > amount){ + stack = stack.splitStack(amount); + markDirty(); + }else setInventorySlotContents(slot, null); + return stack; + } + + /** + * @param slot + * @return + */ + @Override + public ItemStack getStackInSlotOnClosing(int slot) + { + ItemStack stack = getStackInSlot(slot); + setInventorySlotContents(slot, null); + return stack; + } + + /** + * @param slot + * @param stack + */ + @Override + public void setInventorySlotContents(int slot, ItemStack stack) + { + inventory[slot] = stack; + if (stack != null && stack.stackSize > getInventoryStackLimit()) stack.stackSize = getInventoryStackLimit(); + markDirty(); + } + + /** + * @return + */ + @Override + public String getInventoryName() + { + return "Jewelry"; + } + + /** + * @return + */ + @Override + public boolean hasCustomInventoryName() + { + return false; + } + + /** + * @return + */ + @Override + public int getInventoryStackLimit() + { + return 1; + } + + /** + * + */ + @Override + public void markDirty() + { + NBTTagCompound nbt = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); + for(int i = 0; i < 18; i++) + if (inventory[i] != null) nbt.setTag("ext" + i, inventory[i].writeToNBT(nbt.getCompoundTag("ext" + i))); + else nbt.removeTag("ext" + i); + } + + /** + * @param player + * @return + */ + @Override + public boolean isUseableByPlayer(EntityPlayer player) + { + return true; + } + + /** + * + */ + @Override + public void openInventory() + {} + + /** + * + */ + @Override + public void closeInventory() + {} + + /** + * @param slot + * @param stack + * @return + */ + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) + { + if (slot >= 0 && slot <= 9 && stack.getItem() instanceof ItemRing) return true; + else if (slot >= 10 && slot <= 13 && stack.getItem() instanceof ItemBracelet) return true; + else if (slot >= 14 && slot <= 16 && stack.getItem() instanceof ItemNecklace) return true; + else if (slot == 17 && stack.getItem() instanceof ItemEarrings) return true; + return false; + } } \ No newline at end of file -- cgit v1.2.3