hopefully the last bunch

This commit is contained in:
Jared committed 2016-09-20 10:20:00 +02:00
1 parent 9ffb6e54ae
commit f3df6aba12
6 files changed
+479 -468

No files matched your search

@@ -160,6 +160,11 @@ public class MCLiquidStack implements ILiquidStack{
return false;
}
@Override
public boolean matchesExact(IItemStack item) {
return false;
}
@Override
public boolean matches(ILiquidStack liquid){
return getDefinition().equals(liquid.getDefinition()) && getAmount() <= liquid.getAmount();
@@ -70,7 +70,7 @@ public class MCOreDictEntry implements IOreDictEntry {
@Override
public void addItems(IItemStack[] items) {
for(IItemStack item : items){
for (IItemStack item : items) {
ItemStack stack = getItemStack(item);
if (stack != null) {
MineTweakerAPI.apply(new ActionAddItem(id, stack));
@@ -101,9 +101,10 @@ public class MCOreDictEntry implements IOreDictEntry {
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
}
}
@Override
public void removeItems(IItemStack[] items) {
for(IItemStack item : items){
for (IItemStack item : items) {
ItemStack result = null;
for (ItemStack itemStack : OreDictionary.getOres(id)) {
if (item.matches(getIItemStackWildcardSize(itemStack))) {
@@ -169,12 +170,12 @@ public class MCOreDictEntry implements IOreDictEntry {
@Override
public IIngredient transform(IItemTransformer transformer) {
return new IngredientOreDict(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[] { transformer });
return new IngredientOreDict(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[]{transformer});
}
@Override
public IIngredient only(IItemCondition condition) {
return new IngredientOreDict(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS);
return new IngredientOreDict(this, null, new IItemCondition[]{condition}, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
@@ -192,6 +193,11 @@ public class MCOreDictEntry implements IOreDictEntry {
return contains(item);
}
@Override
public boolean matchesExact(IItemStack item) {
return contains(item);
}
@Override
public boolean matches(ILiquidStack liquid) {
return false;
@@ -333,7 +339,7 @@ public class MCOreDictEntry implements IOreDictEntry {
@Override
public String describeUndo() {
return "Undoing mirror of " + idSource+ " to " + idTarget;
return "Undoing mirror of " + idSource + " to " + idTarget;
}
@Override
@@ -6,204 +6,191 @@
package minetweaker.mc1710.liquid;
import java.util.Collections;
import java.util.List;
import minetweaker.mc1710.data.NBTConverter;
import minetweaker.api.data.IData;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemCondition;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IItemTransformer;
import minetweaker.api.item.IngredientOr;
import minetweaker.api.item.*;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.player.IPlayer;
import minetweaker.mc1710.data.NBTConverter;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import java.util.Collections;
import java.util.List;
/**
*
* @author Stan
*/
public class MCLiquidStack implements ILiquidStack {
private final FluidStack stack;
private IData tag = null;
private final FluidStack stack;
private IData tag = null;
public MCLiquidStack(FluidStack stack) {
this.stack = stack;
}
public MCLiquidStack(FluidStack stack) {
this.stack = stack;
}
private MCLiquidStack(FluidStack stack, IData tag) {
this.stack = stack;
this.tag = tag;
}
private MCLiquidStack(FluidStack stack, IData tag) {
this.stack = stack;
this.tag = tag;
}
@Override
public ILiquidDefinition getDefinition() {
return new MCLiquidDefinition(stack.getFluid());
}
@Override
public ILiquidDefinition getDefinition() {
return new MCLiquidDefinition(stack.getFluid());
}
@Override
public String getName() {
return stack.getFluid().getName();
}
@Override
public String getName() {
return stack.getFluid().getName();
}
@Override
public String getDisplayName() {
return stack.getFluid().getLocalizedName();
}
@Override
public String getDisplayName() {
return stack.getFluid().getLocalizedName();
}
@Override
public int getAmount() {
return stack.amount;
}
@Override
public int getAmount() {
return stack.amount;
}
@Override
public IData getTag() {
if (tag == null) {
if (stack.tag == null) {
return null;
}
@Override
public IData getTag() {
if (tag == null) {
if (stack.tag == null) {
return null;
}
tag = NBTConverter.from(stack.tag, true);
}
tag = NBTConverter.from(stack.tag, true);
}
return tag;
}
return tag;
}
@Override
public ILiquidStack withTag(IData data) {
FluidStack result = new FluidStack(stack.getFluid(), stack.amount);
result.tag = (NBTTagCompound) NBTConverter.from(data);
return new MCLiquidStack(result, data.immutable());
}
@Override
public ILiquidStack withTag(IData data) {
FluidStack result = new FluidStack(stack.getFluid(), stack.amount);
result.tag = (NBTTagCompound) NBTConverter.from(data);
return new MCLiquidStack(result, data.immutable());
}
@Override
public ILiquidStack withAmount(int amount) {
FluidStack result = new FluidStack(stack.getFluid(), amount);
result.tag = stack.tag;
return new MCLiquidStack(result, tag);
}
@Override
public ILiquidStack withAmount(int amount) {
FluidStack result = new FluidStack(stack.getFluid(), amount);
result.tag = stack.tag;
return new MCLiquidStack(result, tag);
}
@Override
public int getLuminosity() {
return stack.getFluid().getLuminosity(stack);
}
@Override
public int getLuminosity() {
return stack.getFluid().getLuminosity(stack);
}
@Override
public int getDensity() {
return stack.getFluid().getDensity(stack);
}
@Override
public int getDensity() {
return stack.getFluid().getDensity(stack);
}
@Override
public int getTemperature() {
return stack.getFluid().getTemperature(stack);
}
@Override
public int getTemperature() {
return stack.getFluid().getTemperature(stack);
}
@Override
public int getViscosity() {
return stack.getFluid().getViscosity(stack);
}
@Override
public int getViscosity() {
return stack.getFluid().getViscosity(stack);
}
@Override
public boolean isGaseous() {
return stack.getFluid().isGaseous(stack);
}
@Override
public boolean isGaseous() {
return stack.getFluid().isGaseous(stack);
}
@Override
public Object getInternal() {
return stack;
}
@Override
public Object getInternal() {
return stack;
}
// ##################################
// ### IIngredient implementation ###
// ##################################
// ##################################
// ### IIngredient implementation ###
// ##################################
@Override
public String getMark()
{
return null;
}
@Override
public String getMark() {
return null;
}
@Override
public List<IItemStack> getItems()
{
return Collections.emptyList();
}
@Override
public List<IItemStack> getItems() {
return Collections.emptyList();
}
@Override
public List<ILiquidStack> getLiquids()
{
return Collections.<ILiquidStack>singletonList(this);
}
@Override
public List<ILiquidStack> getLiquids() {
return Collections.<ILiquidStack>singletonList(this);
}
@Override
public IIngredient amount(int amount)
{
return withAmount(amount);
}
@Override
public IIngredient amount(int amount) {
return withAmount(amount);
}
@Override
public IIngredient or(IIngredient ingredient)
{
return new IngredientOr(this, ingredient);
}
@Override
public IIngredient or(IIngredient ingredient) {
return new IngredientOr(this, ingredient);
}
@Override
public IIngredient transform(IItemTransformer transformer)
{
throw new UnsupportedOperationException("Liquid stack can't have transformers");
}
@Override
public IIngredient transform(IItemTransformer transformer) {
throw new UnsupportedOperationException("Liquid stack can't have transformers");
}
@Override
public IIngredient only(IItemCondition condition)
{
throw new UnsupportedOperationException("Liquid stack can't have conditions");
}
@Override
public IIngredient only(IItemCondition condition) {
throw new UnsupportedOperationException("Liquid stack can't have conditions");
}
@Override
public IIngredient marked(String mark)
{
throw new UnsupportedOperationException("Liquid stack can't be marked");
}
@Override
public IIngredient marked(String mark) {
throw new UnsupportedOperationException("Liquid stack can't be marked");
}
@Override
public boolean matches(IItemStack item)
{
return false;
}
@Override
public boolean matches(IItemStack item) {
return false;
}
@Override
public boolean matches(ILiquidStack liquid)
{
return getDefinition().equals(liquid.getDefinition())
&& getAmount() <= liquid.getAmount();
}
@Override
public boolean matches(ILiquidStack liquid) {
return getDefinition().equals(liquid.getDefinition())
&& getAmount() <= liquid.getAmount();
}
@Override
public boolean contains(IIngredient ingredient)
{
if (!ingredient.getItems().isEmpty())
return false;
@Override
public boolean matchesExact(IItemStack item) {
return false;
}
for (ILiquidStack liquid : ingredient.getLiquids())
{
if (!matches(liquid))
return false;
}
@Override
public boolean contains(IIngredient ingredient) {
if (!ingredient.getItems().isEmpty())
return false;
return false;
}
for (ILiquidStack liquid : ingredient.getLiquids()) {
if (!matches(liquid))
return false;
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer)
{
return item;
}
return false;
}
@Override
public boolean hasTransformers()
{
return false;
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) {
return item;
}
@Override
public boolean hasTransformers() {
return false;
}
}
@@ -26,56 +26,55 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
/**
*
* @author Stan
*/
public class MCOreDictEntry implements IOreDictEntry {
private static final List<ArrayList<ItemStack>> OREDICT_CONTENTS = MineTweakerHacks.getOreIdStacks();
private static final List<ArrayList<ItemStack>> OREDICT_CONTENTS_UN = MineTweakerHacks.getOreIdStacksUn();
private static final List<ArrayList<ItemStack>> OREDICT_CONTENTS = MineTweakerHacks.getOreIdStacks();
private static final List<ArrayList<ItemStack>> OREDICT_CONTENTS_UN = MineTweakerHacks.getOreIdStacksUn();
private final int id;
private final int id;
public MCOreDictEntry(Integer id) {
this.id = id;
}
public MCOreDictEntry(Integer id) {
this.id = id;
}
public MCOreDictEntry(String id) {
this.id = OreDictionary.getOreID(id);
}
public MCOreDictEntry(String id) {
this.id = OreDictionary.getOreID(id);
}
// ####################################
// ### IOreDictEntry implementation ###
// ####################################
// ####################################
// ### IOreDictEntry implementation ###
// ####################################
@Override
public String getName() {
return OreDictionary.getOreName(id);
}
@Override
public String getName() {
return OreDictionary.getOreName(id);
}
@Override
public boolean isEmpty() {
return OreDictionary.getOres(id).isEmpty();
}
@Override
public boolean isEmpty() {
return OreDictionary.getOres(id).isEmpty();
}
@Override
public void add(IItemStack item) {
ItemStack stack = getItemStack(item);
if (stack != null) {
MineTweakerAPI.apply(new ActionAddItem(id, stack));
}
}
@Override
public void add(IItemStack item) {
ItemStack stack = getItemStack(item);
if (stack != null) {
MineTweakerAPI.apply(new ActionAddItem(id, stack));
}
}
@Override
public void addItems(IItemStack[] items) {
for(IItemStack item : items){
ItemStack stack = getItemStack(item);
if (stack != null) {
MineTweakerAPI.apply(new ActionAddItem(id, stack));
}
}
}
@Override
public void addItems(IItemStack[] items) {
for (IItemStack item : items) {
ItemStack stack = getItemStack(item);
if (stack != null) {
MineTweakerAPI.apply(new ActionAddItem(id, stack));
}
}
}
@Override
@Override
public IItemStack getFirstItem() {
List<ItemStack> items = OreDictionary.getOres(id);
if (items.isEmpty()) {
@@ -84,33 +83,33 @@ public class MCOreDictEntry implements IOreDictEntry {
return getIItemStackWildcardSize(items.get(0));
}
@Override
public void addAll(IOreDictEntry entry) {
if (entry instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionAddAll(id, ((MCOreDictEntry) entry).id));
} else {
MineTweakerAPI.logError("not a valid entry");
}
}
@Override
public void addAll(IOreDictEntry entry) {
if (entry instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionAddAll(id, ((MCOreDictEntry) entry).id));
} else {
MineTweakerAPI.logError("not a valid entry");
}
}
@Override
public void remove(IItemStack item) {
ItemStack result = null;
for (ItemStack itemStack : OreDictionary.getOres(id)) {
if (item.matches(getIItemStackWildcardSize(itemStack))) {
result = itemStack;
break;
}
}
@Override
public void remove(IItemStack item) {
ItemStack result = null;
for (ItemStack itemStack : OreDictionary.getOres(id)) {
if (item.matches(getIItemStackWildcardSize(itemStack))) {
result = itemStack;
break;
}
}
if (result != null) {
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
}
}
if (result != null) {
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
}
}
@Override
public void removeItems(IItemStack[] items) {
for(IItemStack item : items){
@Override
public void removeItems(IItemStack[] items) {
for (IItemStack item : items) {
ItemStack result = null;
for (ItemStack itemStack : OreDictionary.getOres(id)) {
if (item.matches(getIItemStackWildcardSize(itemStack))) {
@@ -123,307 +122,312 @@ public class MCOreDictEntry implements IOreDictEntry {
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
}
}
}
}
@Override
public boolean contains(IItemStack item) {
for (ItemStack itemStack : OreDictionary.getOres(id)) {
if (getIItemStackWildcardSize(itemStack).matches(item)) {
return true;
}
}
@Override
public boolean contains(IItemStack item) {
for (ItemStack itemStack : OreDictionary.getOres(id)) {
if (getIItemStackWildcardSize(itemStack).matches(item)) {
return true;
}
}
return false;
}
return false;
}
@Override
public void mirror(IOreDictEntry other) {
if (other instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionMirror(id, ((MCOreDictEntry) other).id));
} else {
MineTweakerAPI.logError("not a valid oredict entry");
}
}
@Override
public void mirror(IOreDictEntry other) {
if (other instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionMirror(id, ((MCOreDictEntry) other).id));
} else {
MineTweakerAPI.logError("not a valid oredict entry");
}
}
@Override
public String getMark() {
return null;
}
@Override
public String getMark() {
return null;
}
@Override
public int getAmount() {
return 1;
}
@Override
public int getAmount() {
return 1;
}
@Override
public List<IItemStack> getItems() {
List<IItemStack> result = new ArrayList<IItemStack>();
for (ItemStack item : OreDictionary.getOres(id)) {
result.add(getIItemStackWildcardSize(item));
}
return result;
}
@Override
public List<IItemStack> getItems() {
List<IItemStack> result = new ArrayList<IItemStack>();
for (ItemStack item : OreDictionary.getOres(id)) {
result.add(getIItemStackWildcardSize(item));
}
return result;
}
@Override
public List<ILiquidStack> getLiquids() {
return Collections.emptyList();
}
@Override
public List<ILiquidStack> getLiquids() {
return Collections.emptyList();
}
@Override
public IIngredient amount(int amount) {
return new IngredientStack(this, amount);
}
@Override
public IIngredient amount(int amount) {
return new IngredientStack(this, amount);
}
@Override
public IIngredient transform(IItemTransformer transformer) {
return new IngredientOreDict(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[] { transformer });
}
@Override
public IIngredient transform(IItemTransformer transformer) {
return new IngredientOreDict(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[]{transformer});
}
@Override
public IIngredient only(IItemCondition condition) {
return new IngredientOreDict(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient only(IItemCondition condition) {
return new IngredientOreDict(this, null, new IItemCondition[]{condition}, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient marked(String mark) {
return new IngredientOreDict(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient marked(String mark) {
return new IngredientOreDict(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient or(IIngredient ingredient) {
return new IngredientOr(this, ingredient);
}
@Override
public IIngredient or(IIngredient ingredient) {
return new IngredientOr(this, ingredient);
}
@Override
public boolean matches(IItemStack item) {
return contains(item);
}
@Override
public boolean matches(IItemStack item) {
return contains(item);
}
@Override
public boolean matches(ILiquidStack liquid) {
return false;
}
@Override
public boolean matchesExact(IItemStack item) {
return contains(item);
}
@Override
public boolean contains(IIngredient ingredient) {
List<IItemStack> items = ingredient.getItems();
for (IItemStack item : items) {
if (!matches(item))
return false;
}
@Override
public boolean matches(ILiquidStack liquid) {
return false;
}
return true;
}
@Override
public boolean contains(IIngredient ingredient) {
List<IItemStack> items = ingredient.getItems();
for (IItemStack item : items) {
if (!matches(item))
return false;
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) {
return item;
}
return true;
}
@Override
public boolean hasTransformers() {
return false;
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) {
return item;
}
@Override
public Object getInternal() {
return OreDictionary.getOreName(id);
}
@Override
public boolean hasTransformers() {
return false;
}
// #############################
// ### Object implementation ###
// #############################
@Override
public Object getInternal() {
return OreDictionary.getOreName(id);
}
@Override
public String toString() {
return "<ore:" + OreDictionary.getOreName(id) + ">";
}
// #############################
// ### Object implementation ###
// #############################
@Override
public int hashCode() {
return id;
}
@Override
public String toString() {
return "<ore:" + OreDictionary.getOreName(id) + ">";
}
@Override
public boolean equals(Object other) {
if (!(other instanceof MCOreDictEntry))
return false;
return ((MCOreDictEntry) other).id == id;
}
@Override
public int hashCode() {
return id;
}
// ######################
// ### Action classes ###
// ######################
@Override
public boolean equals(Object other) {
if (!(other instanceof MCOreDictEntry))
return false;
return ((MCOreDictEntry) other).id == id;
}
private static class ActionAddItem implements IUndoableAction {
private final Integer id;
private final ItemStack item;
// ######################
// ### Action classes ###
// ######################
public ActionAddItem(Integer id, ItemStack item) {
this.id = id;
this.item = item;
}
private static class ActionAddItem implements IUndoableAction {
private final Integer id;
private final ItemStack item;
@Override
public void apply() {
OreDictionary.registerOre(id, item);
}
public ActionAddItem(Integer id, ItemStack item) {
this.id = id;
this.item = item;
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void apply() {
OreDictionary.registerOre(id, item);
}
@Override
public void undo() {
OREDICT_CONTENTS.get(id).remove(item);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public String describe() {
return "Adding " + item.getDisplayName() + " to ore dictionary entry " + OreDictionary.getOreName(id);
}
@Override
public void undo() {
OREDICT_CONTENTS.get(id).remove(item);
}
@Override
public String describeUndo() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + OreDictionary.getOreName(id);
}
@Override
public String describe() {
return "Adding " + item.getDisplayName() + " to ore dictionary entry " + OreDictionary.getOreName(id);
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public String describeUndo() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + OreDictionary.getOreName(id);
}
private static class ActionMirror implements IUndoableAction {
private final Integer idTarget;
private final Integer idSource;
@Override
public Object getOverrideKey() {
return null;
}
}
private final ArrayList<ItemStack> targetCopy;
private final ArrayList<ItemStack> targetCopyUn;
private static class ActionMirror implements IUndoableAction {
private final Integer idTarget;
private final Integer idSource;
public ActionMirror(Integer idTarget, Integer idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
private final ArrayList<ItemStack> targetCopy;
private final ArrayList<ItemStack> targetCopyUn;
targetCopy = OREDICT_CONTENTS.get(idTarget);
targetCopyUn = OREDICT_CONTENTS_UN.get(idTarget);
}
public ActionMirror(Integer idTarget, Integer idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
@Override
public void apply() {
OREDICT_CONTENTS.set(idTarget, OREDICT_CONTENTS.get(idSource));
OREDICT_CONTENTS_UN.set(idTarget, OREDICT_CONTENTS_UN.get(idSource));
}
targetCopy = OREDICT_CONTENTS.get(idTarget);
targetCopyUn = OREDICT_CONTENTS_UN.get(idTarget);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void apply() {
OREDICT_CONTENTS.set(idTarget, OREDICT_CONTENTS.get(idSource));
OREDICT_CONTENTS_UN.set(idTarget, OREDICT_CONTENTS_UN.get(idSource));
}
@Override
public void undo() {
OREDICT_CONTENTS.set(idTarget, targetCopy);
OREDICT_CONTENTS_UN.set(idTarget, targetCopyUn);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public String describe() {
return "Mirroring " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
}
@Override
public void undo() {
OREDICT_CONTENTS.set(idTarget, targetCopy);
OREDICT_CONTENTS_UN.set(idTarget, targetCopyUn);
}
@Override
public String describeUndo() {
return "Undoing mirror of " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
}
@Override
public String describe() {
return "Mirroring " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public String describeUndo() {
return "Undoing mirror of " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
}
private static class ActionRemoveItem implements IUndoableAction {
private final Integer id;
private final ItemStack item;
@Override
public Object getOverrideKey() {
return null;
}
}
public ActionRemoveItem(Integer id, ItemStack item) {
this.id = id;
this.item = item;
}
private static class ActionRemoveItem implements IUndoableAction {
private final Integer id;
private final ItemStack item;
@Override
public void apply() {
OREDICT_CONTENTS.get(id).remove(item);
}
public ActionRemoveItem(Integer id, ItemStack item) {
this.id = id;
this.item = item;
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void apply() {
OREDICT_CONTENTS.get(id).remove(item);
}
@Override
public void undo() {
OREDICT_CONTENTS.get(id).add(item);
}
@Override
public boolean canUndo() {
return true;
}
@Override
public String describe() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + OreDictionary.getOreName(id);
}
@Override
public void undo() {
OREDICT_CONTENTS.get(id).add(item);
}
@Override
public String describeUndo() {
return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + OreDictionary.getOreName(id);
}
@Override
public String describe() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + OreDictionary.getOreName(id);
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public String describeUndo() {
return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + OreDictionary.getOreName(id);
}
private static class ActionAddAll implements IUndoableAction {
private final Integer idTarget;
private final Integer idSource;
@Override
public Object getOverrideKey() {
return null;
}
}
public ActionAddAll(Integer idTarget, Integer idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
}
private static class ActionAddAll implements IUndoableAction {
private final Integer idTarget;
private final Integer idSource;
@Override
public void apply() {
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OreDictionary.registerOre(idTarget, stack);
}
}
public ActionAddAll(Integer idTarget, Integer idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
}
@Override
public boolean canUndo() {
return true;
}
@Override
public void apply() {
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OreDictionary.registerOre(idTarget, stack);
}
}
@Override
public void undo() {
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OREDICT_CONTENTS.get(idTarget).remove(stack);
}
}
@Override
public boolean canUndo() {
return true;
}
@Override
public String describe() {
return "Copying contents of ore dictionary entry " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
}
@Override
public void undo() {
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OREDICT_CONTENTS.get(idTarget).remove(stack);
}
}
@Override
public String describeUndo() {
return "Removing contents of ore dictionary entry " + OreDictionary.getOreName(idSource) + " from " + OreDictionary.getOreName(idTarget);
}
@Override
public String describe() {
return "Copying contents of ore dictionary entry " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
}
@Override
public Object getOverrideKey() {
return null;
}
}
@Override
public String describeUndo() {
return "Removing contents of ore dictionary entry " + OreDictionary.getOreName(idSource) + " from " + OreDictionary.getOreName(idTarget);
}
@Override
public Object getOverrideKey() {
return null;
}
}
}
@@ -165,6 +165,10 @@ public class MCLiquidStack implements ILiquidStack{
return getDefinition().equals(liquid.getDefinition()) && getAmount() <= liquid.getAmount();
}
@Override
public boolean matchesExact(IItemStack item) {
return false;
}
@Override
public boolean contains(IIngredient ingredient){
if(!ingredient.getItems().isEmpty())
@@ -191,6 +191,11 @@ public class MCOreDictEntry implements IOreDictEntry {
return contains(item);
}
@Override
public boolean matchesExact(IItemStack item) {
return contains(item);
}
@Override
public boolean matches(ILiquidStack liquid) {
return false;