From f92481a47d7c192905bc6aca251008e6890d4605 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 9 May 2016 14:01:09 +0200 Subject: [PATCH] Tests for #21 --- .../api/oredict/IOreDictEntry.java | 4 ++-- .../minetweaker/api/trade/ITradeManager.java | 7 ++++++ .../api/vanilla/IVillagerRegistry.java | 23 +++++++++++++++++++ .../mc1710/oredict/MCOreDictEntry.java | 4 ++-- .../minetweaker/mc1710/server/MCServer.java | 2 +- .../mc18/oredict/MCOreDictEntry.java | 4 ++-- .../minetweaker/mc18/server/MCServer.java | 2 +- .../mc19/oredict/MCOreDictEntry.java | 4 ++-- .../minetweaker/mc19/server/MCServer.java | 2 +- 9 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/trade/ITradeManager.java create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/vanilla/IVillagerRegistry.java 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 ae9449f..a0f1259 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java @@ -33,7 +33,7 @@ public interface IOreDictEntry extends IIngredient { public void add(IItemStack item); @ZenMethod - public void add(IItemStack... items); + public void addItems(IItemStack[] items); @ZenMethod public void addAll(IOreDictEntry entry); @@ -42,7 +42,7 @@ public interface IOreDictEntry extends IIngredient { public void remove(IItemStack item); @ZenMethod - public void remove(IItemStack... items); + public void removeItems(IItemStack[] items); @ZenOperator(OperatorType.CONTAINS) diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/trade/ITradeManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/trade/ITradeManager.java new file mode 100644 index 0000000..4daf114 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/trade/ITradeManager.java @@ -0,0 +1,7 @@ +package minetweaker.api.trade; + +/** + * Created by Jared on 5/9/2016. + */ +public class ITradeManager { +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/IVillagerRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/IVillagerRegistry.java new file mode 100644 index 0000000..5e959fd --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/IVillagerRegistry.java @@ -0,0 +1,23 @@ +package minetweaker.api.vanilla; + +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.WeightedItemStack; +import stanhebben.zenscript.annotations.ZenGetter; +import stanhebben.zenscript.annotations.ZenMethod; + +import java.util.List; + +/** + * Created by Jared on 5/9/2016. + */ +public interface IVillagerRegistry { + + @ZenMethod + public void addSeed(WeightedItemStack item); + + @ZenMethod + public void removeSeed(IIngredient item); + + @ZenGetter("seeds") + public List getSeeds(); +} 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 5009b76..3abda46 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 @@ -66,7 +66,7 @@ public class MCOreDictEntry implements IOreDictEntry { } @Override - public void add(IItemStack... items) { + public void addItems(IItemStack[] items) { for(IItemStack item : items){ ItemStack stack = getItemStack(item); if (stack != null) { @@ -109,7 +109,7 @@ public class MCOreDictEntry implements IOreDictEntry { } @Override - public void remove(IItemStack... items) { + public void removeItems(IItemStack[] items) { for(IItemStack item : items){ ItemStack result = null; for (ItemStack itemStack : OreDictionary.getOres(id)) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java index 272bda4..ceba492 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java @@ -178,7 +178,7 @@ public class MCServer extends AbstractServer { @Override public String describeUndo() { - return ""; + return "tried to remove command: " + command.getCommandName() + " failed. THIS IS NOT AN ERROR!"; } @Override 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 8aedf02..afaf893 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 @@ -68,7 +68,7 @@ public class MCOreDictEntry implements IOreDictEntry { } @Override - public void add(IItemStack... items) { + public void addItems(IItemStack[] items) { for(IItemStack item : items){ ItemStack stack = getItemStack(item); if (stack != null) { @@ -101,7 +101,7 @@ public class MCOreDictEntry implements IOreDictEntry { } } @Override - public void remove(IItemStack... items) { + public void removeItems(IItemStack[] items) { for(IItemStack item : items){ ItemStack result = null; for (ItemStack itemStack : OreDictionary.getOres(id)) { diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java index 6066e1b..295d521 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java @@ -187,7 +187,7 @@ public class MCServer extends AbstractServer { @Override public String describeUndo() { - return ""; + return "tried to remove command: " + command.getCommandName() + " failed. THIS IS NOT AN ERROR!"; } @Override 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 9f49cd6..2e8b146 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 @@ -68,7 +68,7 @@ public class MCOreDictEntry implements IOreDictEntry { } @Override - public void add(IItemStack... items) { + public void addItems(IItemStack[] items) { for(IItemStack item : items){ ItemStack stack = getItemStack(item); if (stack != null) { @@ -101,7 +101,7 @@ public class MCOreDictEntry implements IOreDictEntry { } } @Override - public void remove(IItemStack... items) { + public void removeItems(IItemStack[] items) { for(IItemStack item : items){ ItemStack result = null; for (ItemStack itemStack : OreDictionary.getOres(id)) { diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/server/MCServer.java b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/server/MCServer.java index e07f2e5..c04a2ff 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/server/MCServer.java +++ b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/server/MCServer.java @@ -185,7 +185,7 @@ public class MCServer extends AbstractServer { @Override public String describeUndo() { - return ""; + return "tried to remove command: " + command.getCommandName() + " failed. THIS IS NOT AN ERROR!"; } @Override