From 87c20f178a2eeefc35e3420c10dafea67f010196 Mon Sep 17 00:00:00 2001 From: Zixxl Date: Thu, 16 Jul 2015 11:53:59 +0200 Subject: [PATCH] Fixes for description --- .../mods/mekanism/util/AddMekanismRecipe.java | 27 ++++++++++++------- .../mekanism/util/RemoveMekanismRecipe.java | 27 ++++++++++++------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/main/java/modtweaker2/mods/mekanism/util/AddMekanismRecipe.java b/src/main/java/modtweaker2/mods/mekanism/util/AddMekanismRecipe.java index 148c948..aa6ac56 100644 --- a/src/main/java/modtweaker2/mods/mekanism/util/AddMekanismRecipe.java +++ b/src/main/java/modtweaker2/mods/mekanism/util/AddMekanismRecipe.java @@ -4,12 +4,14 @@ import java.util.Map; import java.util.Map.Entry; import mekanism.common.recipe.inputs.MachineInput; -import mekanism.common.recipe.machines.CombinerRecipe; -import mekanism.common.recipe.machines.CrusherRecipe; -import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.recipe.machines.MachineRecipe; +import mekanism.common.recipe.outputs.ChanceOutput; +import mekanism.common.recipe.outputs.ChemicalPairOutput; +import mekanism.common.recipe.outputs.FluidOutput; +import mekanism.common.recipe.outputs.GasOutput; import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.recipe.outputs.MachineOutput; +import mekanism.common.recipe.outputs.PressurizedOutput; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseMapAddition; @@ -27,15 +29,22 @@ public class AddMekanismRecipe extends BaseMapAddition recipe) { - MachineRecipe machineRecipe = recipe.getValue(); MachineOutput output = recipe.getValue().recipeOutput; - if(machineRecipe instanceof CombinerRecipe) { - return LogHelper.getStackDescription(((ItemStackOutput)output).output); - } else if (machineRecipe instanceof CrusherRecipe) { - return LogHelper.getStackDescription(((ItemStackOutput)output).output); - } else if (machineRecipe instanceof CrystallizerRecipe) { + if(output instanceof ItemStackOutput) { return LogHelper.getStackDescription(((ItemStackOutput)output).output); + } else if (output instanceof GasOutput) { + return LogHelper.getStackDescription(((GasOutput)output).output); + } else if (output instanceof FluidOutput) { + return LogHelper.getStackDescription(((FluidOutput)output).output); + } else if (output instanceof ChemicalPairOutput) { + return "[" + LogHelper.getStackDescription(((ChemicalPairOutput)output).leftGas) + ", " + + LogHelper.getStackDescription(((ChemicalPairOutput)output).rightGas) + "]"; + } else if (output instanceof ChanceOutput) { + return LogHelper.getStackDescription(((ChanceOutput)output).primaryOutput); + } else if (output instanceof PressurizedOutput) { + return "[" + LogHelper.getStackDescription(((PressurizedOutput)output).getItemOutput()) + ", " + + LogHelper.getStackDescription(((PressurizedOutput)output).getGasOutput()) + "]"; } return null; diff --git a/src/main/java/modtweaker2/mods/mekanism/util/RemoveMekanismRecipe.java b/src/main/java/modtweaker2/mods/mekanism/util/RemoveMekanismRecipe.java index d77e2dd..53880f2 100644 --- a/src/main/java/modtweaker2/mods/mekanism/util/RemoveMekanismRecipe.java +++ b/src/main/java/modtweaker2/mods/mekanism/util/RemoveMekanismRecipe.java @@ -4,12 +4,14 @@ import java.util.Map; import java.util.Map.Entry; import mekanism.common.recipe.inputs.MachineInput; -import mekanism.common.recipe.machines.CombinerRecipe; -import mekanism.common.recipe.machines.CrusherRecipe; -import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.recipe.machines.MachineRecipe; +import mekanism.common.recipe.outputs.ChanceOutput; +import mekanism.common.recipe.outputs.ChemicalPairOutput; +import mekanism.common.recipe.outputs.FluidOutput; +import mekanism.common.recipe.outputs.GasOutput; import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.recipe.outputs.MachineOutput; +import mekanism.common.recipe.outputs.PressurizedOutput; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseMapRemoval; @@ -21,15 +23,22 @@ public class RemoveMekanismRecipe extends BaseMapRemoval recipe) { - MachineRecipe machineRecipe = recipe.getValue(); MachineOutput output = recipe.getValue().recipeOutput; - if(machineRecipe instanceof CombinerRecipe) { - return LogHelper.getStackDescription(((ItemStackOutput)output).output); - } else if (machineRecipe instanceof CrusherRecipe) { - return LogHelper.getStackDescription(((ItemStackOutput)output).output); - } else if (machineRecipe instanceof CrystallizerRecipe) { + if(output instanceof ItemStackOutput) { return LogHelper.getStackDescription(((ItemStackOutput)output).output); + } else if (output instanceof GasOutput) { + return LogHelper.getStackDescription(((GasOutput)output).output); + } else if (output instanceof FluidOutput) { + return LogHelper.getStackDescription(((FluidOutput)output).output); + } else if (output instanceof ChemicalPairOutput) { + return "[" + LogHelper.getStackDescription(((ChemicalPairOutput)output).leftGas) + ", " + + LogHelper.getStackDescription(((ChemicalPairOutput)output).rightGas) + "]"; + } else if (output instanceof ChanceOutput) { + return LogHelper.getStackDescription(((ChanceOutput)output).primaryOutput); + } else if (output instanceof PressurizedOutput) { + return "[" + LogHelper.getStackDescription(((PressurizedOutput)output).getItemOutput()) + ", " + + LogHelper.getStackDescription(((PressurizedOutput)output).getGasOutput()) + "]"; } return null;