From 2dd8e910f4942efea1d749c466700b49180953ed Mon Sep 17 00:00:00 2001 From: Zixxl Date: Thu, 9 Jul 2015 11:28:40 +0200 Subject: [PATCH] More Logging rework --- src/main/java/modtweaker2/Commands.java | 6 +- .../java/modtweaker2/helpers/InputHelper.java | 87 ++---------- .../java/modtweaker2/helpers/LogHelper.java | 130 ++++++++++++++++++ .../commands/AppliedEnergisticsLogger.java | 18 +-- .../mods/appeng/handlers/Grind.java | 7 +- .../mods/appeng/handlers/Inscriber.java | 8 +- .../mods/auracascade/handlers/Pylon.java | 5 +- .../mods/botania/commands/BotaniaLogger.java | 18 +-- .../mods/botania/handlers/Apothecary.java | 5 +- .../mods/botania/handlers/ElvenTrade.java | 5 +- .../mods/botania/handlers/ManaInfusion.java | 5 +- .../mods/botania/handlers/RuneAltar.java | 5 +- .../mods/exnihilo/handlers/Crucible.java | 6 +- .../commands/FactorizationLogger.java | 20 +-- .../factorization/handlers/Crystallizer.java | 5 +- .../factorization/handlers/Lacerator.java | 5 +- .../factorization/handlers/SlagFurnace.java | 5 +- .../mods/forestry/handlers/Carpenter.java | 5 +- .../mods/forestry/handlers/Centrifuge.java | 5 +- .../mods/forestry/handlers/Fermenter.java | 5 +- .../mods/forestry/handlers/Moistener.java | 5 +- .../mods/forestry/handlers/Squeezer.java | 5 +- .../mods/forestry/handlers/Still.java | 5 +- .../handlers/ThermionicFabricator.java | 9 +- .../mods/fsp/handlers/Crucible.java | 9 +- .../mods/fsp/handlers/Furnace.java | 5 +- .../mods/mariculture/handlers/Anvil.java | 5 +- .../mods/mariculture/handlers/Casting.java | 6 +- .../mods/mariculture/handlers/Crucible.java | 5 +- .../mods/mariculture/handlers/Vat.java | 9 +- .../mods/metallurgy/handlers/Alloyer.java | 6 +- .../mods/metallurgy/handlers/Crusher.java | 6 +- .../pneumaticcraft/handlers/Assembly.java | 7 +- .../pneumaticcraft/handlers/Pressure.java | 5 +- .../railcraft/commands/RailcraftLogger.java | 110 +++++++++++++++ .../mods/railcraft/handlers/BlastFurnace.java | 5 +- .../mods/railcraft/handlers/CokeOven.java | 5 +- .../mods/railcraft/handlers/RockCrusher.java | 5 +- .../tconstruct/commands/TConstructLogger.java | 30 ++-- .../mods/tconstruct/handlers/Casting.java | 14 +- .../mods/tconstruct/handlers/Drying.java | 5 +- .../mods/tconstruct/handlers/Smeltery.java | 13 +- .../mods/tconstruct/handlers/TiCTweaks.java | 6 +- .../mods/tfcraft/handlers/Anvil.java | 5 +- .../mods/tfcraft/handlers/Barrel.java | 9 +- .../mods/tfcraft/handlers/Kiln.java | 6 +- .../mods/tfcraft/handlers/Quern.java | 6 +- .../mods/thaumcraft/handlers/Arcane.java | 5 +- .../mods/thaumcraft/handlers/Crucible.java | 5 +- .../mods/thaumcraft/handlers/Infusion.java | 3 +- .../mods/thaumcraft/handlers/Loot.java | 4 +- .../commands/ThermalExpansionLogger.java | 56 ++++---- .../thermalexpansion/handlers/Crucible.java | 7 +- .../thermalexpansion/handlers/Furnace.java | 7 +- .../thermalexpansion/handlers/Pulverizer.java | 7 +- .../thermalexpansion/handlers/Sawmill.java | 7 +- .../thermalexpansion/handlers/Smelter.java | 7 +- .../thermalexpansion/handlers/Transposer.java | 9 +- .../utils/BaseCraftingAddition.java | 4 +- .../utils/BaseCraftingRemoval.java | 4 +- 60 files changed, 464 insertions(+), 322 deletions(-) create mode 100644 src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java diff --git a/src/main/java/modtweaker2/Commands.java b/src/main/java/modtweaker2/Commands.java index a01bf09..81fe35d 100644 --- a/src/main/java/modtweaker2/Commands.java +++ b/src/main/java/modtweaker2/Commands.java @@ -16,6 +16,7 @@ import modtweaker2.mods.chisel.commands.ChiselGroupLogger; import modtweaker2.mods.chisel.commands.ChiselVariationLogger; import modtweaker2.mods.factorization.commands.FactorizationLogger; import modtweaker2.mods.mekanism.gas.GasLogger; +import modtweaker2.mods.railcraft.commands.RailcraftLogger; import modtweaker2.mods.tconstruct.MaterialLogger; import modtweaker2.mods.tconstruct.commands.TConstructLogger; import modtweaker2.mods.thaumcraft.commands.AspectLogger; @@ -80,8 +81,11 @@ public class Commands { if (TweakerPlugin.isLoaded("factorization")) { MineTweakerAPI.server.addMineTweakerCommand("factorization", new String[] {"/minetweaker factorization [FILTER]", " Outputs a list of all Factorization recipes."}, new FactorizationLogger()); } + + if (TweakerPlugin.isLoaded("Railcraft")) { + MineTweakerAPI.server.addMineTweakerCommand("railcraft", new String[] {"/minetweaker railcraft [FILTER]", " Outputs a list of all Railcraft recipes."}, new RailcraftLogger()); + } } - } public static void registerMineTweakerCommand(String commandName, String[] usages, ICommandFunction commandFunction) { diff --git a/src/main/java/modtweaker2/helpers/InputHelper.java b/src/main/java/modtweaker2/helpers/InputHelper.java index 789f688..6912c3f 100644 --- a/src/main/java/modtweaker2/helpers/InputHelper.java +++ b/src/main/java/modtweaker2/helpers/InputHelper.java @@ -1,24 +1,21 @@ package modtweaker2.helpers; +import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.List; import minetweaker.api.entity.IEntity; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; -import minetweaker.mc1710.data.NBTConverter; import minetweaker.mc1710.item.MCItemStack; import minetweaker.mc1710.liquid.MCLiquidStack; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class InputHelper { public static boolean isABlock(IItemStack block) { @@ -29,82 +26,20 @@ public class InputHelper { return true; } - /** - * Returns a string representation of the item which can also be used in scripts - */ - public static String getStackDescription(Object object) { - if(object instanceof ItemStack) { - ItemStack stack = (ItemStack)object; - StringBuilder sb = new StringBuilder(); - - // Creates a name like or - sb.append('<'); - sb.append(Item.itemRegistry.getNameForObject(stack.getItem())); - if(stack.getItemDamage() == 32767) { - sb.append(":*"); - } else if (stack.getItemDamage() > 0) { - sb.append(":").append(stack.getItemDamage()); - } - sb.append('>'); - - // Do we have a tag? (e.g. .withTag({}) ) - if(stack.getTagCompound() != null) - { - sb.append(".withTag("); - sb.append(NBTConverter.from(stack.getTagCompound(), true)); - sb.append(')'); - } - - // Do we have a stack size > 1? - if(stack.stackSize > 1) { - sb.append(" * ").append(stack.stackSize); - } - - return sb.toString(); - } else if (object instanceof FluidStack) { - FluidStack stack = (FluidStack)object; - StringBuilder sb = new StringBuilder(); - - sb.append("'); - - if(stack.amount > 1) { - sb.append(" * ").append(stack.amount); + public static T[][] getMultiDimensionalArray(Class clazz, T[] array, int height, int width) { + + @SuppressWarnings("unchecked") + T[][] multiDim = (T[][])Array.newInstance(clazz, new int[] {height, width}); + + for(int y = 0; y < height; y++) { + for(int x = 0; x < width; x++) { + multiDim[y][x] = array[x + (y * width)]; } - - return sb.toString(); - } else if (object instanceof String) { - List ores = OreDictionary.getOres((String)object); - - // Check if string specifies an oredict entry - if(!ores.isEmpty()) { - return ""; - } else { - return "\"" + (String)object + "\""; - } - } else if (object != null) { - return "\"" + object.toString() + "\""; - } else { - return "null"; } + + return multiDim; } - public static String getArrayDescription(List objects) { - StringBuilder sb = new StringBuilder(); - - if(objects.isEmpty()) { - sb.append("[]"); - } else { - sb.append('['); - for(Object object : objects) { - sb.append(InputHelper.getStackDescription(object)).append(", "); - } - sb.setLength(sb.length() - 2); - sb.append(']'); - } - - return sb.toString(); - } - public static IItemStack[] toStacks(IIngredient[] iIngredient) { ArrayList stacks = new ArrayList(); for (IIngredient ing : iIngredient) { diff --git a/src/main/java/modtweaker2/helpers/LogHelper.java b/src/main/java/modtweaker2/helpers/LogHelper.java index cc8b444..0834e1a 100644 --- a/src/main/java/modtweaker2/helpers/LogHelper.java +++ b/src/main/java/modtweaker2/helpers/LogHelper.java @@ -1,8 +1,21 @@ package modtweaker2.helpers; +import java.util.Arrays; +import java.util.List; + import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; +import minetweaker.mc1710.data.NBTConverter; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; public class LogHelper { public static void logPrinted(IPlayer player) { @@ -37,4 +50,121 @@ public class LogHelper { public static void logInfo(String message) { MineTweakerAPI.logInfo("[ModTweaker2] " + message); } + + /** + * Returns a string representation of the item which can also be used in scripts + */ + public static String getStackDescription(Object object) { + if(object instanceof ItemStack) { + ItemStack stack = (ItemStack)object; + StringBuilder sb = new StringBuilder(); + + // Creates a name like or + sb.append('<'); + sb.append(Item.itemRegistry.getNameForObject(stack.getItem())); + if(stack.getItemDamage() == 32767) { + sb.append(":*"); + } else if (stack.getItemDamage() > 0) { + sb.append(":").append(stack.getItemDamage()); + } + sb.append('>'); + + // Do we have a tag? (e.g. .withTag({}) ) + if(stack.getTagCompound() != null) + { + sb.append(".withTag("); + sb.append(NBTConverter.from(stack.getTagCompound(), true)); + sb.append(')'); + } + + // Do we have a stack size > 1? + if(stack.stackSize > 1) { + sb.append(" * ").append(stack.stackSize); + } + + return sb.toString(); + } else if (object instanceof FluidStack) { + FluidStack stack = (FluidStack)object; + StringBuilder sb = new StringBuilder(); + + sb.append("'); + + if(stack.amount > 1) { + sb.append(" * ").append(stack.amount); + } + + return sb.toString(); + } else if (object instanceof String) { + List ores = OreDictionary.getOres((String)object); + + // Check if string specifies an oredict entry + if(!ores.isEmpty()) { + return ""; + } else { + return "\"" + (String)object + "\""; + } + } else if (object != null) { + return "\"" + object.toString() + "\""; + } else { + return "null"; + } + } + + public static String getListDescription(List objects) { + StringBuilder sb = new StringBuilder(); + + if(objects.isEmpty()) { + sb.append("[]"); + } else { + sb.append('['); + for(Object object : objects) { + if(object instanceof List) { + sb.append(getListDescription((List)object)).append(", "); + } else if(object instanceof Object[]) { + sb.append(getListDescription(Arrays.asList((Object[])object))).append(", "); + } else { + sb.append(getStackDescription(object)).append(", "); + } + } + sb.setLength(sb.length() - 2); + sb.append(']'); + } + + return sb.toString(); + } + + public static String getCraftingDescription(IRecipe recipe) { + if(recipe instanceof ShapelessOreRecipe) + return LogHelper.getCraftingDescription((ShapelessOreRecipe)recipe); + else if(recipe instanceof ShapedOreRecipe) + return LogHelper.getCraftingDescription((ShapedOreRecipe)recipe); + else if(recipe instanceof ShapelessRecipes) + return LogHelper.getCraftingDescription((ShapelessRecipes)recipe); + else if(recipe instanceof ShapedRecipes) + return LogHelper.getCraftingDescription((ShapedRecipes)recipe); + + return recipe.toString(); + } + + public static String getCraftingDescription(ShapelessOreRecipe recipe) { + return getListDescription(recipe.getInput()); + } + + public static String getCraftingDescription(ShapelessRecipes recipe) { + return getListDescription(recipe.recipeItems); + } + + public static String getCraftingDescription(ShapedOreRecipe recipe) { + int height = ReflectionHelper.getObject(recipe, "width"); + int width = ReflectionHelper.getObject(recipe, "height"); + + Object[][] recipes = InputHelper.getMultiDimensionalArray(Object.class, recipe.getInput(), height, width); + + return getListDescription(Arrays.asList(recipes)); + } + + public static String getCraftingDescription(ShapedRecipes recipe) { + ItemStack[][] recipes = InputHelper.getMultiDimensionalArray(ItemStack.class, recipe.recipeItems, recipe.recipeHeight, recipe.recipeWidth); + return getListDescription(Arrays.asList(recipes)); + } } diff --git a/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java b/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java index da2f6e1..1fe753a 100644 --- a/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java +++ b/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java @@ -8,7 +8,7 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StringHelper; import appeng.api.AEApi; import appeng.api.features.IGrinderEntry; @@ -35,12 +35,12 @@ public class AppliedEnergisticsLogger implements ICommandFunction { if(args.isEmpty() || args.contains("grinder")) { for(IGrinderEntry recipe : AEApi.instance().registries().grinder().getRecipes()) { MineTweakerAPI.logCommand(String.format("mods.appeng.Grinder.addRecipe(%s, %s, %d, %s, %s, %s, %s);", - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getOutput()), + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getOutput()), recipe.getEnergyCost(), - InputHelper.getStackDescription(recipe.getOptionalOutput()), + LogHelper.getStackDescription(recipe.getOptionalOutput()), recipe.getOptionalChance(), - InputHelper.getStackDescription(recipe.getSecondOptionalOutput()), + LogHelper.getStackDescription(recipe.getSecondOptionalOutput()), recipe.getSecondOptionalChance())); } } @@ -48,10 +48,10 @@ public class AppliedEnergisticsLogger implements ICommandFunction { if(args.isEmpty() || args.contains("inscriber")) { for(IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes()) { MineTweakerAPI.logCommand(String.format("mods.appeng.Inscriber.addRecipe(%s, %s, %s, %s, \"%s\");", - InputHelper.getArrayDescription(recipe.getInputs()), - InputHelper.getStackDescription(recipe.getTopOptional().orNull()), - InputHelper.getStackDescription(recipe.getBottomOptional().orNull()), - InputHelper.getStackDescription(recipe.getOutput()), + LogHelper.getListDescription(recipe.getInputs()), + LogHelper.getStackDescription(recipe.getTopOptional().orNull()), + LogHelper.getStackDescription(recipe.getBottomOptional().orNull()), + LogHelper.getStackDescription(recipe.getOutput()), recipe.getProcessType().toString())); } } diff --git a/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java b/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java index 77e90a8..6625690 100644 --- a/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java +++ b/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java @@ -1,6 +1,5 @@ package modtweaker2.mods.appeng.handlers; -import static modtweaker2.helpers.InputHelper.getStackDescription; import static modtweaker2.helpers.InputHelper.toIItemStack; import static modtweaker2.helpers.InputHelper.toStack; import static modtweaker2.helpers.StackHelper.matches; @@ -49,7 +48,7 @@ public class Grind { // Check if the recipe is already present, we don't want to add duplicates for(IGrinderEntry r : AEApi.instance().registries().grinder().getRecipes()) { if(r != null && AppliedEnergisticsHelper.equals(r, recipe)) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, InputHelper.getStackDescription(toStack(input)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, LogHelper.getStackDescription(toStack(input)))); return; } } @@ -66,7 +65,7 @@ public class Grind { @Override public String getRecipeInfo(IGrinderEntry recipe) { - return getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } @Override @@ -109,7 +108,7 @@ public class Grind { @Override public String getRecipeInfo(IGrinderEntry recipe) { - return getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } diff --git a/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java index 9eaf18f..694aee8 100644 --- a/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java +++ b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java @@ -1,6 +1,5 @@ package modtweaker2.mods.appeng.handlers; -import static modtweaker2.helpers.InputHelper.getStackDescription; import static modtweaker2.helpers.InputHelper.toIItemStack; import static modtweaker2.helpers.InputHelper.toStack; import static modtweaker2.helpers.InputHelper.toStacks; @@ -11,7 +10,6 @@ import java.util.LinkedList; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.appeng.AppliedEnergisticsHelper; import modtweaker2.utils.ArrayUtils; @@ -44,7 +42,7 @@ public class Inscriber { // Check if the recipe is already present, we don't want to add duplicates for(IInscriberRecipe r : AEApi.instance().registries().inscriber().getRecipes()) { if(r != null && AppliedEnergisticsHelper.equals(r, recipe)) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", Inscriber.name, InputHelper.getStackDescription(toStack(out)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", Inscriber.name, LogHelper.getStackDescription(toStack(out)))); return; } } @@ -87,7 +85,7 @@ public class Inscriber { @Override public String getRecipeInfo(IInscriberRecipe recipe) { - return getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } @Override @@ -156,7 +154,7 @@ public class Inscriber { @Override public String getRecipeInfo(IInscriberRecipe recipe) { - return getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/auracascade/handlers/Pylon.java b/src/main/java/modtweaker2/mods/auracascade/handlers/Pylon.java index 1cba0a8..6dc2544 100644 --- a/src/main/java/modtweaker2/mods/auracascade/handlers/Pylon.java +++ b/src/main/java/modtweaker2/mods/auracascade/handlers/Pylon.java @@ -9,7 +9,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.auracascade.AuraCascadeHelper; import modtweaker2.mods.auracascade.aura.IAuraStack; @@ -50,7 +49,7 @@ public class Pylon { @Override protected String getRecipeInfo(PylonRecipe recipe) { - return InputHelper.getStackDescription(recipe.result); + return LogHelper.getStackDescription(recipe.result); } } @@ -81,7 +80,7 @@ public class Pylon { @Override protected String getRecipeInfo(PylonRecipe recipe) { - return InputHelper.getStackDescription(recipe.result); + return LogHelper.getStackDescription(recipe.result); } } } diff --git a/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java b/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java index bc04dab..95e2d9c 100644 --- a/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java +++ b/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java @@ -8,7 +8,7 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StringHelper; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeElvenTrade; @@ -39,8 +39,8 @@ public class BotaniaLogger implements ICommandFunction { if(args.isEmpty() || args.contains("apothecary")) { for(RecipePetals recipe : BotaniaAPI.petalRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.Apothecary.addRecipe(%s, %s);", - InputHelper.getStackDescription(recipe.getOutput()), - InputHelper.getArrayDescription(recipe.getInputs()) // Need to resolve "petalXXX" to an item + LogHelper.getStackDescription(recipe.getOutput()), + LogHelper.getListDescription(recipe.getInputs()) // Need to resolve "petalXXX" to an item )); } } @@ -48,8 +48,8 @@ public class BotaniaLogger implements ICommandFunction { if(args.isEmpty() || args.contains("elventrade")) { for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.ElvenTrade.addRecipe(%s, %s);", - InputHelper.getStackDescription(recipe.getOutput()), - InputHelper.getArrayDescription(recipe.getInputs() + LogHelper.getStackDescription(recipe.getOutput()), + LogHelper.getListDescription(recipe.getInputs() ))); } } @@ -58,8 +58,8 @@ public class BotaniaLogger implements ICommandFunction { for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.ManaInfusion.add%s(%s, %s, %d);", recipe.isAlchemy() ? "Alchemy" : recipe.isConjuration() ? "Conjuration" : "Infusion", - InputHelper.getStackDescription(recipe.getOutput()), - InputHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getOutput()), + LogHelper.getStackDescription(recipe.getInput()), recipe.getManaToConsume() )); } @@ -68,8 +68,8 @@ public class BotaniaLogger implements ICommandFunction { if(args.isEmpty() || args.contains("runealtar")) { for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.RuneAltar.addRecipe(%s, %s, %d);", - InputHelper.getStackDescription(recipe.getOutput()), - InputHelper.getArrayDescription(recipe.getInputs()), + LogHelper.getStackDescription(recipe.getOutput()), + LogHelper.getListDescription(recipe.getInputs()), recipe.getManaUsage() )); } diff --git a/src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java b/src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java index 6e14090..d61b4ae 100644 --- a/src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -46,7 +45,7 @@ public class Apothecary { @Override public String getRecipeInfo(RecipePetals recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } @@ -83,7 +82,7 @@ public class Apothecary { @Override public String getRecipeInfo(RecipePetals recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java b/src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java index 0260c17..78cfcde 100644 --- a/src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -40,7 +39,7 @@ public class ElvenTrade { @Override public String getRecipeInfo(RecipeElvenTrade recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } @@ -72,7 +71,7 @@ public class ElvenTrade { @Override public String getRecipeInfo(RecipeElvenTrade recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java b/src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java index f9623f9..5d5b898 100644 --- a/src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -53,7 +52,7 @@ public class ManaInfusion { @Override public String getRecipeInfo(RecipeManaInfusion recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } @@ -85,7 +84,7 @@ public class ManaInfusion { @Override public String getRecipeInfo(RecipeManaInfusion recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java b/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java index a2ee14b..51bf2eb 100644 --- a/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -41,7 +40,7 @@ public class RuneAltar { @Override public String getRecipeInfo(RecipeRuneAltar recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } @@ -73,7 +72,7 @@ public class RuneAltar { @Override public String getRecipeInfo(RecipeRuneAltar recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java index 191a1d4..492ea57 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java @@ -10,7 +10,7 @@ import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; import net.minecraft.block.Block; @@ -45,7 +45,7 @@ public class Crucible { @Override protected String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.getValue().block, 1, recipe.getValue().meta)); + return LogHelper.getStackDescription(new ItemStack(recipe.getValue().block, 1, recipe.getValue().meta)); } } @@ -74,7 +74,7 @@ public class Crucible { @Override protected String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.getValue().block, 1, recipe.getValue().meta)); + return LogHelper.getStackDescription(new ItemStack(recipe.getValue().block, 1, recipe.getValue().meta)); } } diff --git a/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java b/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java index b05bc84..b7188ad 100644 --- a/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java +++ b/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java @@ -8,7 +8,7 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.helpers.StringHelper; import modtweaker2.mods.factorization.FactorizationHelper; @@ -36,9 +36,9 @@ public class FactorizationLogger implements ICommandFunction { if(args.isEmpty() || args.contains("crystallizer")) { for(Object recipe : FactorizationHelper.crystallizer) { MineTweakerAPI.logCommand(String.format("mods.factorization.Crystallizer.addRecipe(%s, %s, %s, %s);", - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "input")), - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output")), - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "solution")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "input")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "solution")), ReflectionHelper.getObject(recipe, "output_count"))); } } @@ -47,9 +47,9 @@ public class FactorizationLogger implements ICommandFunction { for(Object recipe : FactorizationHelper.lacerator) { MineTweakerAPI.logCommand(String.format("mods.factorization.Lacerator.addRecipe(%s, %s, %s);", ReflectionHelper.getObject(recipe, "oreName") != null ? - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "oreName")) : - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "itemstack")), - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "oreName")) : + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "itemstack")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output")), ReflectionHelper.getObject(recipe, "probability"))); } } @@ -57,10 +57,10 @@ public class FactorizationLogger implements ICommandFunction { if(args.isEmpty() || args.contains("slagfurnace")) { for(Object recipe : FactorizationHelper.slag) { MineTweakerAPI.logCommand(String.format("mods.factorization.SlagFurnace.addRecipe(%s, %s, %s, %s, %s);", - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "input")), - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output2")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "input")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output2")), ReflectionHelper.getObject(recipe, "prob2"), - InputHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output1")), + LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "output1")), ReflectionHelper.getObject(recipe, "prob1"))); } } diff --git a/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java b/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java index fb50cb2..39e8166 100644 --- a/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java @@ -10,7 +10,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.factorization.FactorizationHelper; @@ -43,7 +42,7 @@ public class Crystallizer { @Override public String getRecipeInfo(Object recipe) { - return InputHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output")); + return LogHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output")); } } @@ -77,7 +76,7 @@ public class Crystallizer { @Override public String getRecipeInfo(Object recipe) { - return InputHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output")); + return LogHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output")); } } } diff --git a/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java b/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java index 3cabcee..c19e906 100644 --- a/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.factorization.FactorizationHelper; @@ -43,7 +42,7 @@ public class Lacerator { @Override public String getRecipeInfo(Object recipe) { - return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output")); + return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output")); } } @@ -76,7 +75,7 @@ public class Lacerator { @Override public String getRecipeInfo(Object recipe) { - return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output")); + return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output")); } } } diff --git a/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java b/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java index 5f72fe6..c35632a 100644 --- a/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java @@ -10,7 +10,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.factorization.FactorizationHelper; @@ -42,7 +41,7 @@ public class SlagFurnace { @Override public String getRecipeInfo(Object recipe) { - return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input")); + return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input")); } } @@ -77,7 +76,7 @@ public class SlagFurnace { @Override public String getRecipeInfo(Object recipe) { - return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input")); + return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input")); } } } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java b/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java index 13ed6cb..ee499ce 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java @@ -14,7 +14,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.forestry.ForestryHelper; import modtweaker2.utils.BaseListAddition; @@ -73,7 +72,7 @@ public class Carpenter { @Override protected String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } @@ -106,7 +105,7 @@ public class Carpenter { @Override protected String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java index 5ef7eac..fef05f4 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -50,7 +49,7 @@ public class Centrifuge { @Override protected String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.resource); + return LogHelper.getStackDescription(recipe.resource); } } @@ -81,7 +80,7 @@ public class Centrifuge { @Override protected String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.resource); + return LogHelper.getStackDescription(recipe.resource); } } } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java index 32d7d22..1ae25e2 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java @@ -14,7 +14,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -90,7 +89,7 @@ public class Fermenter { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.output); + return LogHelper.getStackDescription(recipe.output); } } @@ -173,7 +172,7 @@ public class Fermenter { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.output); + return LogHelper.getStackDescription(recipe.output); } } } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java b/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java index f43d0c4..52400e5 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java @@ -10,7 +10,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -41,7 +40,7 @@ public class Moistener { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.product); + return LogHelper.getStackDescription(recipe.product); } } @@ -71,7 +70,7 @@ public class Moistener { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.product); + return LogHelper.getStackDescription(recipe.product); } } } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java b/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java index 2271ff2..27156bb 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java @@ -15,7 +15,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -47,7 +46,7 @@ public class Squeezer { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.liquid); + return LogHelper.getStackDescription(recipe.liquid); } } @@ -85,7 +84,7 @@ public class Squeezer { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.liquid); + return LogHelper.getStackDescription(recipe.liquid); } } } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Still.java b/src/main/java/modtweaker2/mods/forestry/handlers/Still.java index 6986c0a..19a29f7 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Still.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Still.java @@ -10,7 +10,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -45,7 +44,7 @@ public class Still { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.output); + return LogHelper.getStackDescription(recipe.output); } } @@ -76,7 +75,7 @@ public class Still { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.output); + return LogHelper.getStackDescription(recipe.output); } } } diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java b/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java index 6771cd3..b0dc554 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java @@ -12,7 +12,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -68,7 +67,7 @@ public class ThermionicFabricator { @Override public String getRecipeInfo(Smelting recipe) { - return InputHelper.getStackDescription(recipe.getResource()); + return LogHelper.getStackDescription(recipe.getResource()); } } @@ -81,7 +80,7 @@ public class ThermionicFabricator { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.getPlan()); + return LogHelper.getStackDescription(recipe.getPlan()); } } @@ -129,7 +128,7 @@ public class ThermionicFabricator { @Override public String getRecipeInfo(Smelting recipe) { - return InputHelper.getStackDescription(recipe.getResource()); + return LogHelper.getStackDescription(recipe.getResource()); } } @@ -140,7 +139,7 @@ public class ThermionicFabricator { @Override public String getRecipeInfo(Recipe recipe) { - return InputHelper.getStackDescription(recipe.getPlan()); + return LogHelper.getStackDescription(recipe.getPlan()); } } } diff --git a/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java b/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java index e4b9e13..3686437 100644 --- a/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java @@ -12,7 +12,6 @@ import java.util.Map.Entry; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseMapAddition; @@ -75,7 +74,7 @@ public class Crucible { @Override protected String getRecipeInfo(Entry, MutablePair> recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); + return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); } } @@ -103,7 +102,7 @@ public class Crucible { @Override protected String getRecipeInfo(Entry, MutablePair> recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); + return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); } } @@ -124,7 +123,7 @@ public class Crucible { @Override public String getRecipeInfo(Entry> recipe) { - return InputHelper.getStackDescription(recipe.getValue().right); + return LogHelper.getStackDescription(recipe.getValue().right); } } @@ -155,7 +154,7 @@ public class Crucible { @Override public String getRecipeInfo(Entry> recipe) { - return InputHelper.getStackDescription(recipe.getValue().right); + return LogHelper.getStackDescription(recipe.getValue().right); } } } diff --git a/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java b/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java index f1a63f2..f93b7f6 100644 --- a/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java +++ b/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java @@ -11,7 +11,6 @@ import java.util.Map.Entry; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; @@ -42,7 +41,7 @@ public class Furnace { @Override public String getRecipeInfo(Entry, MutablePair> recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); + return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); } } @@ -70,7 +69,7 @@ public class Furnace { @Override public String getRecipeInfo(Entry, MutablePair> recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); + return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); } } } diff --git a/src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java index 2a6ed11..29680ef 100644 --- a/src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java @@ -13,7 +13,6 @@ import mariculture.api.core.MaricultureHandlers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.mariculture.MaricultureHelper; import modtweaker2.utils.BaseMapAddition; @@ -41,7 +40,7 @@ public class Anvil { @Override public String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(recipe.getValue().output); + return LogHelper.getStackDescription(recipe.getValue().output); } } @@ -72,7 +71,7 @@ public class Anvil { @Override public String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(recipe.getValue().output); + return LogHelper.getStackDescription(recipe.getValue().output); } } } diff --git a/src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java index ae78fc4..091dd31 100644 --- a/src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java @@ -17,7 +17,7 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.mods.mariculture.MaricultureHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; @@ -54,7 +54,7 @@ public class Casting { @Override public String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(recipe.getValue().output); + return LogHelper.getStackDescription(recipe.getValue().output); } } @@ -102,7 +102,7 @@ public class Casting { @Override public String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(recipe.getValue().output); + return LogHelper.getStackDescription(recipe.getValue().output); } } } diff --git a/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java index e4edc8c..a11a738 100644 --- a/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java @@ -18,7 +18,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.mariculture.MaricultureHelper; import modtweaker2.utils.BaseListAddition; @@ -54,7 +53,7 @@ public class Crucible { @Override public String getRecipeInfo(RecipeSmelter recipe) { - return InputHelper.getStackDescription(recipe.input); + return LogHelper.getStackDescription(recipe.input); } } @@ -88,7 +87,7 @@ public class Crucible { @Override public String getRecipeInfo(RecipeSmelter recipe) { - return InputHelper.getStackDescription(recipe.input); + return LogHelper.getStackDescription(recipe.input); } } diff --git a/src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java index 08816ef..fa43000 100644 --- a/src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java @@ -15,7 +15,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -85,9 +84,9 @@ public class Vat { @Override public String getRecipeInfo(RecipeVat recipe) { if(recipe.outputItem != null) { - return InputHelper.getStackDescription(recipe.outputItem); + return LogHelper.getStackDescription(recipe.outputItem); } else { - return InputHelper.getStackDescription(recipe.outputFluid); + return LogHelper.getStackDescription(recipe.outputFluid); } } } @@ -148,9 +147,9 @@ public class Vat { @Override public String getRecipeInfo(RecipeVat recipe) { if(recipe.outputItem != null) { - return InputHelper.getStackDescription(recipe.outputItem); + return LogHelper.getStackDescription(recipe.outputItem); } else { - return InputHelper.getStackDescription(recipe.outputFluid); + return LogHelper.getStackDescription(recipe.outputFluid); } } } diff --git a/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java b/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java index acc0655..35db6b3 100644 --- a/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java +++ b/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java @@ -10,7 +10,7 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.mods.metallurgy.MetallurgyHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -39,7 +39,7 @@ public class Alloyer { @Override public String getRecipeInfo(AlloyRecipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } @@ -64,7 +64,7 @@ public class Alloyer { @Override public String getRecipeInfo(AlloyRecipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } } diff --git a/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java b/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java index 0ca43bd..4ba5a7c 100644 --- a/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java +++ b/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java @@ -7,7 +7,7 @@ import java.util.Map.Entry; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.mods.metallurgy.MetallurgyHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; @@ -50,7 +50,7 @@ public class Crusher { @Override protected String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(recipe.getValue()); + return LogHelper.getStackDescription(recipe.getValue()); } } @@ -90,7 +90,7 @@ public class Crusher { @Override protected String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(recipe.getValue()); + return LogHelper.getStackDescription(recipe.getValue()); } } diff --git a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java index 69f826f..529be79 100644 --- a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java +++ b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -52,7 +51,7 @@ public class Assembly { for(AssemblyRecipe recipe : list) { if(areEqual(recipe.getInput(), in)) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, InputHelper.getStackDescription(in))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, LogHelper.getStackDescription(in))); return; } } @@ -68,7 +67,7 @@ public class Assembly { @Override public String getRecipeInfo(AssemblyRecipe recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } @@ -112,7 +111,7 @@ public class Assembly { @Override public String getRecipeInfo(AssemblyRecipe recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java index e5209f8..615fdd0 100644 --- a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java +++ b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java @@ -10,7 +10,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -42,7 +41,7 @@ public class Pressure { @Override public String getRecipeInfo(PressureChamberRecipe recipe) { - return InputHelper.getStackDescription(recipe.output[0]); + return LogHelper.getStackDescription(recipe.output[0]); } } @@ -80,7 +79,7 @@ public class Pressure { @Override public String getRecipeInfo(PressureChamberRecipe recipe) { - return InputHelper.getStackDescription(recipe.output[0]); + return LogHelper.getStackDescription(recipe.output[0]); } } } diff --git a/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java b/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java new file mode 100644 index 0000000..9e2b33b --- /dev/null +++ b/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java @@ -0,0 +1,110 @@ +package modtweaker2.mods.railcraft.commands; + +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; + +import minetweaker.MineTweakerAPI; +import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.player.IPlayer; +import minetweaker.api.server.ICommandFunction; +import mods.railcraft.api.crafting.IBlastFurnaceRecipe; +import mods.railcraft.api.crafting.ICokeOvenRecipe; +import mods.railcraft.api.crafting.IRockCrusherRecipe; +import mods.railcraft.api.crafting.RailcraftCraftingManager; +import modtweaker2.helpers.LogHelper; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.helpers.StringHelper; +import modtweaker2.mods.railcraft.RailcraftHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; + +public class RailcraftLogger implements ICommandFunction { + + private static final List validArguments = new LinkedList(); + + static { + validArguments.add("blastfurnace"); + validArguments.add("cokeoven"); + validArguments.add("rockcrusher"); + validArguments.add("rollingmachine"); + } + + @Override + public void execute(String[] arguments, IPlayer player) { + List args = StringHelper.toLowerCase(Arrays.asList(arguments)); + + if(!validArguments.containsAll(args)) { + if(player != null) { + player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); + } + } else { + if(args.isEmpty() || args.contains("blastfurnace")) { + for(IBlastFurnaceRecipe recipe : RailcraftHelper.furnace) { + MineTweakerAPI.logCommand(String.format("mods.railcraft.BlastFurnace.addRecipe(%s, %s, %s, %d, %s);", + LogHelper.getStackDescription(recipe.getInput()), + ReflectionHelper.getObject(recipe, "matchDamage"), + ReflectionHelper.getObject(recipe, "matchNBT"), + recipe.getCookTime(), + LogHelper.getStackDescription(recipe.getOutput()))); + } + } + + if(args.isEmpty() || args.contains("cokeoven")) { + for(ICokeOvenRecipe recipe : RailcraftCraftingManager.cokeOven.getRecipes()) { + MineTweakerAPI.logCommand(String.format("mods.railcraft.CokeOven.addRecipe(%s, %s, %s, %s, %s, %d);", + LogHelper.getStackDescription(recipe.getInput()), + ReflectionHelper.getObject(recipe, "matchDamage"), + ReflectionHelper.getObject(recipe, "matchNBT"), + LogHelper.getStackDescription(recipe.getOutput()), + LogHelper.getStackDescription(recipe.getFluidOutput()), + recipe.getCookTime())); + } + } + + if(args.isEmpty() || args.contains("rockcrusher")) { + for(IRockCrusherRecipe recipe : RailcraftHelper.crusher) { + MineTweakerAPI.logCommand(String.format("mods.railcraft.RockCrusher.addRecipe(%s, %s, %s, %s);", + LogHelper.getStackDescription(recipe.getInput()), + ReflectionHelper.getObject(recipe, "matchDamage"), + ReflectionHelper.getObject(recipe, "matchNBT"), + getRockCrusherOutputDescription(recipe.getOutputs()))); + } + } + + if(args.isEmpty() || args.contains("rollingmachine")) { + for(IRecipe recipe : RailcraftHelper.rolling) { + MineTweakerAPI.logCommand(String.format("mods.railcraft.RollingMachine.addRecipe(%s, %s);", + LogHelper.getStackDescription(recipe.getRecipeOutput()), + LogHelper.getCraftingDescription(recipe))); + } + } + + if (player != null) { + player.sendChat(MineTweakerImplementationAPI.platform.getMessage("List generated; see minetweaker.log in your minecraft dir")); + } + } + } + + private Object getRockCrusherOutputDescription(List> outputs) { + if(outputs.isEmpty()) { + return "[], []"; + } + + StringBuilder sb = new StringBuilder(); + sb.append('['); + for(Entry entry : outputs) { + sb.append(LogHelper.getStackDescription(entry.getKey())).append(", "); + } + sb.setLength(sb.length() - 2); + sb.append("], ["); + for(Entry entry : outputs) { + sb.append(entry.getValue()).append(", "); + } + sb.setLength(sb.length() - 2); + sb.append("]"); + + return sb.toString(); + } +} diff --git a/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java b/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java index 776ec9c..6fdea70 100644 --- a/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java @@ -11,7 +11,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import mods.railcraft.api.crafting.IBlastFurnaceRecipe; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.railcraft.RailcraftHelper; import modtweaker2.utils.BaseListAddition; @@ -38,7 +37,7 @@ public class BlastFurnace { @Override public String getRecipeInfo(IBlastFurnaceRecipe recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } @@ -67,7 +66,7 @@ public class BlastFurnace { @Override public String getRecipeInfo(IBlastFurnaceRecipe recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java b/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java index beecede..ea051d6 100644 --- a/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java @@ -15,7 +15,6 @@ import minetweaker.api.liquid.ILiquidStack; import mods.railcraft.api.crafting.ICokeOvenRecipe; import mods.railcraft.api.crafting.RailcraftCraftingManager; import mods.railcraft.common.util.crafting.CokeOvenCraftingManager.CokeOvenRecipe; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.railcraft.RailcraftHelper; import modtweaker2.utils.BaseListAddition; @@ -93,7 +92,7 @@ public class CokeOven { @Override public String getRecipeInfo(ICokeOvenRecipe recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } @@ -125,7 +124,7 @@ public class CokeOven { @Override public String getRecipeInfo(ICokeOvenRecipe recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } } diff --git a/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java b/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java index 1735494..ebb1a9f 100644 --- a/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java @@ -11,7 +11,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import mods.railcraft.api.crafting.IRockCrusherRecipe; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.railcraft.RailcraftHelper; import modtweaker2.utils.BaseListAddition; @@ -45,7 +44,7 @@ public class RockCrusher { @Override public String getRecipeInfo(IRockCrusherRecipe recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } @@ -77,7 +76,7 @@ public class RockCrusher { @Override public String getRecipeInfo(IRockCrusherRecipe recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } } diff --git a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java b/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java index 5080a06..3c5f964 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java +++ b/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java @@ -10,7 +10,7 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StringHelper; import modtweaker2.mods.tconstruct.TConstructHelper; import net.minecraft.item.ItemStack; @@ -42,18 +42,18 @@ public class TConstructLogger implements ICommandFunction { if(args.isEmpty() || args.contains("casting")) { for(CastingRecipe recipe : TConstructHelper.basinCasting) { MineTweakerAPI.logCommand(String.format("mods.tconstruct.Casting.addBasinRecipe(%s, %s, %s, %s, %d);", - InputHelper.getStackDescription(recipe.output), - InputHelper.getStackDescription(recipe.castingMetal), - InputHelper.getStackDescription(recipe.cast), + LogHelper.getStackDescription(recipe.output), + LogHelper.getStackDescription(recipe.castingMetal), + LogHelper.getStackDescription(recipe.cast), recipe.consumeCast, recipe.coolTime)); } for(CastingRecipe recipe : TConstructHelper.tableCasting) { MineTweakerAPI.logCommand(String.format("mods.tconstruct.Casting.addTableRecipe(%s, %s, %s, %s, %d);", - InputHelper.getStackDescription(recipe.output), - InputHelper.getStackDescription(recipe.castingMetal), - InputHelper.getStackDescription(recipe.cast), + LogHelper.getStackDescription(recipe.output), + LogHelper.getStackDescription(recipe.castingMetal), + LogHelper.getStackDescription(recipe.cast), recipe.consumeCast, recipe.coolTime)); } @@ -62,8 +62,8 @@ public class TConstructLogger implements ICommandFunction { if(args.isEmpty() || args.contains("drying")) { for(DryingRecipe recipe : DryingRackRecipes.recipes) { MineTweakerAPI.logCommand(String.format("mods.tconstruct.Drying.addRecipe(%s, %s, %d);", - InputHelper.getStackDescription(recipe.input), - InputHelper.getStackDescription(recipe.result), + LogHelper.getStackDescription(recipe.input), + LogHelper.getStackDescription(recipe.result), recipe.time)); } } @@ -75,21 +75,21 @@ public class TConstructLogger implements ICommandFunction { ItemStack renderItem = TConstructHelper.renderIndex.get(recipe.getKey()); MineTweakerAPI.logCommand(String.format("mods.tconstruct.Smeltery.addMelting(%s, %s, %d, %s);", - InputHelper.getStackDescription(new ItemStack(recipe.getKey().item, 1, recipe.getKey().meta)), - InputHelper.getStackDescription(recipe.getValue()), + LogHelper.getStackDescription(new ItemStack(recipe.getKey().item, 1, recipe.getKey().meta)), + LogHelper.getStackDescription(recipe.getValue()), temperature, - InputHelper.getStackDescription(renderItem))); + LogHelper.getStackDescription(renderItem))); } for(AlloyMix recipe : TConstructHelper.alloys) { MineTweakerAPI.logCommand(String.format("mods.tconstruct.Smeltery.addAlloy(%s, %s);", - InputHelper.getStackDescription(recipe.result), - InputHelper.getArrayDescription(recipe.mixers))); + LogHelper.getStackDescription(recipe.result), + LogHelper.getListDescription(recipe.mixers))); } for(Entry fuel : TConstructHelper.fuelList.entrySet()) { MineTweakerAPI.logCommand(String.format("mods.tconstruct.Smeltery.addFuel(%s, %d, %d);", - InputHelper.getStackDescription(new FluidStack(fuel.getKey(), 1)), + LogHelper.getStackDescription(new FluidStack(fuel.getKey(), 1)), fuel.getValue()[0], fuel.getValue()[1])); } diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java index 5dd5550..62b656e 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java @@ -15,7 +15,6 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientAny; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tconstruct.TConstructHelper; import modtweaker2.utils.BaseListAddition; @@ -62,7 +61,7 @@ public class Casting { @Override protected String getRecipeInfo(CastingRecipe recipe) { - return InputHelper.getStackDescription(recipe.output); + return LogHelper.getStackDescription(recipe.output); } } @@ -75,11 +74,16 @@ public class Casting { @ZenMethod public static void removeBasinRecipe(IIngredient output, @Optional IIngredient material, @Optional IIngredient cast) { + removeRecipe(output, material, cast, TConstructHelper.basinCasting); } public static void removeRecipe(IIngredient output, IIngredient material, IIngredient cast, List list) { - + if(output == null) { + LogHelper.logError(String.format("Required parameters missing for %s Recipe.", name)); + return; + } + if(material == null) { material = IngredientAny.INSTANCE; } @@ -111,7 +115,7 @@ public class Casting { if(!recipes.isEmpty()) { MineTweakerAPI.apply(new Remove(list, recipes)); } else { - LogHelper.logWarning(String.format("No %s Recipe found for output %s, meterial %s and cast %s. Command ignored!", Casting.name, output.toString(), material.toString(), cast.toString())); + LogHelper.logWarning(String.format("No %s Recipe found for output %s, material %s and cast %s. Command ignored!", Casting.name, output.toString(), material.toString(), cast.toString())); } } @@ -123,7 +127,7 @@ public class Casting { @Override protected String getRecipeInfo(CastingRecipe recipe) { - return InputHelper.getStackDescription(recipe.output); + return LogHelper.getStackDescription(recipe.output); } } } diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java index d54b8c1..de8baff 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java @@ -9,7 +9,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tconstruct.TConstructHelper; import modtweaker2.utils.BaseListAddition; @@ -45,7 +44,7 @@ public class Drying { @Override protected String getRecipeInfo(DryingRecipe recipe) { - return InputHelper.getStackDescription(recipe.result); + return LogHelper.getStackDescription(recipe.result); } } @@ -77,7 +76,7 @@ public class Drying { @Override protected String getRecipeInfo(DryingRecipe recipe) { - return InputHelper.getStackDescription(recipe.result); + return LogHelper.getStackDescription(recipe.result); } } } diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java index 613201b..09db6e4 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java @@ -21,7 +21,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tconstruct.TConstructHelper; import modtweaker2.utils.BaseListAddition; @@ -66,7 +65,7 @@ public class Smeltery { @Override protected String getRecipeInfo(AlloyMix recipe) { - return InputHelper.getStackDescription(recipe.result); + return LogHelper.getStackDescription(recipe.result); } } @@ -100,7 +99,7 @@ public class Smeltery { @Override protected String getRecipeInfo(AlloyMix recipe) { - return InputHelper.getStackDescription(recipe.result); + return LogHelper.getStackDescription(recipe.result); } } @@ -157,7 +156,7 @@ public class Smeltery { @Override public String getRecipeInfo(MeltingRecipe recipe) { - return InputHelper.getStackDescription(recipe.input); + return LogHelper.getStackDescription(recipe.input); } } @@ -212,7 +211,7 @@ public class Smeltery { @Override public String getRecipeInfo(MeltingRecipe recipe) { - return InputHelper.getStackDescription(recipe.input); + return LogHelper.getStackDescription(recipe.input); } } @@ -268,7 +267,7 @@ public class Smeltery { @Override public String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(new FluidStack(recipe.getKey(), 1)); + return LogHelper.getStackDescription(new FluidStack(recipe.getKey(), 1)); } } @@ -295,7 +294,7 @@ public class Smeltery { @Override public String getRecipeInfo(Entry recipe) { - return InputHelper.getStackDescription(new FluidStack(recipe.getKey(), 1)); + return LogHelper.getStackDescription(new FluidStack(recipe.getKey(), 1)); } } } diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java index 4433099..f13030c 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java @@ -9,7 +9,7 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tconstruct.TConstructHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -78,7 +78,7 @@ public class TiCTweaks { @Override protected String getRecipeInfo(ItemKey recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.item, 1, recipe.damage)); + return LogHelper.getStackDescription(new ItemStack(recipe.item, 1, recipe.damage)); } } @@ -112,7 +112,7 @@ public class TiCTweaks { @Override protected String getRecipeInfo(ItemKey recipe) { - return InputHelper.getStackDescription(new ItemStack(recipe.item, 1, recipe.damage)); + return LogHelper.getStackDescription(new ItemStack(recipe.item, 1, recipe.damage)); } } } diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java index 3d3468d..e5c52bf 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tfcraft.TFCHelper; import modtweaker2.utils.BaseListAddition; @@ -58,7 +57,7 @@ public class Anvil { @Override protected String getRecipeInfo(AnvilRecipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } @@ -98,7 +97,7 @@ public class Anvil { @Override protected String getRecipeInfo(AnvilRecipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } } diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java index e80a7f3..ac2e6cb 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java @@ -13,7 +13,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tfcraft.TFCHelper; import modtweaker2.utils.BaseListAddition; @@ -70,9 +69,9 @@ public class Barrel { @Override protected String getRecipeInfo(BarrelRecipe recipe) { if(recipe.getRecipeOutIS() != null) - return InputHelper.getStackDescription(recipe.getRecipeOutIS()); + return LogHelper.getStackDescription(recipe.getRecipeOutIS()); else if(recipe.getRecipeOutFluid() != null) - return InputHelper.getStackDescription(recipe.getRecipeOutFluid()); + return LogHelper.getStackDescription(recipe.getRecipeOutFluid()); else return "Unknown output"; } @@ -113,9 +112,9 @@ public class Barrel { @Override protected String getRecipeInfo(BarrelRecipe recipe) { if(recipe.getRecipeOutIS() != null) - return InputHelper.getStackDescription(recipe.getRecipeOutIS()); + return LogHelper.getStackDescription(recipe.getRecipeOutIS()); else if(recipe.getRecipeOutFluid() != null) - return InputHelper.getStackDescription(recipe.getRecipeOutFluid()); + return LogHelper.getStackDescription(recipe.getRecipeOutFluid()); else return "Unknown output"; } diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java index c757bff..8a357fc 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java @@ -10,7 +10,7 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tfcraft.TFCHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -42,7 +42,7 @@ public class Kiln { @Override protected String getRecipeInfo(KilnRecipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } @@ -66,7 +66,7 @@ public class Kiln { @Override protected String getRecipeInfo(KilnRecipe recipe) { - return InputHelper.getStackDescription(recipe.getCraftingResult()); + return LogHelper.getStackDescription(recipe.getCraftingResult()); } } diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java index d2fc647..2c16703 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java @@ -10,7 +10,7 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.mods.tfcraft.TFCHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; @@ -58,7 +58,7 @@ public class Quern { @Override protected String getRecipeInfo(QuernRecipe recipe) { - return InputHelper.getStackDescription(recipe.getResult()); + return LogHelper.getStackDescription(recipe.getResult()); } } @@ -102,7 +102,7 @@ public class Quern { @Override protected String getRecipeInfo(QuernRecipe recipe) { - return InputHelper.getStackDescription(recipe.getResult()); + return LogHelper.getStackDescription(recipe.getResult()); } } diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java index 31173d7..09d35df 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java @@ -12,7 +12,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import modtweaker2.utils.BaseListAddition; @@ -53,7 +52,7 @@ public class Arcane { ItemStack stack = recipe.getRecipeOutput(); if(stack instanceof ItemStack) - return InputHelper.getStackDescription(stack); + return LogHelper.getStackDescription(stack); else return "Unknown output"; } @@ -92,7 +91,7 @@ public class Arcane { ItemStack stack = recipe.getRecipeOutput(); if(stack instanceof ItemStack) - return InputHelper.getStackDescription(stack); + return LogHelper.getStackDescription(stack); else return "Unknown output"; } diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Crucible.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Crucible.java index 7a81bb8..f362ab0 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Crucible.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import modtweaker2.utils.BaseListAddition; @@ -39,7 +38,7 @@ public class Crucible { @Override protected String getRecipeInfo(CrucibleRecipe recipe) { - return InputHelper.getStackDescription(recipe.getRecipeOutput()); + return LogHelper.getStackDescription(recipe.getRecipeOutput()); } } @@ -72,7 +71,7 @@ public class Crucible { @Override protected String getRecipeInfo(CrucibleRecipe recipe) { - return InputHelper.getStackDescription(recipe.getRecipeOutput()); + return LogHelper.getStackDescription(recipe.getRecipeOutput()); } } } diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java index 73b79ca..f242d4e 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java @@ -11,7 +11,6 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import modtweaker2.mods.thaumcraft.recipe.MTInfusionRecipe; @@ -131,7 +130,7 @@ public class Infusion { Object o = recipe.getRecipeOutput(); if(o instanceof ItemStack) { - return InputHelper.getStackDescription((ItemStack)o); + return LogHelper.getStackDescription((ItemStack)o); } else { return "Unknown Item"; } diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Loot.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Loot.java index 297f60a..4a67908 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Loot.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Loot.java @@ -47,7 +47,7 @@ public class Loot { @Override protected String getRecipeInfo(WeightedRandomLoot recipe) { - return InputHelper.getStackDescription(recipe.item); + return LogHelper.getStackDescription(recipe.item); } } @@ -91,7 +91,7 @@ public class Loot { @Override protected String getRecipeInfo(WeightedRandomLoot recipe) { - return InputHelper.getStackDescription(recipe.item); + return LogHelper.getStackDescription(recipe.item); } } } diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java b/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java index 9aead53..6f20a1b 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java @@ -8,7 +8,7 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StringHelper; import cofh.thermalexpansion.util.crafting.CrucibleManager; import cofh.thermalexpansion.util.crafting.CrucibleManager.RecipeCrucible; @@ -48,8 +48,8 @@ public class ThermalExpansionLogger implements ICommandFunction { for(RecipeCrucible recipe : CrucibleManager.getRecipeList()) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Crucible.addRecipe(%d, %s, %s);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getOutput()))); + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getOutput()))); } } @@ -57,8 +57,8 @@ public class ThermalExpansionLogger implements ICommandFunction { for(RecipeFurnace recipe : FurnaceManager.getRecipeList()) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Furnace.addRecipe(%d, %s, %s);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getOutput()))); + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getOutput()))); } } @@ -67,15 +67,15 @@ public class ThermalExpansionLogger implements ICommandFunction { if(recipe.getSecondaryOutput() != null) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Pulverizer.addRecipe(%d, %s, %s, %s, %d);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getPrimaryOutput()), - InputHelper.getStackDescription(recipe.getSecondaryOutput()), + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getPrimaryOutput()), + LogHelper.getStackDescription(recipe.getSecondaryOutput()), recipe.getSecondaryOutputChance())); } else { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Pulverizer.addRecipe(%d, %s, %s);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getPrimaryOutput()))); + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getPrimaryOutput()))); } } } @@ -85,15 +85,15 @@ public class ThermalExpansionLogger implements ICommandFunction { if(recipe.getSecondaryOutput() != null) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Sawmill.addRecipe(%d, %s, %s, %s, %d);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getPrimaryOutput()), - InputHelper.getStackDescription(recipe.getSecondaryOutput()), + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getPrimaryOutput()), + LogHelper.getStackDescription(recipe.getSecondaryOutput()), recipe.getSecondaryOutputChance())); } else { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Sawmill.addRecipe(%d, %s, %s);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getPrimaryOutput()))); + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getPrimaryOutput()))); } } } @@ -103,17 +103,17 @@ public class ThermalExpansionLogger implements ICommandFunction { if(recipe.getSecondaryOutput() != null) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Smelter.addRecipe(%d, %s, %s, %s, %s, %d);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getPrimaryInput()), - InputHelper.getStackDescription(recipe.getSecondaryInput()), - InputHelper.getStackDescription(recipe.getPrimaryOutput()), - InputHelper.getStackDescription(recipe.getSecondaryOutput()), + LogHelper.getStackDescription(recipe.getPrimaryInput()), + LogHelper.getStackDescription(recipe.getSecondaryInput()), + LogHelper.getStackDescription(recipe.getPrimaryOutput()), + LogHelper.getStackDescription(recipe.getSecondaryOutput()), recipe.getSecondaryOutputChance())); } else { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Smelter.addRecipe(%d, %s, %s, %s);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getPrimaryInput()), - InputHelper.getStackDescription(recipe.getSecondaryInput()), - InputHelper.getStackDescription(recipe.getPrimaryOutput()))); + LogHelper.getStackDescription(recipe.getPrimaryInput()), + LogHelper.getStackDescription(recipe.getSecondaryInput()), + LogHelper.getStackDescription(recipe.getPrimaryOutput()))); } } } @@ -122,17 +122,17 @@ public class ThermalExpansionLogger implements ICommandFunction { for(RecipeTransposer recipe : TransposerManager.getFillRecipeList()) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Transposer.addFillRecipe(%d, %s, %s, %s);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getOutput()), - InputHelper.getStackDescription(recipe.getFluid()))); + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getOutput()), + LogHelper.getStackDescription(recipe.getFluid()))); } for(RecipeTransposer recipe : TransposerManager.getExtractionRecipeList()) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Transposer.addExtractRecipe(%d, %s, %s, %s, %d);", recipe.getEnergy(), - InputHelper.getStackDescription(recipe.getInput()), - InputHelper.getStackDescription(recipe.getOutput()), - InputHelper.getStackDescription(recipe.getFluid()), + LogHelper.getStackDescription(recipe.getInput()), + LogHelper.getStackDescription(recipe.getOutput()), + LogHelper.getStackDescription(recipe.getFluid()), recipe.getChance())); } } diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java index 3d0dbb0..6b57c73 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java @@ -13,7 +13,6 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.thermalexpansion.ThermalHelper; @@ -37,7 +36,7 @@ public class Crucible { } if(CrucibleManager.recipeExists(toStack(input))) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, InputHelper.getStackDescription(toStack(input)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, LogHelper.getStackDescription(toStack(input)))); return; } @@ -83,7 +82,7 @@ public class Crucible { @Override protected String getRecipeInfo(RecipeCrucible recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } @@ -138,7 +137,7 @@ public class Crucible { @Override protected String getRecipeInfo(RecipeCrucible recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java index ce85a93..94b2e07 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java @@ -11,7 +11,6 @@ import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.thermalexpansion.ThermalHelper; @@ -37,7 +36,7 @@ public class Furnace { } if(FurnaceManager.recipeExists(toStack(input))) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, InputHelper.getStackDescription(toStack(input)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, LogHelper.getStackDescription(toStack(input)))); return; } @@ -85,7 +84,7 @@ public class Furnace { @Override protected String getRecipeInfo(RecipeFurnace recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } @@ -140,7 +139,7 @@ public class Furnace { @Override protected String getRecipeInfo(RecipeFurnace recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java index e12bfa0..dc997ad 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java @@ -11,7 +11,6 @@ import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.thermalexpansion.ThermalHelper; @@ -42,7 +41,7 @@ public class Pulverizer { } if(PulverizerManager.recipeExists(toStack(input))) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, InputHelper.getStackDescription(toStack(input)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, LogHelper.getStackDescription(toStack(input)))); return; } @@ -89,7 +88,7 @@ public class Pulverizer { @Override protected String getRecipeInfo(RecipePulverizer recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } @@ -147,7 +146,7 @@ public class Pulverizer { @Override protected String getRecipeInfo(RecipePulverizer recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java index 52f1aea..e98455e 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java @@ -11,7 +11,6 @@ import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.thermalexpansion.ThermalHelper; @@ -42,7 +41,7 @@ public class Sawmill { } if(SawmillManager.recipeExists(toStack(input))) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, InputHelper.getStackDescription(toStack(input)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s. Command ignored!", name, LogHelper.getStackDescription(toStack(input)))); return; } @@ -91,7 +90,7 @@ public class Sawmill { @Override protected String getRecipeInfo(RecipeSawmill recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } @@ -149,7 +148,7 @@ public class Sawmill { @Override protected String getRecipeInfo(RecipeSawmill recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java index 8771901..ef1daa9 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java @@ -11,7 +11,6 @@ import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.thermalexpansion.ThermalHelper; @@ -42,7 +41,7 @@ public class Smelter { } if(SmelterManager.recipeExists(toStack(input), toStack(input2))) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s and %s. Command ignored!", name, InputHelper.getStackDescription(toStack(input)), InputHelper.getStackDescription(toStack(input2)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s and %s. Command ignored!", name, LogHelper.getStackDescription(toStack(input)), LogHelper.getStackDescription(toStack(input2)))); return; } @@ -92,7 +91,7 @@ public class Smelter { @Override public String getRecipeInfo(RecipeSmelter recipe) { - return InputHelper.getStackDescription(recipe.getPrimaryOutput()); + return LogHelper.getStackDescription(recipe.getPrimaryOutput()); } } @@ -152,7 +151,7 @@ public class Smelter { @Override public String getRecipeInfo(RecipeSmelter recipe) { - return InputHelper.getStackDescription(recipe.getPrimaryOutput()); + return LogHelper.getStackDescription(recipe.getPrimaryOutput()); } } diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java index 6a571ec..0901e44 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java @@ -15,7 +15,6 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientAny; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.thermalexpansion.ThermalHelper; @@ -42,7 +41,7 @@ public class Transposer { } if(TransposerManager.fillRecipeExists(toStack(input), toFluid(liquid))) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s and %s. Command ignored!", Transposer.nameFill, InputHelper.getStackDescription(toStack(input)), InputHelper.getStackDescription(toFluid(liquid)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s and %s. Command ignored!", Transposer.nameFill, LogHelper.getStackDescription(toStack(input)), LogHelper.getStackDescription(toFluid(liquid)))); return; } @@ -63,7 +62,7 @@ public class Transposer { } if(TransposerManager.extractionRecipeExists(toStack(input), toFluid(liquid))) { - LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s and %s. Command ignored!", Transposer.nameExtract, InputHelper.getStackDescription(toStack(input)), InputHelper.getStackDescription(toFluid(liquid)))); + LogHelper.logWarning(String.format("Duplicate %s Recipe found for %s and %s. Command ignored!", Transposer.nameExtract, LogHelper.getStackDescription(toStack(input)), LogHelper.getStackDescription(toFluid(liquid)))); return; } @@ -138,7 +137,7 @@ public class Transposer { @Override protected String getRecipeInfo(RecipeTransposer recipe) { - return InputHelper.getStackDescription(recipe.getInput()); + return LogHelper.getStackDescription(recipe.getInput()); } } @@ -230,7 +229,7 @@ public class Transposer { @Override protected String getRecipeInfo(RecipeTransposer recipe) { - return InputHelper.getStackDescription(recipe.getOutput()); + return LogHelper.getStackDescription(recipe.getOutput()); } } diff --git a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java b/src/main/java/modtweaker2/utils/BaseCraftingAddition.java index bf2afaf..b33a1e1 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java +++ b/src/main/java/modtweaker2/utils/BaseCraftingAddition.java @@ -2,7 +2,7 @@ package modtweaker2.utils; import java.util.List; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import net.minecraft.item.crafting.IRecipe; public abstract class BaseCraftingAddition extends BaseListAddition { @@ -17,6 +17,6 @@ public abstract class BaseCraftingAddition extends BaseListAddition { @Override protected String getRecipeInfo(IRecipe recipe) { - return InputHelper.getStackDescription(recipe.getRecipeOutput()); + return LogHelper.getStackDescription(recipe.getRecipeOutput()); } } diff --git a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java b/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java index 4f629b4..3cfa78e 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java +++ b/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java @@ -7,7 +7,7 @@ import java.util.LinkedList; import java.util.List; import minetweaker.api.item.IIngredient; -import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,7 +18,7 @@ public class BaseCraftingRemoval extends BaseListRemoval { @Override public String getRecipeInfo(IRecipe recipe) { - return InputHelper.getStackDescription(recipe.getRecipeOutput()); + return LogHelper.getStackDescription(recipe.getRecipeOutput()); } public static List getRecipes(List list, IIngredient ingredient) {