added remove tag

This commit is contained in:
Jared committed 2016-03-13 21:15:35 +02:00
1 parent df6b587fc1
commit 9684971e44
4 files changed
+337 -294

No files matched your search

@@ -211,6 +211,15 @@ public interface IItemStack extends IIngredient {
*/
@ZenMethod
public IItemStack withTag(IData tag);
/**
* Creates an item stack without the given nbt tag.
*
* @param tag item tag to be removed
* @return resulting item stack
*/
@ZenMethod
public IItemStack removeTag(String tag);
/**
* Creates an item stack with updated nbt tag. Updates existing tags.
@@ -222,6 +222,18 @@ public class MCItemStack implements IItemStack {
}
@Override
public IItemStack removeTag(String tag) {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, stack.getItemDamage());
if (tag == null) {
result.stackTagCompound = null;
} else {
result.stackTagCompound.removeTag(tag);
}
IData dataTag = NBTConverter.from(result.stackTagCompound, false);
return new MCItemStack(result, dataTag);
}
@Override
public String getMark() {
return null;
}
@@ -395,5 +407,7 @@ public class MCItemStack implements IItemStack {
return result.toString();
}
}
@@ -8,6 +8,9 @@ package minetweaker.mc18;
import java.io.File;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.logger.FileLogger;
@@ -35,7 +38,10 @@ import minetweaker.runtime.IScriptProvider;
import minetweaker.runtime.providers.ScriptProviderCascade;
import minetweaker.runtime.providers.ScriptProviderCustom;
import minetweaker.runtime.providers.ScriptProviderDirectory;
import net.minecraft.item.ItemFishingRod;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.WeightedRandomFishable;
import net.minecraftforge.common.FishingHooks;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
@@ -96,7 +102,6 @@ public class MineTweakerMod {
MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log")));
MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE;
File globalDir = new File("scripts");
if (!globalDir.exists())
globalDir.mkdirs();
@@ -144,17 +149,19 @@ public class MineTweakerMod {
@EventHandler
public void onComplete(FMLLoadCompleteEvent ev) {
MineTweakerAPI.logInfo("MineTweaker: Building registry");
ItemBracketHandler.rebuildItemRegistry();
LiquidBracketHandler.rebuildLiquidRegistry();
MineTweakerAPI.logInfo("MineTweaker: Sucessfully built item registry");
MineTweakerAPI.logInfo("MineTweaker: Building registry");
ItemBracketHandler.rebuildItemRegistry();
LiquidBracketHandler.rebuildLiquidRegistry();
MineTweakerAPI.logInfo("MineTweaker: Sucessfully built item registry");
}
@EventHandler
public void onServerAboutToStart(FMLServerAboutToStartEvent ev) {
// starts before loading worlds
// perfect place to start MineTweaker!
if (MineTweakerPlatformUtils.isClient()) {
MineTweakerAPI.client = new MCClient();
}
@@ -50,349 +50,362 @@ import net.minecraftforge.oredict.OreDictionary;
* @author Stan
*/
public class MCItemStack implements IItemStack {
private final ItemStack stack;
private final List<IItemStack> items;
private IData tag = null;
private boolean wildcardSize;
private final ItemStack stack;
private final List<IItemStack> items;
private IData tag = null;
private boolean wildcardSize;
public MCItemStack(ItemStack itemStack) {
if (itemStack == null)
throw new IllegalArgumentException("stack cannot be null");
public MCItemStack(ItemStack itemStack) {
if (itemStack == null)
throw new IllegalArgumentException("stack cannot be null");
stack = itemStack.copy();
items = Collections.<IItemStack>singletonList(this);
}
stack = itemStack.copy();
items = Collections.<IItemStack> singletonList(this);
}
public MCItemStack(ItemStack itemStack, boolean wildcardSize) {
this(itemStack);
public MCItemStack(ItemStack itemStack, boolean wildcardSize) {
this(itemStack);
this.wildcardSize = wildcardSize;
}
this.wildcardSize = wildcardSize;
}
private MCItemStack(ItemStack itemStack, IData tag) {
if (itemStack == null)
throw new IllegalArgumentException("stack cannot be null");
private MCItemStack(ItemStack itemStack, IData tag) {
if (itemStack == null)
throw new IllegalArgumentException("stack cannot be null");
stack = itemStack;
items = Collections.<IItemStack>singletonList(this);
this.tag = tag;
}
stack = itemStack;
items = Collections.<IItemStack> singletonList(this);
this.tag = tag;
}
private MCItemStack(ItemStack itemStack, IData tag, boolean wildcardSize) {
stack = itemStack;
items = Collections.<IItemStack>singletonList(this);
this.tag = tag;
this.wildcardSize = wildcardSize;
}
private MCItemStack(ItemStack itemStack, IData tag, boolean wildcardSize) {
stack = itemStack;
items = Collections.<IItemStack> singletonList(this);
this.tag = tag;
this.wildcardSize = wildcardSize;
}
@Override
public IItemDefinition getDefinition() {
return new MCItemDefinition(ItemBracketHandler.getStringFromItem(stack.getItem()), stack.getItem());
}
@Override
public IItemDefinition getDefinition() {
return new MCItemDefinition(ItemBracketHandler.getStringFromItem(stack.getItem()), stack.getItem());
}
@Override
public String getName() {
return stack.getUnlocalizedName();
}
@Override
public String getName() {
return stack.getUnlocalizedName();
}
@Override
public String getDisplayName() {
return stack.getDisplayName();
}
@Override
public String getDisplayName() {
return stack.getDisplayName();
}
@Override
public void setDisplayName(String name) {
MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name));
}
@Override
public void setMaxDamage(int damage) {
MineTweakerAPI.apply(new SetStackmaxDamageAction(stack, damage));
}
@Override
public void setDisplayName(String name) {
MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name));
}
@Override
public int getMaxStackSize() {
return stack.getMaxStackSize();
}
@Override
public void setMaxDamage(int damage) {
MineTweakerAPI.apply(new SetStackmaxDamageAction(stack, damage));
}
@Override
public void setMaxStackSize(int size) {
MineTweakerAPI.apply(new SetStackSizeAction((ItemStack) getInternal(), size));
}
@Override
public int getMaxStackSize() {
return stack.getMaxStackSize();
}
@Override
public float getBlockHardness() {
return ReflectionHelper.getPrivateValue(Block.class, Block.getBlockFromItem(stack.getItem()), "blockHardness");
}
@Override
public void setMaxStackSize(int size) {
MineTweakerAPI.apply(new SetStackSizeAction((ItemStack) getInternal(), size));
}
@Override
public void setBlockHardness(float hardness) {
MineTweakerAPI.apply(new SetBlockHardnessAction(stack, hardness));
}
@Override
public float getBlockHardness() {
return ReflectionHelper.getPrivateValue(Block.class, Block.getBlockFromItem(stack.getItem()), "blockHardness");
}
@Override
public int getDamage() {
return stack.getItemDamage();
}
@Override
public void setBlockHardness(float hardness) {
MineTweakerAPI.apply(new SetBlockHardnessAction(stack, hardness));
}
@Override
public IData getTag() {
if (tag == null) {
if (stack.getTagCompound() == null) {
return DataMap.EMPTY;
}
@Override
public int getDamage() {
return stack.getItemDamage();
}
tag = NBTConverter.from(stack.getTagCompound(), true);
}
return tag;
}
@Override
public IData getTag() {
if (tag == null) {
if (stack.getTagCompound() == null) {
return DataMap.EMPTY;
}
@Override
public int getMaxDamage() {
return stack.getMaxDamage();
}
tag = NBTConverter.from(stack.getTagCompound(), true);
}
return tag;
}
@Override
public ILiquidStack getLiquid() {
FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(stack);
return liquid == null ? null : new MCLiquidStack(liquid);
}
@Override
public int getMaxDamage() {
return stack.getMaxDamage();
}
@Override
public IIngredient anyDamage() {
if (stack.getItem().getHasSubtypes()) {
MineTweakerAPI.logWarning("subitems don't have damaged states");
return this;
} else {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, OreDictionary.WILDCARD_VALUE);
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag);
}
}
@Override
public ILiquidStack getLiquid() {
FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(stack);
return liquid == null ? null : new MCLiquidStack(liquid);
}
@Override
public IItemStack withDamage(int damage) {
if (stack.getItem().getHasSubtypes()) {
MineTweakerAPI.logWarning("subitems don't have damaged states");
return this;
} else {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, damage);
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag);
}
}
@Override
public IIngredient anyDamage() {
if (stack.getItem().getHasSubtypes()) {
MineTweakerAPI.logWarning("subitems don't have damaged states");
return this;
} else {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, OreDictionary.WILDCARD_VALUE);
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag);
}
}
@Override
public IItemStack anyAmount() {
ItemStack result = new ItemStack(stack.getItem(), 1, stack.getItemDamage());
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag, true);
}
@Override
public IItemStack withDamage(int damage) {
if (stack.getItem().getHasSubtypes()) {
MineTweakerAPI.logWarning("subitems don't have damaged states");
return this;
} else {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, damage);
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag);
}
}
@Override
public IItemStack withAmount(int amount) {
ItemStack result = new ItemStack(stack.getItem(), amount, stack.getItemDamage());
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag);
}
@Override
public IItemStack anyAmount() {
ItemStack result = new ItemStack(stack.getItem(), 1, stack.getItemDamage());
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag, true);
}
@Override
public IItemStack withTag(IData tag) {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, stack.getItemDamage());
if (tag == null) {
result.setTagCompound(null);
} else {
result.setTagCompound((NBTTagCompound) NBTConverter.from(tag));
}
return new MCItemStack(result, tag);
}
@Override
public IItemStack withAmount(int amount) {
ItemStack result = new ItemStack(stack.getItem(), amount, stack.getItemDamage());
result.setTagCompound(stack.getTagCompound());
return new MCItemStack(result, tag);
}
@Override
public IItemStack updateTag(IData tagUpdate) {
if (tag == null) {
if (stack.getTagCompound() == null) {
return withTag(tagUpdate);
}
@Override
public IItemStack withTag(IData tag) {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, stack.getItemDamage());
if (tag == null) {
result.setTagCompound(null);
} else {
result.setTagCompound((NBTTagCompound) NBTConverter.from(tag));
}
return new MCItemStack(result, tag);
}
tag = NBTConverter.from(stack.getTagCompound(), true);
}
@Override
public IItemStack updateTag(IData tagUpdate) {
if (tag == null) {
if (stack.getTagCompound() == null) {
return withTag(tagUpdate);
}
IData updated = tag.update(tagUpdate);
return withTag(updated);
}
tag = NBTConverter.from(stack.getTagCompound(), true);
}
@Override
public String getMark() {
return null;
}
IData updated = tag.update(tagUpdate);
return withTag(updated);
}
@Override
public int getAmount() {
return stack.stackSize;
}
@Override
public IItemStack removeTag(String tag) {
ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, stack.getItemDamage());
@Override
public List<IItemStack> getItems() {
return items;
}
if (tag == null) {
result.setTagCompound(null);
} else {
result.getTagCompound().removeTag(tag);
}
IData dataTag = NBTConverter.from(result.getTagCompound(), false);
return new MCItemStack(result, dataTag);
}
@Override
public List<ILiquidStack> getLiquids() {
return Collections.emptyList();
}
@Override
public String getMark() {
return null;
}
@Override
public IItemStack amount(int amount) {
return withAmount(amount);
}
@Override
public int getAmount() {
return stack.stackSize;
}
@Override
public WeightedItemStack percent(float chance) {
return new WeightedItemStack(this, chance * 0.01f);
}
@Override
public List<IItemStack> getItems() {
return items;
}
@Override
public WeightedItemStack weight(float chance) {
return new WeightedItemStack(this, chance);
}
@Override
public List<ILiquidStack> getLiquids() {
return Collections.emptyList();
}
@Override
public IIngredient transform(IItemTransformer transformer) {
return new IngredientItem(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[] { transformer });
}
@Override
public IItemStack amount(int amount) {
return withAmount(amount);
}
@Override
public IIngredient only(IItemCondition condition) {
return new IngredientItem(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public WeightedItemStack percent(float chance) {
return new WeightedItemStack(this, chance * 0.01f);
}
@Override
public IIngredient marked(String mark) {
return new IngredientItem(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public WeightedItemStack weight(float chance) {
return new WeightedItemStack(this, chance);
}
@Override
public IIngredient or(IIngredient ingredient) {
return new IngredientOr(this, ingredient);
}
@Override
public IIngredient transform(IItemTransformer transformer) {
return new IngredientItem(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[] { transformer });
}
@Override
public boolean matches(IItemStack item) {
ItemStack internal = getItemStack(item);
return internal.getItem() == stack.getItem() && (wildcardSize || internal.stackSize >= stack.stackSize) && (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack.getItemDamage() == internal.getItemDamage() || (!stack.getHasSubtypes() && !stack.getItem().isDamageable()));
}
@Override
public IIngredient only(IItemCondition condition) {
return new IngredientItem(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public boolean matches(ILiquidStack liquid) {
return false;
}
@Override
public IIngredient marked(String mark) {
return new IngredientItem(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public boolean contains(IIngredient ingredient) {
List<IItemStack> iitems = ingredient.getItems();
if (iitems == null || iitems.size() != 1)
return false;
return matches(iitems.get(0));
}
@Override
public IIngredient or(IIngredient ingredient) {
return new IngredientOr(this, ingredient);
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) {
return item;
}
@Override
public boolean matches(IItemStack item) {
ItemStack internal = getItemStack(item);
return internal.getItem() == stack.getItem() && (wildcardSize || internal.stackSize >= stack.stackSize) && (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack.getItemDamage() == internal.getItemDamage() || (!stack.getHasSubtypes() && !stack.getItem().isDamageable()));
}
@Override
public boolean hasTransformers() {
return false;
}
@Override
public boolean matches(ILiquidStack liquid) {
return false;
}
@Override
public Object getInternal() {
return stack;
}
@Override
public boolean contains(IIngredient ingredient) {
List<IItemStack> iitems = ingredient.getItems();
if (iitems == null || iitems.size() != 1)
return false;
return matches(iitems.get(0));
}
@Override
public IBlock asBlock() {
ResourceLocation res = (ResourceLocation) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem()));
if (Block.blockRegistry.containsKey(res)) {
return new MCItemBlock(stack);
} else {
throw new ClassCastException("This item is not a block");
}
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) {
return item;
}
@Override
public List<IOreDictEntry> getOres() {
List<IOreDictEntry> result = new ArrayList<IOreDictEntry>();
@Override
public boolean hasTransformers() {
return false;
}
for (String key : OreDictionary.getOreNames()) {
for (ItemStack is : OreDictionary.getOres(key)) {
if (is.getItem() == stack.getItem() && (is.getItemDamage() == OreDictionary.WILDCARD_VALUE || is.getItemDamage() == stack.getItemDamage())) {
result.add(MineTweakerAPI.oreDict.get(key));
break;
}
}
}
@Override
public Object getInternal() {
return stack;
}
return result;
}
@Override
public IBlock asBlock() {
ResourceLocation res = (ResourceLocation) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem()));
if (Block.blockRegistry.containsKey(res)) {
return new MCItemBlock(stack);
} else {
throw new ClassCastException("This item is not a block");
}
}
// #############################
// ### Object implementation ###
// #############################
@Override
public List<IOreDictEntry> getOres() {
List<IOreDictEntry> result = new ArrayList<IOreDictEntry>();
@Override
public int hashCode() {
int hash = 7;
hash = 41 * hash + stack.getItem().hashCode();
hash = 41 * hash + stack.getItemDamage();
hash = 41 * hash + stack.stackSize;
hash = 41 * hash + (stack.getTagCompound() == null ? 0 : stack.getTagCompound().hashCode());
hash = 41 * hash + (this.wildcardSize ? 1 : 0);
return hash;
}
for (String key : OreDictionary.getOreNames()) {
for (ItemStack is : OreDictionary.getOres(key)) {
if (is.getItem() == stack.getItem() && (is.getItemDamage() == OreDictionary.WILDCARD_VALUE || is.getItemDamage() == stack.getItemDamage())) {
result.add(MineTweakerAPI.oreDict.get(key));
break;
}
}
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
final MCItemStack other = (MCItemStack) obj;
if (this.stack.getItem() != other.stack.getItem())
return false;
if (this.stack.getItemDamage() != other.stack.getItemDamage())
return false;
if (this.stack.stackSize != other.stack.stackSize)
return false;
if (this.stack.getTagCompound() != other.stack.getTagCompound() && (this.stack == null || this.stack.equals(other.stack)))
return false;
if (this.wildcardSize != other.wildcardSize)
return false;
return true;
}
return result;
}
@Override
public String toString() {
StringBuilder result = new StringBuilder();
result.append('<');
result.append(ItemBracketHandler.getStringFromItem(stack.getItem()));
// #############################
// ### Object implementation ###
// #############################
if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
result.append(":*");
} else if (stack.getItemDamage() > 0) {
result.append(':').append(stack.getItemDamage());
}
result.append('>');
@Override
public int hashCode() {
int hash = 7;
hash = 41 * hash + stack.getItem().hashCode();
hash = 41 * hash + stack.getItemDamage();
hash = 41 * hash + stack.stackSize;
hash = 41 * hash + (stack.getTagCompound() == null ? 0 : stack.getTagCompound().hashCode());
hash = 41 * hash + (this.wildcardSize ? 1 : 0);
return hash;
}
if (stack.getTagCompound() != null) {
result.append(".withTag(");
result.append(NBTConverter.from(stack.getTagCompound(), wildcardSize).toString());
result.append(")");
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
final MCItemStack other = (MCItemStack) obj;
if (this.stack.getItem() != other.stack.getItem())
return false;
if (this.stack.getItemDamage() != other.stack.getItemDamage())
return false;
if (this.stack.stackSize != other.stack.stackSize)
return false;
if (this.stack.getTagCompound() != other.stack.getTagCompound() && (this.stack == null || this.stack.equals(other.stack)))
return false;
if (this.wildcardSize != other.wildcardSize)
return false;
return true;
}
return result.toString();
}
@Override
public String toString() {
StringBuilder result = new StringBuilder();
result.append('<');
result.append(ItemBracketHandler.getStringFromItem(stack.getItem()));
if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
result.append(":*");
} else if (stack.getItemDamage() > 0) {
result.append(':').append(stack.getItemDamage());
}
result.append('>');
if (stack.getTagCompound() != null) {
result.append(".withTag(");
result.append(NBTConverter.from(stack.getTagCompound(), wildcardSize).toString());
result.append(")");
}
return result.toString();
}
}