From e43d4662f91cc1f98adfbb7a7b812df5f4ef7762 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 9 May 2016 11:46:39 +0200 Subject: [PATCH] Minetweaker / 327 --- .../api/oredict/IOreDictEntry.java | 9 +++- .../mc1710/oredict/MCOreDictEntry.java | 50 ++++++++++++++----- .../mc18/oredict/MCOreDictEntry.java | 26 ++++++++++ .../mc19/oredict/MCOreDictEntry.java | 26 ++++++++++ 4 files changed, 97 insertions(+), 14 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java index 3a34a68..ae9449f 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java @@ -32,13 +32,20 @@ public interface IOreDictEntry extends IIngredient { @ZenMethod public void add(IItemStack item); + @ZenMethod + public void add(IItemStack... items); + @ZenMethod public void addAll(IOreDictEntry entry); @ZenMethod public void remove(IItemStack item); - @ZenOperator(OperatorType.CONTAINS) + @ZenMethod + public void remove(IItemStack... items); + + + @ZenOperator(OperatorType.CONTAINS) public boolean contains(IItemStack item); @ZenMethod diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java index 19297da..5009b76 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java @@ -6,28 +6,25 @@ package minetweaker.mc1710.oredict; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; -import minetweaker.mc1710.util.MineTweakerHacks; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemCondition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IItemTransformer; -import minetweaker.api.item.IngredientOr; -import minetweaker.api.item.IngredientStack; +import minetweaker.api.item.*; import minetweaker.api.liquid.ILiquidStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.oredict.IngredientOreDict; import minetweaker.api.player.IPlayer; +import minetweaker.mc1710.util.MineTweakerHacks; import minetweaker.util.ArrayUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; + /** * * @author Stan @@ -68,7 +65,17 @@ public class MCOreDictEntry implements IOreDictEntry { } } - @Override + @Override + public void add(IItemStack... items) { + for(IItemStack item : items){ + ItemStack stack = getItemStack(item); + if (stack != null) { + MineTweakerAPI.apply(new ActionAddItem(id, stack)); + } + } + } + + @Override public IItemStack getFirstItem() { List items = OreDictionary.getOres(id); if (items.isEmpty()) { @@ -101,6 +108,23 @@ public class MCOreDictEntry implements IOreDictEntry { } } + @Override + public void remove(IItemStack... items) { + for(IItemStack item : items){ + ItemStack result = null; + for (ItemStack itemStack : OreDictionary.getOres(id)) { + if (item.matches(getIItemStackWildcardSize(itemStack))) { + result = itemStack; + break; + } + } + + if (result != null) { + MineTweakerAPI.apply(new ActionRemoveItem(id, result)); + } + } + } + @Override public boolean contains(IItemStack item) { for (ItemStack itemStack : OreDictionary.getOres(id)) { diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java index fb48303..8aedf02 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java @@ -67,6 +67,16 @@ public class MCOreDictEntry implements IOreDictEntry { } } + @Override + public void add(IItemStack... items) { + for(IItemStack item : items){ + ItemStack stack = getItemStack(item); + if (stack != null) { + MineTweakerAPI.apply(new ActionAddItem(id, stack)); + } + } + } + @Override public void addAll(IOreDictEntry entry) { if (entry instanceof MCOreDictEntry) { @@ -90,6 +100,22 @@ public class MCOreDictEntry implements IOreDictEntry { MineTweakerAPI.apply(new ActionRemoveItem(id, result)); } } + @Override + public void remove(IItemStack... items) { + for(IItemStack item : items){ + ItemStack result = null; + for (ItemStack itemStack : OreDictionary.getOres(id)) { + if (item.matches(getIItemStackWildcardSize(itemStack))) { + result = itemStack; + break; + } + } + + if (result != null) { + MineTweakerAPI.apply(new ActionRemoveItem(id, result)); + } + } + } @Override public boolean contains(IItemStack item) { diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java index 98a13ca..9f49cd6 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java @@ -67,6 +67,16 @@ public class MCOreDictEntry implements IOreDictEntry { } } + @Override + public void add(IItemStack... items) { + for(IItemStack item : items){ + ItemStack stack = getItemStack(item); + if (stack != null) { + MineTweakerAPI.apply(new ActionAddItem(id, stack)); + } + } + } + @Override public void addAll(IOreDictEntry entry) { if (entry instanceof MCOreDictEntry) { @@ -90,6 +100,22 @@ public class MCOreDictEntry implements IOreDictEntry { MineTweakerAPI.apply(new ActionRemoveItem(id, result)); } } + @Override + public void remove(IItemStack... items) { + for(IItemStack item : items){ + ItemStack result = null; + for (ItemStack itemStack : OreDictionary.getOres(id)) { + if (item.matches(getIItemStackWildcardSize(itemStack))) { + result = itemStack; + break; + } + } + + if (result != null) { + MineTweakerAPI.apply(new ActionRemoveItem(id, result)); + } + } + } @Override public boolean contains(IItemStack item) {