mirror of
https://github.com/GTNewHorizons/ModTweaker.git
synced 2026-11-20 04:19:44 +00:00
ModTweaker2 Rework
- Revised base classes for IUndoableAction - Reordered lots of code, so stuck actions should be less frequent - Added wildcard support to many "remove" methods - Started working on exist & duplicate checks
This commit is contained in:
1 parent
f5034b04d8
commit
da33cc6fab
112 files changed
+4596
-3522
No files matched your search
@@ -1,133 +1,65 @@
|
||||
package modtweaker2.utils;
|
||||
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import modtweaker2.helpers.LogHelper;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
public abstract class BaseListRemoval implements IUndoableAction {
|
||||
protected final String description;
|
||||
protected final List list;
|
||||
import modtweaker2.helpers.LogHelper;
|
||||
|
||||
protected final FluidStack fluid;
|
||||
protected final ItemStack stack;
|
||||
protected final LinkedList recipes = new LinkedList();
|
||||
|
||||
public BaseListRemoval(String description, List list, ItemStack stack, FluidStack fluid) {
|
||||
this.list = list;
|
||||
this.stack = stack;
|
||||
this.description = description;
|
||||
this.fluid = fluid;
|
||||
}
|
||||
|
||||
public BaseListRemoval(String description, List list, ItemStack stack) {
|
||||
this(description, list, stack, null);
|
||||
}
|
||||
|
||||
public BaseListRemoval(String description, List list, FluidStack fluid) {
|
||||
this(description, list, null, fluid);
|
||||
}
|
||||
|
||||
public BaseListRemoval(List list, ItemStack stack) {
|
||||
this(null, list, stack);
|
||||
}
|
||||
|
||||
public BaseListRemoval(List list, FluidStack stack) {
|
||||
this(null, list, stack);
|
||||
}
|
||||
|
||||
public BaseListRemoval(String description, List list) {
|
||||
this(description, list, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply() {
|
||||
if(recipes.size() == 0) {
|
||||
MineTweakerAPI.logWarning(String.format("No %s Recipes to remove for: %s", this.description, getRecipeInfo()));
|
||||
return;
|
||||
}
|
||||
|
||||
for(Object recipe : recipes) {
|
||||
list.remove(recipe);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canUndo() {
|
||||
return recipes.size() > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void undo() {
|
||||
for(Object recipe : recipes) {
|
||||
list.add(recipe);
|
||||
}
|
||||
}
|
||||
|
||||
public String getRecipeInfo() {
|
||||
return "Unknown Item";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String describe() {
|
||||
if(recipes.size() > 0) {
|
||||
return String.format("Removing %d %s Recipe(s) for: %s", recipes.size(), this.description, getRecipeNames(recipes));
|
||||
} else {
|
||||
return String.format("Removing %s Recipe(s) for: %s", this.description, getRecipeInfo());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String describeUndo() {
|
||||
if(recipes.size() > 0) {
|
||||
return String.format("Restoring %d %s Recipe(s) for: %s", recipes.size(), this.description, getRecipeNames(recipes));
|
||||
} else {
|
||||
return String.format("No %s Recipes found to restore for: %s", this.description, getRecipeInfo());
|
||||
public abstract class BaseListRemoval<T> extends BaseListModification<T> {
|
||||
|
||||
protected BaseListRemoval(String name, List<T> list) {
|
||||
super(name, list);
|
||||
}
|
||||
|
||||
protected BaseListRemoval(String name, List<T> list, List<T> recipies) {
|
||||
this(name, list);
|
||||
|
||||
if(recipes != null) {
|
||||
recipes.addAll(recipies);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply() {
|
||||
if(recipes.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
for(T recipe : this.recipes) {
|
||||
if(recipe != null) {
|
||||
if(this.list.remove(recipe)) {
|
||||
successful.add(recipe);
|
||||
} else {
|
||||
LogHelper.logError(String.format("Error removing %s Recipe for %s", name, getRecipeInfo(recipe)));
|
||||
}
|
||||
} else {
|
||||
LogHelper.logError(String.format("Error removing %s Recipe: null object", name));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void undo() {
|
||||
if(successful.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
for(T recipe : successful) {
|
||||
if(recipe != null) {
|
||||
if(!list.add(recipe)) {
|
||||
LogHelper.logError(String.format("Error restoring %s Recipe for %s", name, getRecipeInfo(recipe)));
|
||||
}
|
||||
} else {
|
||||
LogHelper.logError(String.format("Error restoring %s Recipe: null object", name));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/***
|
||||
* Returns the names of the recipes inside the list
|
||||
* @param list which holds the recipes
|
||||
* @return name or list of names describing the recipe
|
||||
*/
|
||||
private String getRecipeNames(LinkedList list) {
|
||||
if(list.size() == 0)
|
||||
return getRecipeInfo();
|
||||
|
||||
if(list.size() == 1) {
|
||||
if(recipes.getFirst() instanceof ItemStack)
|
||||
return ((ItemStack)list.getFirst()).getDisplayName();
|
||||
else if (recipes.getFirst() instanceof FluidStack)
|
||||
return ((FluidStack)list.getFirst()).getFluid().getLocalizedName();
|
||||
else
|
||||
return getRecipeInfo();
|
||||
}
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
if(recipes.getFirst() instanceof ItemStack) {
|
||||
for(ItemStack itemStack : (List<ItemStack>)list) {
|
||||
sb.append(itemStack.getDisplayName()).append(", ");
|
||||
}
|
||||
} else if (recipes.getFirst() instanceof FluidStack) {
|
||||
for(FluidStack fluidStack : (List<FluidStack>)list) {
|
||||
sb.append(fluidStack.getFluid().getLocalizedName()).append(", ");
|
||||
}
|
||||
} else {
|
||||
sb.append(getRecipeInfo()).append(", ");
|
||||
}
|
||||
|
||||
sb.setLength(sb.length() - 2);
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public String describe() {
|
||||
return String.format("[ModTweaker2] Removing %d %s Recipe(s) for %s", this.recipes.size(), this.name, this.getRecipeInfo());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String describeUndo() {
|
||||
return String.format("[ModTweaker2] Restoring %d %s Recipe(s) for %s", this.recipes.size(), this.name, this.getRecipeInfo());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user