From fd17ded2610ba44fe95d67e30e74d927ffa6e079 Mon Sep 17 00:00:00 2001 From: jaredlll08 Date: Mon, 31 Aug 2015 15:34:17 +0200 Subject: [PATCH] Attempt to add maxStackSize --- .gitignore | 5 +- .../minetweaker/api/item/IIngredient.java | 1 + .../java/minetweaker/api/item/IItemStack.java | 16 +++ .../.projects/Minecraft/.location | Bin 133 -> 131 bytes .../minetweaker/mc1710/FMLEventHandler.java | 28 ++--- .../mc1710/actions/SetStackSizeAction.java | 61 +++++++++ .../minetweaker/mc1710/item/MCItemStack.java | 116 ++++++++++-------- 7 files changed, 159 insertions(+), 68 deletions(-) create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java diff --git a/.gitignore b/.gitignore index 6f3ca30..1ac5f62 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,7 @@ run *.iws /.metadata/* *.eml -usernamecache.json \ No newline at end of file +usernamecache.json +MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location +*.location +MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location \ No newline at end of file diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java index 7a7430c..99e9994 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java @@ -168,4 +168,5 @@ public interface IIngredient { * @return internal item */ public Object getInternal(); + } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java index c295408..2419e0b 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java @@ -65,6 +65,22 @@ public interface IItemStack extends IIngredient { @ZenSetter("displayName") public void setDisplayName(String name); + + /** + * Gets the max stack size for an item + * + * @return int max stack size + */ + @ZenGetter + public int getMaxStackSize(); + /** + * Sets the ItemStack max stack size. + * + * @param size the new max size + */ + @ZenSetter("maxStackSize") + public void setMaxStackSize(int size); + /** * Gets the item damage. Returns 0 if the item cannot be damaged. * diff --git a/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location b/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location index e47266f617293610ae03619893fdff136e92daaf..c21961140539ea32e6aa40d24261778af3e1389d 100644 GIT binary patch delta 60 zcmZo=Y-TiZ*x22uyoW(VN_E=v#gq5RF$9MOdFtz@W#*(>={sBLhZd(673+H?7Nw@> QyW}UA=BDPAOf>Tc0Cn;d{r~^~ delta 62 zcmZo>Y-Kca*x22uyoW(VN_E=v#gq5RF@%N&dFtz@W#*(>={sBLhZd(673&9=B items; private IData tag = null; private boolean wildcardSize; - + public MCItemStack(ItemStack itemStack) { - if (itemStack == null) throw new IllegalArgumentException("stack cannot be null"); - + if (itemStack == null) + throw new IllegalArgumentException("stack cannot be null"); + stack = itemStack.copy(); - items = Collections.singletonList(this); + items = Collections. singletonList(this); } - + public MCItemStack(ItemStack itemStack, boolean wildcardSize) { this(itemStack); - + this.wildcardSize = wildcardSize; } - + private MCItemStack(ItemStack itemStack, IData tag) { - if (itemStack == null) throw new IllegalArgumentException("stack cannot be null"); - + if (itemStack == null) + throw new IllegalArgumentException("stack cannot be null"); + stack = itemStack; - items = Collections.singletonList(this); + items = Collections. singletonList(this); this.tag = tag; } - + private MCItemStack(ItemStack itemStack, IData tag, boolean wildcardSize) { stack = itemStack; - items = Collections.singletonList(this); + items = Collections. singletonList(this); this.tag = tag; this.wildcardSize = wildcardSize; } @Override public IItemDefinition getDefinition() { - return new MCItemDefinition( - Item.itemRegistry.getNameForObject(stack.getItem()), - stack.getItem()); + return new MCItemDefinition(Item.itemRegistry.getNameForObject(stack.getItem()), stack.getItem()); } @Override @@ -92,12 +95,23 @@ public class MCItemStack implements IItemStack { public String getDisplayName() { return stack.getDisplayName(); } - + @Override public void setDisplayName(String name) { MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name)); } + @Override + public int getMaxStackSize() { + return stack.getMaxStackSize(); + } + + @Override + public void setMaxStackSize(int size) { + System.out.println("changing stack size"); + MineTweakerAPI.apply(new SetStackSizeAction((ItemStack) getInternal(), size)); + } + @Override public int getDamage() { return stack.getItemDamage(); @@ -109,7 +123,7 @@ public class MCItemStack implements IItemStack { if (stack.stackTagCompound == null) { return DataMap.EMPTY; } - + tag = NBTConverter.from(stack.stackTagCompound, true); } return tag; @@ -119,7 +133,7 @@ public class MCItemStack implements IItemStack { public int getMaxDamage() { return stack.getMaxDamage(); } - + @Override public ILiquidStack getLiquid() { FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(stack); @@ -149,7 +163,7 @@ public class MCItemStack implements IItemStack { return new MCItemStack(result, tag); } } - + @Override public IItemStack anyAmount() { ItemStack result = new ItemStack(stack.getItem(), 1, stack.getItemDamage()); @@ -179,12 +193,12 @@ public class MCItemStack implements IItemStack { public IItemStack updateTag(IData tagUpdate) { if (tag == null) { if (stack.stackTagCompound == null) { - return withTag(tagUpdate); + return withTag(tagUpdate); } - + tag = NBTConverter.from(stack.stackTagCompound, true); } - + IData updated = tag.update(tagUpdate); return withTag(updated); } @@ -203,7 +217,7 @@ public class MCItemStack implements IItemStack { public List getItems() { return items; } - + @Override public List getLiquids() { return Collections.emptyList(); @@ -213,12 +227,12 @@ public class MCItemStack implements IItemStack { public IItemStack amount(int amount) { return withAmount(amount); } - + @Override public WeightedItemStack percent(float chance) { return new WeightedItemStack(this, chance * 0.01f); } - + @Override public WeightedItemStack weight(float chance) { return new WeightedItemStack(this, chance); @@ -238,7 +252,7 @@ public class MCItemStack implements IItemStack { public IIngredient marked(String mark) { return new IngredientItem(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS); } - + @Override public IIngredient or(IIngredient ingredient) { return new IngredientOr(this, ingredient); @@ -247,13 +261,9 @@ public class MCItemStack implements IItemStack { @Override public boolean matches(IItemStack item) { ItemStack internal = getItemStack(item); - return internal.getItem() == stack.getItem() - && (wildcardSize || internal.stackSize >= stack.stackSize) - && (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE - || stack.getItemDamage() == internal.getItemDamage() - || (!stack.getHasSubtypes() && !stack.getItem().isDamageable())); + return internal.getItem() == stack.getItem() && (wildcardSize || internal.stackSize >= stack.stackSize) && (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack.getItemDamage() == internal.getItemDamage() || (!stack.getHasSubtypes() && !stack.getItem().isDamageable())); } - + @Override public boolean matches(ILiquidStack liquid) { return false; @@ -262,7 +272,8 @@ public class MCItemStack implements IItemStack { @Override public boolean contains(IIngredient ingredient) { List iitems = ingredient.getItems(); - if (iitems == null || iitems.size() != 1) return false; + if (iitems == null || iitems.size() != 1) + return false; return matches(iitems.get(0)); } @@ -289,28 +300,27 @@ public class MCItemStack implements IItemStack { return new MCItemBlock(stack); } } - + @Override public List getOres() { List result = new ArrayList(); - + for (String key : OreDictionary.getOreNames()) { for (ItemStack is : OreDictionary.getOres(key)) { - if (is.getItem() == stack.getItem() - && (is.getItemDamage() == OreDictionary.WILDCARD_VALUE || is.getItemDamage() == stack.getItemDamage())) { + if (is.getItem() == stack.getItem() && (is.getItemDamage() == OreDictionary.WILDCARD_VALUE || is.getItemDamage() == stack.getItemDamage())) { result.add(MineTweakerAPI.oreDict.get(key)); break; } } } - + return result; } - + // ############################# // ### Object implementation ### // ############################# - + @Override public int hashCode() { int hash = 7; @@ -331,14 +341,19 @@ public class MCItemStack implements IItemStack { return false; } final MCItemStack other = (MCItemStack) obj; - if (this.stack.getItem() != other.stack.getItem()) return false; - if (this.stack.getItemDamage() != other.stack.getItemDamage()) return false; - if (this.stack.stackSize != other.stack.stackSize) return false; - if (this.stack.stackTagCompound != other.stack.stackTagCompound && (this.stack == null || this.stack.equals(other.stack))) return false; - if (this.wildcardSize != other.wildcardSize) return false; + if (this.stack.getItem() != other.stack.getItem()) + return false; + if (this.stack.getItemDamage() != other.stack.getItemDamage()) + return false; + if (this.stack.stackSize != other.stack.stackSize) + return false; + if (this.stack.stackTagCompound != other.stack.stackTagCompound && (this.stack == null || this.stack.equals(other.stack))) + return false; + if (this.wildcardSize != other.wildcardSize) + return false; return true; } - + @Override public String toString() { StringBuilder result = new StringBuilder(); @@ -357,7 +372,8 @@ public class MCItemStack implements IItemStack { result.append(NBTConverter.from(stack.getTagCompound(), wildcardSize).toString()); result.append(")"); } - + return result.toString(); } + }