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 e47266f..c219611 100644 Binary files a/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location and b/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location differ diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java index b75d937..7880546 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java @@ -1,7 +1,5 @@ package minetweaker.mc1710; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.event.PlayerCraftedEvent; @@ -13,6 +11,8 @@ import minetweaker.api.player.IPlayer; import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; import minetweaker.mc1710.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; /** * @@ -23,40 +23,34 @@ public class FMLEventHandler { public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent ev) { if (ev.player instanceof EntityPlayerMP) { EntityPlayerMP player = (EntityPlayerMP) ev.player; - MineTweakerMod.NETWORK.sendTo( - new MineTweakerLoadScriptsPacket(MineTweakerAPI.tweaker.getScriptData()), - player); + MineTweakerMod.NETWORK.sendTo(new MineTweakerLoadScriptsPacket(MineTweakerAPI.tweaker.getScriptData()), player); } - + MineTweakerImplementationAPI.events.publishPlayerLoggedIn(new PlayerLoggedInEvent(MineTweakerMC.getIPlayer(ev.player))); } - + @SubscribeEvent public void onPlayerItemCrafted(PlayerEvent.ItemCraftedEvent ev) { IPlayer iPlayer = MineTweakerMC.getIPlayer(ev.player); if (MineTweakerMod.INSTANCE.recipes.hasTransformerRecipes()) { MineTweakerMod.INSTANCE.recipes.applyTransformations(MCCraftingInventory.get(ev.craftMatrix, ev.player), iPlayer); } - + if (MineTweakerImplementationAPI.events.hasPlayerCrafted()) { - MineTweakerImplementationAPI.events.publishPlayerCrafted(new PlayerCraftedEvent( - iPlayer, - MineTweakerMC.getIItemStack(ev.crafting), - MCCraftingInventory.get(ev.craftMatrix, ev.player))); + MineTweakerImplementationAPI.events.publishPlayerCrafted(new PlayerCraftedEvent(iPlayer, MineTweakerMC.getIItemStack(ev.crafting), MCCraftingInventory.get(ev.craftMatrix, ev.player))); } } - + @SubscribeEvent public void onPlayerItemSmelted(PlayerEvent.ItemSmeltedEvent ev) { if (MineTweakerImplementationAPI.events.hasPlayerSmelted()) { - MineTweakerImplementationAPI.events.publishPlayerSmelted(new PlayerSmeltedEvent( - MineTweakerMC.getIPlayer(ev.player), - MineTweakerMC.getIItemStack(ev.smelting))); + MineTweakerImplementationAPI.events.publishPlayerSmelted(new PlayerSmeltedEvent(MineTweakerMC.getIPlayer(ev.player), MineTweakerMC.getIItemStack(ev.smelting))); } } - + @SubscribeEvent public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent ev) { MineTweakerImplementationAPI.events.publishPlayerLoggedOut(new PlayerLoggedOutEvent(MineTweakerMC.getIPlayer(ev.player))); } + } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java new file mode 100644 index 0000000..d0a64c8 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java @@ -0,0 +1,61 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +package minetweaker.mc1710.actions; + +import minetweaker.IUndoableAction; +import net.minecraft.item.ItemStack; + +/** + * + * @author Jared + */ +public class SetStackSizeAction implements IUndoableAction { + + private final ItemStack stack; + private final int size; + private final int oldSize; + + public SetStackSizeAction(ItemStack stack, int size) { + this.stack = stack; + this.size = size; + this.oldSize = stack.getMaxStackSize(); + } + + @Override + public void apply() { + set(stack, size); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + set(stack, oldSize); + } + + @Override + public String describe() { + return "Setting max stack size of " + stack.getDisplayName() + " to " + size; + } + + @Override + public String describeUndo() { + return "Reverting max stack size of " + stack.getDisplayName() + " to " + oldSize; + } + + private static void set(ItemStack stack, int size) { + stack.getItem().setMaxStackSize(size); + } + + @Override + public Object getOverrideKey() { + return null; + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java index 2c89925..ffdf6a5 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java @@ -6,14 +6,15 @@ package minetweaker.mc1710.item; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; + import java.util.ArrayList; import java.util.Collections; import java.util.List; + import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlock; import minetweaker.api.data.DataMap; -import minetweaker.mc1710.data.NBTConverter; -import minetweaker.mc1710.liquid.MCLiquidStack; import minetweaker.api.data.IData; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; @@ -24,11 +25,13 @@ import minetweaker.api.item.IngredientItem; import minetweaker.api.item.IngredientOr; import minetweaker.api.item.WeightedItemStack; import minetweaker.api.liquid.ILiquidStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; +import minetweaker.mc1710.actions.SetStackSizeAction; import minetweaker.mc1710.actions.SetTranslationAction; import minetweaker.mc1710.block.MCItemBlock; +import minetweaker.mc1710.data.NBTConverter; +import minetweaker.mc1710.liquid.MCLiquidStack; import minetweaker.util.ArrayUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -47,40 +50,40 @@ public class MCItemStack implements IItemStack { private final List 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(); } + }