mirror of
https://github.com/GTNewHorizons/ModTweaker.git
synced 2026-11-19 03:59:08 +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,150 +1,150 @@
|
||||
package modtweaker2.mods.mekanism.util;
|
||||
|
||||
import static modtweaker2.helpers.StackHelper.areEqual;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import mekanism.api.gas.GasStack;
|
||||
import mekanism.common.recipe.inputs.InfusionInput;
|
||||
import mekanism.common.recipe.inputs.PressurizedInput;
|
||||
import mekanism.common.recipe.machines.PressurizedRecipe;
|
||||
import mekanism.common.recipe.outputs.ChanceOutput;
|
||||
import mekanism.common.recipe.outputs.ChemicalPairOutput;
|
||||
import mekanism.common.recipe.outputs.PressurizedOutput;
|
||||
import modtweaker2.utils.BaseMapRemoval;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public class RemoveMekanismRecipe extends BaseMapRemoval {
|
||||
private Object tmp;
|
||||
|
||||
public RemoveMekanismRecipe(String string, Map map, Object key) {
|
||||
super(string.toLowerCase().replace('_', ' '), map, key, null);
|
||||
this.tmp = key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply() {
|
||||
try {
|
||||
Iterator it = map.entrySet().iterator();
|
||||
|
||||
while (it.hasNext()) {
|
||||
Map.Entry pairs = (Map.Entry) it.next();
|
||||
if (pairs != null) {
|
||||
Object value = pairs.getValue();
|
||||
if (value != null && tmp != null) {
|
||||
if (tmp instanceof ItemStack && value instanceof ItemStack) {
|
||||
if (areEqual(((ItemStack) tmp), (ItemStack) value)) {
|
||||
key = pairs.getKey();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (tmp instanceof FluidStack && value instanceof FluidStack) {
|
||||
if (((FluidStack) tmp).isFluidEqual((FluidStack) value)) {
|
||||
key = pairs.getKey();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (tmp instanceof GasStack && value instanceof GasStack) {
|
||||
if (((GasStack) tmp).isGasEqual((GasStack) value)) {
|
||||
key = pairs.getKey();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (tmp instanceof ItemStack && value instanceof InfusionInput) {
|
||||
if (areEqual(((ItemStack) tmp), ((InfusionInput) value).inputStack)) {
|
||||
key = pairs.getKey();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (tmp instanceof ChemicalPairOutput && value instanceof ChemicalPairOutput) {
|
||||
ChemicalPairOutput par1 = (ChemicalPairOutput) tmp;
|
||||
ChemicalPairOutput par2 = (ChemicalPairOutput) value;
|
||||
if (par1.leftGas.isGasEqual(par2.leftGas) && par1.rightGas.isGasEqual(par2.rightGas)) {
|
||||
key = pairs.getKey();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (tmp instanceof ChanceOutput && value instanceof ChanceOutput) {
|
||||
ChanceOutput par1 = (ChanceOutput) tmp;
|
||||
ChanceOutput par2 = (ChanceOutput) value;
|
||||
if (areEqual(par1.primaryOutput, par2.primaryOutput)) {
|
||||
if (par1.secondaryOutput == null || (par1.secondaryOutput != null && par2.secondaryOutput != null && areEqual(par1.secondaryOutput, par2.secondaryOutput))) {
|
||||
key = pairs.getKey();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (tmp instanceof PressurizedOutput && value instanceof PressurizedRecipe) {
|
||||
PressurizedOutput par1 = (PressurizedOutput) tmp;
|
||||
PressurizedOutput par2 = ((PressurizedRecipe) value).recipeOutput;
|
||||
if (areEqual(par1.getItemOutput(), (par2.getItemOutput()))) {
|
||||
if (par1.getGasOutput().isGasEqual(par2.getGasOutput())) {
|
||||
key = pairs.getKey();
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
|
||||
recipe = map.get(key);
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
map.remove(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String describe() {
|
||||
if (tmp instanceof ItemStack)
|
||||
return "Removing " + description + " Recipe for : " + ((ItemStack) tmp).getDisplayName();
|
||||
else if (tmp instanceof FluidStack)
|
||||
return "Removing " + description + " Recipe for : " + ((FluidStack) tmp).getFluid().getLocalizedName();
|
||||
else if (tmp instanceof ChemicalPairOutput)
|
||||
return "Removing " + description + " Recipe for : " + ((ChemicalPairOutput) tmp).leftGas.getGas().getLocalizedName();
|
||||
else if (tmp instanceof ChanceOutput)
|
||||
return "Removing " + description + " Recipe for : " + ((ChanceOutput) tmp).primaryOutput.getDisplayName();
|
||||
else if (tmp instanceof GasStack)
|
||||
return "Removing " + description + " Recipe for : " + ((GasStack) tmp).getGas().getLocalizedName();
|
||||
else if (tmp instanceof PressurizedInput)
|
||||
return "Removing " + description + " Recipe for : " + ((PressurizedInput) tmp).getSolid().getDisplayName();
|
||||
else if (tmp instanceof InfusionInput)
|
||||
return "Removing " + description + " Recipe for : " + ((InfusionInput) tmp).inputStack.getDisplayName();
|
||||
else
|
||||
return super.getRecipeInfo();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String describeUndo() {
|
||||
if (tmp instanceof ItemStack)
|
||||
return "Restoring " + description + " Recipe for : " + ((ItemStack) tmp).getDisplayName();
|
||||
else if (tmp instanceof FluidStack)
|
||||
return "Restoring " + description + " Recipe for : " + ((FluidStack) tmp).getFluid().getLocalizedName();
|
||||
else if (tmp instanceof ChemicalPairOutput)
|
||||
return "Restoring " + description + " Recipe for : " + ((ChemicalPairOutput) tmp).leftGas.getGas().getLocalizedName();
|
||||
else if (tmp instanceof ChanceOutput)
|
||||
return "Restoring " + description + " Recipe for : " + ((ChanceOutput) tmp).primaryOutput.getDisplayName();
|
||||
else if (tmp instanceof GasStack)
|
||||
return "Restoring " + description + " Recipe for : " + ((GasStack) tmp).getGas().getLocalizedName();
|
||||
else if (tmp instanceof PressurizedInput)
|
||||
return "Restoring " + description + " Recipe for : " + ((PressurizedInput) tmp).getSolid().getDisplayName();
|
||||
else if (tmp instanceof InfusionInput)
|
||||
return "Restoring " + description + " Recipe for : " + ((InfusionInput) tmp).inputStack.getDisplayName();
|
||||
else
|
||||
return super.getRecipeInfo();
|
||||
}
|
||||
}
|
||||
//package modtweaker2.mods.mekanism.util;
|
||||
//
|
||||
//import static modtweaker2.helpers.StackHelper.areEqual;
|
||||
//
|
||||
//import java.util.Iterator;
|
||||
//import java.util.Map;
|
||||
//
|
||||
//import mekanism.api.gas.GasStack;
|
||||
//import mekanism.common.recipe.inputs.InfusionInput;
|
||||
//import mekanism.common.recipe.inputs.PressurizedInput;
|
||||
//import mekanism.common.recipe.machines.PressurizedRecipe;
|
||||
//import mekanism.common.recipe.outputs.ChanceOutput;
|
||||
//import mekanism.common.recipe.outputs.ChemicalPairOutput;
|
||||
//import mekanism.common.recipe.outputs.PressurizedOutput;
|
||||
//import modtweaker2.utils.BaseMapRemoval;
|
||||
//import net.minecraft.item.ItemStack;
|
||||
//import net.minecraftforge.fluids.FluidStack;
|
||||
//
|
||||
//public class RemoveMekanismRecipe extends BaseMapRemoval {
|
||||
// private Object tmp;
|
||||
//
|
||||
// public RemoveMekanismRecipe(String string, Map map, Object key) {
|
||||
// super(string.toLowerCase().replace('_', ' '), map, key, null);
|
||||
// this.tmp = key;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void apply() {
|
||||
// try {
|
||||
// Iterator it = map.entrySet().iterator();
|
||||
//
|
||||
// while (it.hasNext()) {
|
||||
// Map.Entry pairs = (Map.Entry) it.next();
|
||||
// if (pairs != null) {
|
||||
// Object value = pairs.getValue();
|
||||
// if (value != null && tmp != null) {
|
||||
// if (tmp instanceof ItemStack && value instanceof ItemStack) {
|
||||
// if (areEqual(((ItemStack) tmp), (ItemStack) value)) {
|
||||
// key = pairs.getKey();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (tmp instanceof FluidStack && value instanceof FluidStack) {
|
||||
// if (((FluidStack) tmp).isFluidEqual((FluidStack) value)) {
|
||||
// key = pairs.getKey();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (tmp instanceof GasStack && value instanceof GasStack) {
|
||||
// if (((GasStack) tmp).isGasEqual((GasStack) value)) {
|
||||
// key = pairs.getKey();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (tmp instanceof ItemStack && value instanceof InfusionInput) {
|
||||
// if (areEqual(((ItemStack) tmp), ((InfusionInput) value).inputStack)) {
|
||||
// key = pairs.getKey();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (tmp instanceof ChemicalPairOutput && value instanceof ChemicalPairOutput) {
|
||||
// ChemicalPairOutput par1 = (ChemicalPairOutput) tmp;
|
||||
// ChemicalPairOutput par2 = (ChemicalPairOutput) value;
|
||||
// if (par1.leftGas.isGasEqual(par2.leftGas) && par1.rightGas.isGasEqual(par2.rightGas)) {
|
||||
// key = pairs.getKey();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (tmp instanceof ChanceOutput && value instanceof ChanceOutput) {
|
||||
// ChanceOutput par1 = (ChanceOutput) tmp;
|
||||
// ChanceOutput par2 = (ChanceOutput) value;
|
||||
// if (areEqual(par1.primaryOutput, par2.primaryOutput)) {
|
||||
// if (par1.secondaryOutput == null || (par1.secondaryOutput != null && par2.secondaryOutput != null && areEqual(par1.secondaryOutput, par2.secondaryOutput))) {
|
||||
// key = pairs.getKey();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (tmp instanceof PressurizedOutput && value instanceof PressurizedRecipe) {
|
||||
// PressurizedOutput par1 = (PressurizedOutput) tmp;
|
||||
// PressurizedOutput par2 = ((PressurizedRecipe) value).recipeOutput;
|
||||
// if (areEqual(par1.getItemOutput(), (par2.getItemOutput()))) {
|
||||
// if (par1.getGasOutput().isGasEqual(par2.getGasOutput())) {
|
||||
// key = pairs.getKey();
|
||||
// break;
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// it.remove();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// recipe = map.get(key);
|
||||
//
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
//
|
||||
// map.remove(key);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public String describe() {
|
||||
// if (tmp instanceof ItemStack)
|
||||
// return "Removing " + description + " Recipe for : " + ((ItemStack) tmp).getDisplayName();
|
||||
// else if (tmp instanceof FluidStack)
|
||||
// return "Removing " + description + " Recipe for : " + ((FluidStack) tmp).getFluid().getLocalizedName();
|
||||
// else if (tmp instanceof ChemicalPairOutput)
|
||||
// return "Removing " + description + " Recipe for : " + ((ChemicalPairOutput) tmp).leftGas.getGas().getLocalizedName();
|
||||
// else if (tmp instanceof ChanceOutput)
|
||||
// return "Removing " + description + " Recipe for : " + ((ChanceOutput) tmp).primaryOutput.getDisplayName();
|
||||
// else if (tmp instanceof GasStack)
|
||||
// return "Removing " + description + " Recipe for : " + ((GasStack) tmp).getGas().getLocalizedName();
|
||||
// else if (tmp instanceof PressurizedInput)
|
||||
// return "Removing " + description + " Recipe for : " + ((PressurizedInput) tmp).getSolid().getDisplayName();
|
||||
// else if (tmp instanceof InfusionInput)
|
||||
// return "Removing " + description + " Recipe for : " + ((InfusionInput) tmp).inputStack.getDisplayName();
|
||||
// else
|
||||
// return super.getRecipeInfo();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public String describeUndo() {
|
||||
// if (tmp instanceof ItemStack)
|
||||
// return "Restoring " + description + " Recipe for : " + ((ItemStack) tmp).getDisplayName();
|
||||
// else if (tmp instanceof FluidStack)
|
||||
// return "Restoring " + description + " Recipe for : " + ((FluidStack) tmp).getFluid().getLocalizedName();
|
||||
// else if (tmp instanceof ChemicalPairOutput)
|
||||
// return "Restoring " + description + " Recipe for : " + ((ChemicalPairOutput) tmp).leftGas.getGas().getLocalizedName();
|
||||
// else if (tmp instanceof ChanceOutput)
|
||||
// return "Restoring " + description + " Recipe for : " + ((ChanceOutput) tmp).primaryOutput.getDisplayName();
|
||||
// else if (tmp instanceof GasStack)
|
||||
// return "Restoring " + description + " Recipe for : " + ((GasStack) tmp).getGas().getLocalizedName();
|
||||
// else if (tmp instanceof PressurizedInput)
|
||||
// return "Restoring " + description + " Recipe for : " + ((PressurizedInput) tmp).getSolid().getDisplayName();
|
||||
// else if (tmp instanceof InfusionInput)
|
||||
// return "Restoring " + description + " Recipe for : " + ((InfusionInput) tmp).inputStack.getDisplayName();
|
||||
// else
|
||||
// return super.getRecipeInfo();
|
||||
// }
|
||||
//}
|
||||
Reference in new issue
Block a user