mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-22 04:52:21 +00:00
- transformReplace() now gives the replacement item in the player inventory if it is part of a stack (instead of modifying the whole stack)
- Added noReturn() transformation to avoid any item from being returned. Suppressed programmed vanilla/mod behaviour to, for example, give a bucket back. - Added giveBack() and giveBack(item) transformation to return the item, or a replacement item, back into the inventory instead of the crafting table. Fixes fighting between transformations and default mod/vanilla behavior. - Fixed asterisks in multiline comments breaking script parsing. - Fixed removeShaped function not working properly if no ingredients are given - Fixed addAll for oredict entries in 1.7.10
This commit is contained in:
1 parent
56b8c9355c
commit
25b9589af7
34 files changed
+163
-59
No files matched your search
@@ -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.
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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(
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user