OreDict is now fixed

This commit is contained in:
Jared committed 2016-05-09 11:04:07 +02:00
1 parent ee7fe8d297
commit 5f54cd3eaa
2 files changed
+208 -202

No files matched your search

@@ -8,7 +8,6 @@ package minetweaker.mc18.oredict;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.item.*;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDictEntry;
@@ -29,76 +28,73 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
/**
* @author Stan
*/
public class MCOreDictEntry implements IOreDictEntry{
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 final String id;
public MCOreDictEntry(String id){
public MCOreDictEntry(String id) {
this.id = id;
}
// ####################################
// ### IOreDictEntry implementation ###
// ####################################
@Override
public String getName(){
public String getName() {
return id;
}
@Override
public boolean isEmpty(){
return OreDictionary.getOres(id).isEmpty();
public boolean isEmpty() {
return OreDictionary.getOres(getName()).isEmpty();
}
@Override
public void add(IItemStack item){
public IItemStack getFirstItem() {
return getItems().get(0);
}
@Override
public void add(IItemStack item) {
ItemStack stack = getItemStack(item);
if(stack != null){
if (stack != null) {
MineTweakerAPI.apply(new ActionAddItem(id, stack));
}
}
@Override
public IItemStack getFirstItem(){
List<ItemStack> items = OreDictionary.getOres(id);
if(items.isEmpty()){
return null;
}
return getIItemStackWildcardSize(items.get(0));
}
@Override
public void addAll(IOreDictEntry entry){
if(entry instanceof MCOreDictEntry){
public void addAll(IOreDictEntry entry) {
if (entry instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionAddAll(id, ((MCOreDictEntry) entry).id));
}else{
} else {
MineTweakerAPI.logError("not a valid entry");
}
}
@Override
public void remove(IItemStack item){
public void remove(IItemStack item) {
ItemStack result = null;
for(ItemStack itemStack : OreDictionary.getOres(id)){
if(item.matches(getIItemStackWildcardSize(itemStack))){
for (ItemStack itemStack : OreDictionary.getOres(getName())) {
if (item.matches(getIItemStackWildcardSize(itemStack))) {
result = itemStack;
break;
}
}
if(result != null){
if (result != null) {
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
}
}
@Override
public boolean contains(IItemStack item){
for(ItemStack itemStack : OreDictionary.getOres(id)){
if(getIItemStackWildcardSize(itemStack).matches(item)){
public boolean contains(IItemStack item) {
for (ItemStack itemStack : OreDictionary.getOres(getName())) {
if (getIItemStackWildcardSize(itemStack).matches(item)) {
return true;
}
}
@@ -107,78 +103,78 @@ public class MCOreDictEntry implements IOreDictEntry{
}
@Override
public void mirror(IOreDictEntry other){
if(other instanceof MCOreDictEntry){
public void mirror(IOreDictEntry other) {
if (other instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionMirror(id, ((MCOreDictEntry) other).id));
}else{
} else {
MineTweakerAPI.logError("not a valid oredict entry");
}
}
@Override
public String getMark(){
public String getMark() {
return null;
}
@Override
public int getAmount(){
public int getAmount() {
return 1;
}
@Override
public List<IItemStack> getItems(){
public List<IItemStack> getItems() {
List<IItemStack> result = new ArrayList<IItemStack>();
for(ItemStack item : OreDictionary.getOres(id)){
for (ItemStack item : OreDictionary.getOres(getName())) {
result.add(getIItemStackWildcardSize(item));
}
return result;
}
@Override
public List<ILiquidStack> getLiquids(){
public List<ILiquidStack> getLiquids() {
return Collections.emptyList();
}
@Override
public IIngredient amount(int amount){
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});
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);
public IIngredient only(IItemCondition condition) {
return new IngredientOreDict(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient marked(String mark){
public IIngredient marked(String mark) {
return new IngredientOreDict(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient or(IIngredient ingredient){
public IIngredient or(IIngredient ingredient) {
return new IngredientOr(this, ingredient);
}
@Override
public boolean matches(IItemStack item){
public boolean matches(IItemStack item) {
return contains(item);
}
@Override
public boolean matches(ILiquidStack liquid){
public boolean matches(ILiquidStack liquid) {
return false;
}
@Override
public boolean contains(IIngredient ingredient){
public boolean contains(IIngredient ingredient) {
List<IItemStack> items = ingredient.getItems();
for(IItemStack item : items){
if(!matches(item))
for (IItemStack item : items) {
if (!matches(item))
return false;
}
@@ -186,17 +182,17 @@ public class MCOreDictEntry implements IOreDictEntry{
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer){
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) {
return item;
}
@Override
public boolean hasTransformers(){
public boolean hasTransformers() {
return false;
}
@Override
public Object getInternal(){
public Object getInternal() {
return id;
}
@@ -205,18 +201,18 @@ public class MCOreDictEntry implements IOreDictEntry{
// #############################
@Override
public String toString(){
public String toString() {
return "<ore:" + id + ">";
}
@Override
public int hashCode(){
public int hashCode() {
return id.hashCode();
}
@Override
public boolean equals(Object other){
if(!(other instanceof MCOreDictEntry))
public boolean equals(Object other) {
if (!(other instanceof MCOreDictEntry))
return false;
return ((MCOreDictEntry) other).id == id;
}
@@ -225,177 +221,182 @@ public class MCOreDictEntry implements IOreDictEntry{
// ### Action classes ###
// ######################
private static class ActionAddItem implements IUndoableAction{
private static class ActionAddItem implements IUndoableAction {
private final String id;
private final ItemStack item;
public ActionAddItem(String id, ItemStack item){
public ActionAddItem(String id, ItemStack item) {
this.id = id;
this.item = item;
}
@Override
public void apply(){
public void apply() {
OreDictionary.registerOre(id, item);
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
MineTweakerImplementationAPI.logger.logWarning(id);
MineTweakerImplementationAPI.logger.logWarning(""+OREDICT_CONTENTS.indexOf(id));
MineTweakerImplementationAPI.logger.logWarning(item +"");
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(id)).remove(item);
public void undo() {
int oreId = OreDictionary.getOreID(id);
OREDICT_CONTENTS.get(oreId).remove(item);
}
@Override
public String describe(){
public String describe() {
return "Adding " + item.getDisplayName() + " to ore dictionary entry " + id;
}
@Override
public String describeUndo(){
public String describeUndo() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + id;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}
private static class ActionMirror implements IUndoableAction{
private static class ActionMirror implements IUndoableAction {
private final String idTarget;
private final String idSource;
private final ArrayList<ItemStack> targetCopy;
private final ArrayList<ItemStack> targetCopyUn;
public ActionMirror(String idTarget, String idSource){
public ActionMirror(String idTarget, String idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
targetCopy = OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(idTarget));
targetCopyUn = OREDICT_CONTENTS_UN.get(OREDICT_CONTENTS_UN.indexOf(idTarget));
int targetOreId = OreDictionary.getOreID(idTarget);
targetCopy = OREDICT_CONTENTS.get(targetOreId);
targetCopyUn = OREDICT_CONTENTS_UN.get(targetOreId);
}
@Override
public void apply(){
OREDICT_CONTENTS.set(OREDICT_CONTENTS.indexOf(idTarget), OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(idSource)));
OREDICT_CONTENTS_UN.set(OREDICT_CONTENTS_UN.indexOf(idTarget), OREDICT_CONTENTS_UN.get(OREDICT_CONTENTS_UN.indexOf(idSource)));
public void apply() {
int sourceOreId = OreDictionary.getOreID(idSource);
int targetOreId = OreDictionary.getOreID(idTarget);
OREDICT_CONTENTS.set(targetOreId, OREDICT_CONTENTS.get(sourceOreId));
OREDICT_CONTENTS_UN.set(targetOreId, OREDICT_CONTENTS_UN.get(sourceOreId));
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
OREDICT_CONTENTS.set(OREDICT_CONTENTS.indexOf(idTarget), targetCopy);
OREDICT_CONTENTS_UN.set(OREDICT_CONTENTS_UN.indexOf(idTarget), targetCopyUn);
public void undo() {
int targetOreId = OreDictionary.getOreID(idTarget);
OREDICT_CONTENTS.set(targetOreId, targetCopy);
OREDICT_CONTENTS_UN.set(targetOreId, targetCopyUn);
}
@Override
public String describe(){
public String describe() {
return "Mirroring " + idSource + " to " + idTarget;
}
@Override
public String describeUndo(){
return "Undoing mirror of " + idSource + " to " + idTarget;
public String describeUndo() {
return "Undoing mirror of " + idSource+ " to " + idTarget;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}
private static class ActionRemoveItem implements IUndoableAction{
private static class ActionRemoveItem implements IUndoableAction {
private final String id;
private final ItemStack item;
public ActionRemoveItem(String id, ItemStack item){
public ActionRemoveItem(String id, ItemStack item) {
this.id = id;
this.item = item;
}
@Override
public void apply(){
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(id)).remove(item);
public void apply() {
int oreId = OreDictionary.getOreID(id);
OREDICT_CONTENTS.get(oreId).remove(item);
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(id)).add(item);
public void undo() {
int oreId = OreDictionary.getOreID(id);
OREDICT_CONTENTS.get(oreId).add(item);
}
@Override
public String describe(){
public String describe() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + id;
}
@Override
public String describeUndo(){
public String describeUndo() {
return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + id;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}
private static class ActionAddAll implements IUndoableAction{
private static class ActionAddAll implements IUndoableAction {
private final String idTarget;
private final String idSource;
public ActionAddAll(String idTarget, String idSource){
public ActionAddAll(String idTarget, String idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
}
@Override
public void apply(){
for(ItemStack stack : OreDictionary.getOres(idSource)){
public void apply() {
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OreDictionary.registerOre(idTarget, stack);
}
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
for(ItemStack stack : OreDictionary.getOres(idSource)){
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(idTarget)).remove(stack);
public void undo() {
int targetOreId = OreDictionary.getOreID(idTarget);
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OREDICT_CONTENTS.get(targetOreId).remove(stack);
}
}
@Override
public String describe(){
public String describe() {
return "Copying contents of ore dictionary entry " + idSource + " to " + idTarget;
}
@Override
public String describeUndo(){
public String describeUndo() {
return "Removing contents of ore dictionary entry " + idSource + " from " + idTarget;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}
@@ -28,76 +28,73 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
/**
* @author Stan
*/
public class MCOreDictEntry implements IOreDictEntry{
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 final String id;
public MCOreDictEntry(String id){
public MCOreDictEntry(String id) {
this.id = id;
}
// ####################################
// ### IOreDictEntry implementation ###
// ####################################
@Override
public String getName(){
public String getName() {
return id;
}
@Override
public boolean isEmpty(){
return OreDictionary.getOres(id).isEmpty();
public boolean isEmpty() {
return OreDictionary.getOres(getName()).isEmpty();
}
@Override
public void add(IItemStack item){
public IItemStack getFirstItem() {
return getItems().get(0);
}
@Override
public void add(IItemStack item) {
ItemStack stack = getItemStack(item);
if(stack != null){
if (stack != null) {
MineTweakerAPI.apply(new ActionAddItem(id, stack));
}
}
@Override
public IItemStack getFirstItem(){
List<ItemStack> items = OreDictionary.getOres(id);
if(items.isEmpty()){
return null;
}
return getIItemStackWildcardSize(items.get(0));
}
@Override
public void addAll(IOreDictEntry entry){
if(entry instanceof MCOreDictEntry){
public void addAll(IOreDictEntry entry) {
if (entry instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionAddAll(id, ((MCOreDictEntry) entry).id));
}else{
} else {
MineTweakerAPI.logError("not a valid entry");
}
}
@Override
public void remove(IItemStack item){
public void remove(IItemStack item) {
ItemStack result = null;
for(ItemStack itemStack : OreDictionary.getOres(id)){
if(item.matches(getIItemStackWildcardSize(itemStack))){
for (ItemStack itemStack : OreDictionary.getOres(getName())) {
if (item.matches(getIItemStackWildcardSize(itemStack))) {
result = itemStack;
break;
}
}
if(result != null){
if (result != null) {
MineTweakerAPI.apply(new ActionRemoveItem(id, result));
}
}
@Override
public boolean contains(IItemStack item){
for(ItemStack itemStack : OreDictionary.getOres(id)){
if(getIItemStackWildcardSize(itemStack).matches(item)){
public boolean contains(IItemStack item) {
for (ItemStack itemStack : OreDictionary.getOres(getName())) {
if (getIItemStackWildcardSize(itemStack).matches(item)) {
return true;
}
}
@@ -106,78 +103,78 @@ public class MCOreDictEntry implements IOreDictEntry{
}
@Override
public void mirror(IOreDictEntry other){
if(other instanceof MCOreDictEntry){
public void mirror(IOreDictEntry other) {
if (other instanceof MCOreDictEntry) {
MineTweakerAPI.apply(new ActionMirror(id, ((MCOreDictEntry) other).id));
}else{
} else {
MineTweakerAPI.logError("not a valid oredict entry");
}
}
@Override
public String getMark(){
public String getMark() {
return null;
}
@Override
public int getAmount(){
public int getAmount() {
return 1;
}
@Override
public List<IItemStack> getItems(){
public List<IItemStack> getItems() {
List<IItemStack> result = new ArrayList<IItemStack>();
for(ItemStack item : OreDictionary.getOres(id)){
for (ItemStack item : OreDictionary.getOres(getName())) {
result.add(getIItemStackWildcardSize(item));
}
return result;
}
@Override
public List<ILiquidStack> getLiquids(){
public List<ILiquidStack> getLiquids() {
return Collections.emptyList();
}
@Override
public IIngredient amount(int amount){
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});
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);
public IIngredient only(IItemCondition condition) {
return new IngredientOreDict(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient marked(String mark){
public IIngredient marked(String mark) {
return new IngredientOreDict(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS);
}
@Override
public IIngredient or(IIngredient ingredient){
public IIngredient or(IIngredient ingredient) {
return new IngredientOr(this, ingredient);
}
@Override
public boolean matches(IItemStack item){
public boolean matches(IItemStack item) {
return contains(item);
}
@Override
public boolean matches(ILiquidStack liquid){
public boolean matches(ILiquidStack liquid) {
return false;
}
@Override
public boolean contains(IIngredient ingredient){
public boolean contains(IIngredient ingredient) {
List<IItemStack> items = ingredient.getItems();
for(IItemStack item : items){
if(!matches(item))
for (IItemStack item : items) {
if (!matches(item))
return false;
}
@@ -185,17 +182,17 @@ public class MCOreDictEntry implements IOreDictEntry{
}
@Override
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer){
public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) {
return item;
}
@Override
public boolean hasTransformers(){
public boolean hasTransformers() {
return false;
}
@Override
public Object getInternal(){
public Object getInternal() {
return id;
}
@@ -204,18 +201,18 @@ public class MCOreDictEntry implements IOreDictEntry{
// #############################
@Override
public String toString(){
public String toString() {
return "<ore:" + id + ">";
}
@Override
public int hashCode(){
public int hashCode() {
return id.hashCode();
}
@Override
public boolean equals(Object other){
if(!(other instanceof MCOreDictEntry))
public boolean equals(Object other) {
if (!(other instanceof MCOreDictEntry))
return false;
return ((MCOreDictEntry) other).id == id;
}
@@ -224,174 +221,182 @@ public class MCOreDictEntry implements IOreDictEntry{
// ### Action classes ###
// ######################
private static class ActionAddItem implements IUndoableAction{
private static class ActionAddItem implements IUndoableAction {
private final String id;
private final ItemStack item;
public ActionAddItem(String id, ItemStack item){
public ActionAddItem(String id, ItemStack item) {
this.id = id;
this.item = item;
}
@Override
public void apply(){
public void apply() {
OreDictionary.registerOre(id, item);
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(id)).remove(item);
public void undo() {
int oreId = OreDictionary.getOreID(id);
OREDICT_CONTENTS.get(oreId).remove(item);
}
@Override
public String describe(){
public String describe() {
return "Adding " + item.getDisplayName() + " to ore dictionary entry " + id;
}
@Override
public String describeUndo(){
public String describeUndo() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + id;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}
private static class ActionMirror implements IUndoableAction{
private static class ActionMirror implements IUndoableAction {
private final String idTarget;
private final String idSource;
private final ArrayList<ItemStack> targetCopy;
private final ArrayList<ItemStack> targetCopyUn;
public ActionMirror(String idTarget, String idSource){
public ActionMirror(String idTarget, String idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
targetCopy = OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(idTarget));
targetCopyUn = OREDICT_CONTENTS_UN.get(OREDICT_CONTENTS_UN.indexOf(idTarget));
int targetOreId = OreDictionary.getOreID(idTarget);
targetCopy = OREDICT_CONTENTS.get(targetOreId);
targetCopyUn = OREDICT_CONTENTS_UN.get(targetOreId);
}
@Override
public void apply(){
OREDICT_CONTENTS.set(OREDICT_CONTENTS.indexOf(idTarget), OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(idSource)));
OREDICT_CONTENTS_UN.set(OREDICT_CONTENTS_UN.indexOf(idTarget), OREDICT_CONTENTS_UN.get(OREDICT_CONTENTS_UN.indexOf(idSource)));
public void apply() {
int sourceOreId = OreDictionary.getOreID(idSource);
int targetOreId = OreDictionary.getOreID(idTarget);
OREDICT_CONTENTS.set(targetOreId, OREDICT_CONTENTS.get(sourceOreId));
OREDICT_CONTENTS_UN.set(targetOreId, OREDICT_CONTENTS_UN.get(sourceOreId));
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
OREDICT_CONTENTS.set(OREDICT_CONTENTS.indexOf(idTarget), targetCopy);
OREDICT_CONTENTS_UN.set(OREDICT_CONTENTS_UN.indexOf(idTarget), targetCopyUn);
public void undo() {
int targetOreId = OreDictionary.getOreID(idTarget);
OREDICT_CONTENTS.set(targetOreId, targetCopy);
OREDICT_CONTENTS_UN.set(targetOreId, targetCopyUn);
}
@Override
public String describe(){
public String describe() {
return "Mirroring " + idSource + " to " + idTarget;
}
@Override
public String describeUndo(){
return "Undoing mirror of " + idSource + " to " + idTarget;
public String describeUndo() {
return "Undoing mirror of " + idSource+ " to " + idTarget;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}
private static class ActionRemoveItem implements IUndoableAction{
private static class ActionRemoveItem implements IUndoableAction {
private final String id;
private final ItemStack item;
public ActionRemoveItem(String id, ItemStack item){
public ActionRemoveItem(String id, ItemStack item) {
this.id = id;
this.item = item;
}
@Override
public void apply(){
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(id)).remove(item);
public void apply() {
int oreId = OreDictionary.getOreID(id);
OREDICT_CONTENTS.get(oreId).remove(item);
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(id)).add(item);
public void undo() {
int oreId = OreDictionary.getOreID(id);
OREDICT_CONTENTS.get(oreId).add(item);
}
@Override
public String describe(){
public String describe() {
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + id;
}
@Override
public String describeUndo(){
public String describeUndo() {
return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + id;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}
private static class ActionAddAll implements IUndoableAction{
private static class ActionAddAll implements IUndoableAction {
private final String idTarget;
private final String idSource;
public ActionAddAll(String idTarget, String idSource){
public ActionAddAll(String idTarget, String idSource) {
this.idTarget = idTarget;
this.idSource = idSource;
}
@Override
public void apply(){
for(ItemStack stack : OreDictionary.getOres(idSource)){
public void apply() {
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OreDictionary.registerOre(idTarget, stack);
}
}
@Override
public boolean canUndo(){
public boolean canUndo() {
return true;
}
@Override
public void undo(){
for(ItemStack stack : OreDictionary.getOres(idSource)){
OREDICT_CONTENTS.get(OREDICT_CONTENTS.indexOf(idTarget)).remove(stack);
public void undo() {
int targetOreId = OreDictionary.getOreID(idTarget);
for (ItemStack stack : OreDictionary.getOres(idSource)) {
OREDICT_CONTENTS.get(targetOreId).remove(stack);
}
}
@Override
public String describe(){
public String describe() {
return "Copying contents of ore dictionary entry " + idSource + " to " + idTarget;
}
@Override
public String describeUndo(){
public String describeUndo() {
return "Removing contents of ore dictionary entry " + idSource + " from " + idTarget;
}
@Override
public Object getOverrideKey(){
public Object getOverrideKey() {
return null;
}
}