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 48f5b5b..dc1ae48 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java @@ -1,6 +1,7 @@ package minetweaker.api.item; import java.util.List; +import minetweaker.api.player.IPlayer; import stanhebben.zenscript.annotations.OperatorType; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; @@ -118,13 +119,14 @@ public interface IIngredient { public boolean contains(IIngredient ingredient); /** - * Applies transformations, if any, to the given item. + * Applies transformations after crafting, if any, to the given item. * * @param item item to transform + * @param byPlayer player performing the crafting operation * @return transformed item */ @ZenMethod - public IItemStack applyTransform(IItemStack item); + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer); /** * Checks if this ingredient has (or could have) any transformatiosns. diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java index 48e954d..ab4986f 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java @@ -1,11 +1,12 @@ package minetweaker.api.item; +import minetweaker.api.player.IPlayer; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; /** - * An item transformer modifies an item stack. Used to apply damage, grab multiple - * items, change NBT tags, replace the item with something else - or whatever + * An item transformer modifies an item stack after crafting. Used to apply damage, + * grab multiple items, change NBT tags, replace the item with something else - or whatever * else you'd want to happen to the input stack. * * @author Stan Hebben @@ -17,8 +18,9 @@ public interface IItemTransformer { * or return an entirely new one. * * @param item input item + * @param byPlayer player that performs the crafting * @return output item */ @ZenMethod - public IItemStack transform(IItemStack item); + public IItemStack transform(IItemStack item, IPlayer byPlayer); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java index f92a6e8..eade319 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java @@ -1,6 +1,7 @@ package minetweaker.api.item; import java.util.List; +import minetweaker.api.player.IPlayer; import minetweaker.util.ArrayUtil; /** @@ -66,7 +67,7 @@ public class IngredientAny implements IIngredient { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { return item; } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java index 860979f..658e1be 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java @@ -1,6 +1,7 @@ package minetweaker.api.item; import java.util.List; +import minetweaker.api.player.IPlayer; import minetweaker.util.ArrayUtil; /** @@ -82,9 +83,9 @@ public class IngredientAnyAdvanced implements IIngredient { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { for (IItemTransformer transform : transformers) { - item = transform.transform(item); + item = transform.transform(item, byPlayer); } return item; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java index dd75a1a..d6ff1a7 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java @@ -2,6 +2,7 @@ package minetweaker.api.item; import java.util.Collections; import java.util.List; +import minetweaker.api.player.IPlayer; import minetweaker.util.ArrayUtil; /** @@ -87,9 +88,9 @@ public class IngredientItem implements IIngredient { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { for (IItemTransformer transform : transformers) { - item = transform.transform(item); + item = transform.transform(item, byPlayer); } return item; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientOr.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientOr.java index 5b8be93..4508f83 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientOr.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientOr.java @@ -8,6 +8,7 @@ package minetweaker.api.item; import java.util.ArrayList; import java.util.List; +import minetweaker.api.player.IPlayer; import minetweaker.util.ArrayUtil; /** @@ -108,9 +109,9 @@ public class IngredientOr implements IIngredient { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { for (IItemTransformer transformer : transformers) { - item = transformer.transform(item); + item = transformer.transform(item, byPlayer); } return item; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java index 92d4d78..89296fe 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java @@ -1,6 +1,7 @@ package minetweaker.api.item; import java.util.List; +import minetweaker.api.player.IPlayer; /** * Contains an ingredient stack. Is an ingredient with a specific stack size @@ -68,8 +69,8 @@ public class IngredientStack implements IIngredient { } @Override - public IItemStack applyTransform(IItemStack item) { - return ingredient.applyTransform(item); + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { + return ingredient.applyTransform(item, byPlayer); } @Override diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java index 196f7c4..9a39053 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java @@ -1,5 +1,7 @@ package minetweaker.api.item; +import minetweaker.api.player.IPlayer; +import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; @@ -21,7 +23,7 @@ public class IngredientTransform { public static IIngredient reuse(IIngredient ingredient) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { + public IItemStack transform(IItemStack item, IPlayer byPlayer) { return item.withAmount(item.getAmount() + 1); } }); @@ -38,7 +40,7 @@ public class IngredientTransform { public static IIngredient transformDamage(IIngredient ingredient) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { + public IItemStack transform(IItemStack item, IPlayer byPlayer) { int newDamage = item.getDamage() + 1; if (newDamage >= item.getMaxDamage()) { return item.withAmount(item.getAmount()).withDamage(0); @@ -63,7 +65,8 @@ public class IngredientTransform { public static IIngredient transformDamage(IIngredient ingredient, final int damage) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { + public IItemStack transform(IItemStack item, IPlayer byPlayer) { + System.out.println("Transform damage: " + item); int newDamage = item.getDamage() + damage; if (newDamage >= item.getMaxDamage()) { return item.withAmount(item.getAmount()).withDamage(0); @@ -86,8 +89,13 @@ public class IngredientTransform { public static IIngredient transformReplace(IIngredient ingredient, final IItemStack withItem) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { - return withItem.withAmount(withItem.getAmount() + 1); + public IItemStack transform(IItemStack item, IPlayer byPlayer) { + if (item.getAmount() > 1) { + byPlayer.give(withItem); + return item; + } else { + return withItem.withAmount(withItem.getAmount() + 1); + } } }); } @@ -105,9 +113,40 @@ public class IngredientTransform { public static IIngredient transformConsume(IIngredient ingredient, final int amount) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { + public IItemStack transform(IItemStack item, IPlayer byPlayer) { return item.withAmount(Math.max(item.getAmount() - amount, 0) + 1); } }); } + + /** + * Makes sure there is no return value. + * + * @param ingredient + * @return + */ + @ZenMethod + public static IIngredient noReturn(IIngredient ingredient) { + return ingredient.transform(new IItemTransformer() { + @Override + public IItemStack transform(IItemStack item, IPlayer byPlayer) { + return null; + } + }); + } + + @ZenMethod + public static IIngredient giveBack(IIngredient ingredient, @Optional final IItemStack givenItem) { + return ingredient.transform(new IItemTransformer() { + @Override + public IItemStack transform(IItemStack item, IPlayer byPlayer) { + if (givenItem == null) { + byPlayer.give(item); + } else { + byPlayer.give(givenItem); + } + return null; + } + }); + } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java index 093b2bc..ffc22c1 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java @@ -13,6 +13,7 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemTransformer; import minetweaker.api.item.IngredientOr; import minetweaker.api.item.IngredientStack; +import minetweaker.api.player.IPlayer; import minetweaker.util.ArrayUtil; /** @@ -93,9 +94,9 @@ public class IngredientOreDict implements IIngredient { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { for (IItemTransformer transformer : transformers) { - item = transformer.transform(item); + item = transformer.transform(item, byPlayer); } return item; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/player/IPlayer.java b/MineTweaker3-API/src/main/java/minetweaker/api/player/IPlayer.java index ce7436e..7efd1ef 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/player/IPlayer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/player/IPlayer.java @@ -58,6 +58,9 @@ public interface IPlayer { @ZenGetter("adventure") public boolean isAdventure(); + @ZenMethod + public void give(IItemStack stack); + // not an exposed method. risks abuse public void openBrowser(String url); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingRecipe.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingRecipe.java index 058bf5b..abe9997 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingRecipe.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingRecipe.java @@ -7,6 +7,7 @@ package minetweaker.api.recipes; import minetweaker.api.item.IItemStack; +import minetweaker.api.player.IPlayer; import stanhebben.zenscript.annotations.ZenClass; /** @@ -21,5 +22,5 @@ public interface ICraftingRecipe { public boolean hasTransformers(); - public void applyTransformers(ICraftingInventory inventory); + public void applyTransformers(ICraftingInventory inventory, IPlayer byPlayer); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapedRecipe.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapedRecipe.java index 2a6ebd6..2f65d88 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapedRecipe.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapedRecipe.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Map; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; +import minetweaker.api.player.IPlayer; /** * @@ -179,7 +180,7 @@ public class ShapedRecipe implements ICraftingRecipe { } @Override - public void applyTransformers(ICraftingInventory inventory) { + public void applyTransformers(ICraftingInventory inventory, IPlayer byPlayer) { IItemStack[] stacks = new IItemStack[ingredients.length]; for (int i = 0; i <= inventory.getWidth() - width; i++) { @@ -188,11 +189,12 @@ public class ShapedRecipe implements ICraftingRecipe { IItemStack item = inventory.getStack(posx[k] + i, posy[k] + j); if (item == null) continue out; - if (!ingredients[k].matches(item)) continue out; + if (!ingredients[k].matches(item)) + continue out; stacks[k] = item; } - doRecipeTransformers(inventory, stacks, i, j, false); + doRecipeTransformers(inventory, stacks, i, j, false, byPlayer); return; } } @@ -208,7 +210,7 @@ public class ShapedRecipe implements ICraftingRecipe { stacks[k] = item; } - doRecipeTransformers(inventory, stacks, i, j, true); + doRecipeTransformers(inventory, stacks, i, j, true, byPlayer); return; } } @@ -264,9 +266,10 @@ public class ShapedRecipe implements ICraftingRecipe { ICraftingInventory inventory, IItemStack[] stacks, int offx, int offy, - boolean mirrored) { + boolean mirrored, + IPlayer byPlayer) { for (int i = 0; i < ingredients.length; i++) { - IItemStack transformed = ingredients[i].applyTransform(stacks[i]); + IItemStack transformed = ingredients[i].applyTransform(stacks[i], byPlayer); if (transformed != stacks[i]) { if (mirrored) { inventory.setStack( diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapelessRecipe.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapelessRecipe.java index 6a6552a..88c8522 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapelessRecipe.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapelessRecipe.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Map; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; +import minetweaker.api.player.IPlayer; /** * @@ -67,12 +68,12 @@ public class ShapelessRecipe implements ICraftingRecipe { } @Override - public void applyTransformers(ICraftingInventory inventory) { + public void applyTransformers(ICraftingInventory inventory, IPlayer byPlayer) { RecipeMatching matching = matchShapeless(ingredients, inventory); for (int i = 0; i < ingredients.length; i++) { IIngredient ingredient = ingredients[i]; - IItemStack transformed = ingredient.applyTransform(matching.inputs[i]); + IItemStack transformed = ingredient.applyTransform(matching.inputs[i], byPlayer); if (transformed != matching.inputs[i]) { inventory.setStack(matching.indices[i], transformed); } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java index e781767..4e0df29 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MTCraftingHandler.java @@ -11,6 +11,7 @@ import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.event.PlayerCraftedEvent; import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; import minetweaker.mc164.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -23,13 +24,15 @@ import net.minecraft.item.ItemStack; public class MTCraftingHandler implements ICraftingHandler { @Override public void onCrafting(EntityPlayer player, ItemStack crafting, IInventory craftMatrix) { + IPlayer iplayer = MineTweakerMC.getIPlayer(player); + if (MineTweakerMod.INSTANCE.recipes.hasTransformerRecipes()) { - MineTweakerMod.INSTANCE.recipes.applyTransformations(MCCraftingInventory.get(craftMatrix, player)); + MineTweakerMod.INSTANCE.recipes.applyTransformations(MCCraftingInventory.get(craftMatrix, player), iplayer); } if (MineTweakerImplementationAPI.events.hasPlayerCrafted()) { MineTweakerImplementationAPI.events.publishPlayerCrafted(new PlayerCraftedEvent( - MineTweakerMC.getIPlayer(player), + iplayer, MineTweakerMC.getIItemStack(crafting), MCCraftingInventory.get(craftMatrix, player))); } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java index c1f73d4..9bc56f1 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java @@ -24,6 +24,7 @@ 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.player.IPlayer; import minetweaker.mc164.actions.SetTranslationAction; import minetweaker.mc164.block.MCItemBlock; import minetweaker.util.ArrayUtil; @@ -241,7 +242,7 @@ public class MCItemStack implements IItemStack { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { return item; } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java index 59aa10e..1373d84 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java @@ -21,6 +21,7 @@ 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.util.ArrayUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -168,7 +169,7 @@ public class MCOreDictEntry implements IOreDictEntry { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { return item; } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java index 99835c2..f8fa9a9 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java @@ -110,6 +110,11 @@ public class MCPlayer implements IPlayer { MineTweakerMod.INSTANCE.openBrowser(player.username, url); } } + + @Override + public void give(IItemStack stack) { + player.inventory.addItemStackToInventory(MineTweakerMC.getItemStack(stack).copy()); + } @Override public int hashCode() { diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java index 95c8355..dfd5563 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java @@ -12,6 +12,7 @@ import minetweaker.api.item.IItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; +import minetweaker.api.player.IPlayer; import minetweaker.api.recipes.ICraftingInventory; import minetweaker.api.recipes.ICraftingRecipe; import minetweaker.api.recipes.IRecipeFunction; @@ -44,10 +45,10 @@ public class MCRecipeManager implements IRecipeManager { return transformerRecipes.size() > 0; } - public void applyTransformations(ICraftingInventory inventory) { + public void applyTransformations(ICraftingInventory inventory, IPlayer player) { for (ICraftingRecipe recipe : transformerRecipes) { if (recipe.matches(inventory)) { - recipe.applyTransformers(inventory); + recipe.applyTransformers(inventory, player); return; } } @@ -151,7 +152,7 @@ public class MCRecipeManager implements IRecipeManager { } } } else { - if (recipe instanceof ShapedRecipe) { + if (recipe instanceof ShapedRecipes) { } else if (recipe instanceof ShapedOreRecipe) { diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/ServerPlayer.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/ServerPlayer.java index 53dbabd..04b0c73 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/ServerPlayer.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/ServerPlayer.java @@ -105,4 +105,9 @@ public class ServerPlayer implements IPlayer { } } } + + @Override + public void give(IItemStack stack) { + + } } 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 f997754..b75d937 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java @@ -9,6 +9,7 @@ import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; import minetweaker.mc1710.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayerMP; @@ -32,13 +33,14 @@ public class FMLEventHandler { @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)); + MineTweakerMod.INSTANCE.recipes.applyTransformations(MCCraftingInventory.get(ev.craftMatrix, ev.player), iPlayer); } if (MineTweakerImplementationAPI.events.hasPlayerCrafted()) { MineTweakerImplementationAPI.events.publishPlayerCrafted(new PlayerCraftedEvent( - MineTweakerMC.getIPlayer(ev.player), + iPlayer, MineTweakerMC.getIItemStack(ev.crafting), MCCraftingInventory.get(ev.craftMatrix, ev.player))); } 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 b5f50a3..eb4975b 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 @@ -24,6 +24,7 @@ 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.player.IPlayer; import minetweaker.mc1710.actions.SetTranslationAction; import minetweaker.mc1710.block.MCItemBlock; import minetweaker.util.ArrayUtil; @@ -240,7 +241,7 @@ public class MCItemStack implements IItemStack { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { return item; } 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 4d57511..3f17d3b 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 @@ -21,6 +21,7 @@ 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.util.ArrayUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -169,7 +170,7 @@ public class MCOreDictEntry implements IOreDictEntry { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { return item; } @@ -341,9 +342,8 @@ public class MCOreDictEntry implements IOreDictEntry { @Override public void apply() { - List ores = OreDictionary.getOres(idTarget); for (ItemStack stack : OreDictionary.getOres(idSource)) { - ores.add(stack); + OreDictionary.registerOre(idTarget, stack); } } @@ -354,9 +354,8 @@ public class MCOreDictEntry implements IOreDictEntry { @Override public void undo() { - List ores = OreDictionary.getOres(idTarget); for (ItemStack stack : OreDictionary.getOres(idSource)) { - ores.remove(stack); + OREDICT_CONTENTS.get(idTarget).remove(stack); } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java index 2445c0c..45f8261 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java @@ -128,4 +128,9 @@ public class MCPlayer implements IPlayer { hash = 23 * hash + (this.player != null ? this.player.hashCode() : 0); return hash; } + + @Override + public void give(IItemStack stack) { + player.inventory.addItemStackToInventory(MineTweakerMC.getItemStack(stack).copy()); + } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java index 07cd636..5740ab3 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java @@ -12,6 +12,7 @@ import minetweaker.api.item.IItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; +import minetweaker.api.player.IPlayer; import minetweaker.api.recipes.ICraftingInventory; import minetweaker.api.recipes.ICraftingRecipe; import minetweaker.api.recipes.IRecipeFunction; @@ -44,10 +45,10 @@ public class MCRecipeManager implements IRecipeManager { return transformerRecipes.size() > 0; } - public void applyTransformations(ICraftingInventory inventory) { + public void applyTransformations(ICraftingInventory inventory, IPlayer byPlayer) { for (ICraftingRecipe recipe : transformerRecipes) { if (recipe.matches(inventory)) { - recipe.applyTransformers(inventory); + recipe.applyTransformers(inventory, byPlayer); return; } } @@ -151,7 +152,7 @@ public class MCRecipeManager implements IRecipeManager { } } } else { - if (recipe instanceof ShapedRecipe) { + if (recipe instanceof ShapedRecipes) { } else if (recipe instanceof ShapedOreRecipe) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/ServerPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/ServerPlayer.java index fc5ddaf..0865db2 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/ServerPlayer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/ServerPlayer.java @@ -106,4 +106,9 @@ public class ServerPlayer implements IPlayer { } } } + + @Override + public void give(IItemStack stack) { + + } } diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java index 99647ce..864766a 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java @@ -11,6 +11,7 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemTransformer; +import minetweaker.api.player.IPlayer; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; @@ -45,7 +46,7 @@ public class IngredientExpansion { public static IIngredient transformIC2Discharge(IIngredient ingredient, final int amount) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { + public IItemStack transform(IItemStack item, IPlayer byPlayer) { return ItemExpansion.ic2Discharge(item, amount, 0).withAmount(item.getAmount() + 1); } }); diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java index 677ebe8..fb3cee9 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/FMLEventHandler.java @@ -9,6 +9,7 @@ import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; import minetweaker.mc172.network.MineTweakerLoadScriptsPacket; import minetweaker.mc172.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,14 +34,16 @@ public class FMLEventHandler { @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)); + MCCraftingInventory.get(ev.craftMatrix, ev.player), iPlayer); } if (MineTweakerImplementationAPI.events.hasPlayerCrafted()) { MineTweakerImplementationAPI.events.publishPlayerCrafted(new PlayerCraftedEvent( - MineTweakerMC.getIPlayer(ev.player), + iPlayer, MineTweakerMC.getIItemStack(ev.crafting), MCCraftingInventory.get(ev.craftMatrix, ev.player))); } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java index c45da2c..c850bfc 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java @@ -24,6 +24,7 @@ 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.player.IPlayer; import minetweaker.mc172.actions.SetTranslationAction; import minetweaker.mc172.block.MCItemBlock; import minetweaker.util.ArrayUtil; @@ -240,7 +241,7 @@ public class MCItemStack implements IItemStack { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { return item; } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/oredict/MCOreDictEntry.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/oredict/MCOreDictEntry.java index a5815e2..b6f6baf 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/oredict/MCOreDictEntry.java @@ -21,6 +21,7 @@ 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.util.ArrayUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -169,7 +170,7 @@ public class MCOreDictEntry implements IOreDictEntry { } @Override - public IItemStack applyTransform(IItemStack item) { + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { return item; } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java index cd70ab2..7884623 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/player/MCPlayer.java @@ -114,6 +114,11 @@ public class MCPlayer implements IPlayer { (EntityPlayerMP) player); } } + + @Override + public void give(IItemStack stack) { + player.inventory.addItemStackToInventory(MineTweakerMC.getItemStack(stack).copy()); + } @Override public boolean equals(Object other) { diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCRecipeManager.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCRecipeManager.java index d100f6d..6623a2b 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCRecipeManager.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/recipes/MCRecipeManager.java @@ -12,6 +12,7 @@ import minetweaker.api.item.IItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; +import minetweaker.api.player.IPlayer; import minetweaker.api.recipes.ICraftingInventory; import minetweaker.api.recipes.ICraftingRecipe; import minetweaker.api.recipes.IRecipeFunction; @@ -44,10 +45,10 @@ public class MCRecipeManager implements IRecipeManager { return transformerRecipes.size() > 0; } - public void applyTransformations(ICraftingInventory inventory) { + public void applyTransformations(ICraftingInventory inventory, IPlayer byPlayer) { for (ICraftingRecipe recipe : transformerRecipes) { if (recipe.matches(inventory)) { - recipe.applyTransformers(inventory); + recipe.applyTransformers(inventory, byPlayer); return; } } @@ -151,7 +152,7 @@ public class MCRecipeManager implements IRecipeManager { } } } else { - if (recipe instanceof ShapedRecipe) { + if (recipe instanceof ShapedRecipes) { } else if (recipe instanceof ShapedOreRecipe) { diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/ServerPlayer.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/ServerPlayer.java index 13526f5..124bd82 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/ServerPlayer.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/server/ServerPlayer.java @@ -106,4 +106,9 @@ public class ServerPlayer implements IPlayer { } } } + + @Override + public void give(IItemStack stack) { + + } } diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java index 99647ce..864766a 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java @@ -11,6 +11,7 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemTransformer; +import minetweaker.api.player.IPlayer; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; @@ -45,7 +46,7 @@ public class IngredientExpansion { public static IIngredient transformIC2Discharge(IIngredient ingredient, final int amount) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { + public IItemStack transform(IItemStack item, IPlayer byPlayer) { return ItemExpansion.ic2Discharge(item, amount, 0).withAmount(item.getAmount() + 1); } }); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java b/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java index 7b8d552..150ef97 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java @@ -95,7 +95,7 @@ public class ZenTokener extends TokenStream { private static final String[] REGEXPS = { "#[^\n]*[\n\\e]", "//[^\n]*[\n\\e]", - "/\\*[^\\*]*(\\*^/[^\\*]*)*\\*/", + "/\\*[^\\*]*(\\*[^/]*)*\\*/", "[ \t\r\n]*", "[a-zA-Z_][a-zA-Z_0-9]*", "\\-?(0|[1-9][0-9]*)\\.[0-9]+([eE][\\+\\-]?[0-9]+)?",