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 8e46da2..2f9c89b 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java @@ -8,9 +8,11 @@ package minetweaker.api.oredict; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; +import stanhebben.zenscript.annotations.OperatorType; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; +import stanhebben.zenscript.annotations.ZenOperator; /** * @@ -33,7 +35,7 @@ public interface IOreDictEntry extends IIngredient { @ZenMethod public void remove(IItemStack item); - @ZenMethod + @ZenOperator(OperatorType.CONTAINS) public boolean contains(IItemStack item); @ZenMethod diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java index 976969d..7b02c12 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java @@ -60,6 +60,7 @@ public class MCServer extends AbstractServer { if (commandSender instanceof EntityPlayer) { return MineTweakerMC.getIPlayer((EntityPlayer) commandSender); } else { + System.out.println("No such player: " + commandSender); return null; } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/MCServer.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/MCServer.java index 08817af..4c6e952 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/MCServer.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/MCServer.java @@ -10,7 +10,6 @@ import java.util.Arrays; import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; import minetweaker.api.server.AbstractServer; diff --git a/MineTweaker3-MC172-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Amplifabricator.java b/MineTweaker3-MC172-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Amplifabricator.java index f450228..64ecb5d 100644 --- a/MineTweaker3-MC172-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Amplifabricator.java +++ b/MineTweaker3-MC172-Mod-GregTech/src/main/java/minetweaker/mods/gregtech/machines/Amplifabricator.java @@ -18,6 +18,13 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenClass("mods.gregtech.Amplifabricator") @ModOnly(MOD_ID) public class Amplifabricator { + /** + * Adds an amplifier. + * + * @param item amplifier item + * @param durationTicks duration in ticks + * @param amount amplification amount + */ @ZenMethod public static void addAmplifier(IItemStack item, int durationTicks, int amount) { MineTweakerAPI.apply(new AddAmplifierAction(item, durationTicks, amount)); diff --git a/MineTweaker3-Web/about.html b/MineTweaker3-Web/about.html index 7534aae..fa1b8c4 100644 --- a/MineTweaker3-Web/about.html +++ b/MineTweaker3-Web/about.html @@ -41,6 +41,7 @@