diff --git a/src/main/java/modtweaker2/Commands.java b/src/main/java/modtweaker2/Commands.java index 7bb1eed..4e0ef63 100644 --- a/src/main/java/modtweaker2/Commands.java +++ b/src/main/java/modtweaker2/Commands.java @@ -41,23 +41,12 @@ public class Commands { MineTweakerAPI.server.addMineTweakerCommand("entities", new String[] { "/minetweaker entities", " Outputs a list of entities class mapping keys and the entity IDs" }, new EntityMappingLogger()); if (TweakerPlugin.isLoaded("appliedenergistics2-core")) { - MineTweakerAPI.server.addMineTweakerCommand("ae2", new String[] {"/minetweaker ae2 [FILTER]", " Outputs a list of all Applied Energistics 2 recipes."}, new AppliedEnergisticsLogger()); + MineTweakerAPI.server.addMineTweakerCommand("appeng", new String[] {"/minetweaker appeng [HANDLER]", " Outputs a list of all Applied Energistics 2 recipes."}, new AppliedEnergisticsLogger()); } - if (TweakerPlugin.isLoaded("Mekanism")) { - MineTweakerAPI.server.addMineTweakerCommand("gases", new String[] { "/minetweaker gases", " Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger()); - MineTweakerAPI.server.addMineTweakerCommand("mekanism", new String[] { "/minetweaker mekanism [FILTER]", " Outputs a list of all Mekanism recipes." }, new MekanismLogger()); - } - - if (TweakerPlugin.isLoaded("Thaumcraft")) { - MineTweakerAPI.server.addMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", " Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger()); - MineTweakerAPI.server.addMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", " Outputs a list of all aspects registered to entities and items" }, new AspectLogger()); - } - - if (TweakerPlugin.isLoaded("TConstruct")) { - MineTweakerAPI.server.addMineTweakerCommand("materials", new String[] { "/minetweaker materials", " Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger()); - MineTweakerAPI.server.addMineTweakerCommand("tconstruct", new String[]{ "/minetweaker tconstruct [FILTER]", " Outputs a list of all Tinkers Construct recipes."}, new TConstructLogger()); - } + if (TweakerPlugin.isLoaded("aura")) { + MineTweakerAPI.server.addMineTweakerCommand("auras", new String[] { "/minetweaker auras", "Outputs a list of Aura Types" }, new AuraLogger()); + } if (TweakerPlugin.isLoaded("Botania")) { MineTweakerAPI.server.addMineTweakerCommand("lexiconCategories", new String[] { "/minetweaker lexiconCategories", " Outputs a list of lexicon categories" }, new LexiconCategoryLogger()); @@ -65,7 +54,7 @@ public class Commands { MineTweakerAPI.server.addMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", " Outputs a list of keys for botania brews" }, new BotaniaBrewLogger()); MineTweakerAPI.server.addMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", " Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger()); MineTweakerAPI.server.addMineTweakerCommand("botaniaOrechid", new String[] { "/minetweaker botaniaOrechid", " Outputs a list of keys for botania orechid weights" }, new BotaniaOrechidLogger()); - MineTweakerAPI.server.addMineTweakerCommand("botania", new String[] { "/minetweaker botania [FILTER]", " Outputs a list of all Botania recipes." }, new BotaniaLogger()); + MineTweakerAPI.server.addMineTweakerCommand("botania", new String[] { "/minetweaker botania [HANDLER]", " Outputs a list of all Botania recipes." }, new BotaniaLogger()); } if (TweakerPlugin.isLoaded("chisel")) { @@ -73,24 +62,35 @@ public class Commands { MineTweakerAPI.server.addMineTweakerCommand("chiselVariations", new String[] { "/minetweaker chiselVariations", "/minetweaker chiselVariations [GROUP]", " Outputs a list of chisel variations" }, new ChiselVariationLogger()); } - if (TweakerPlugin.isLoaded("aura")) { - MineTweakerAPI.server.addMineTweakerCommand("auras", new String[] { "/minetweaker auras", "Outputs a list of Aura Types" }, new AuraLogger()); - } + if (TweakerPlugin.isLoaded("exnihilo")) { + MineTweakerAPI.server.addMineTweakerCommand("exnihilo", new String[] {"/minetweaker exnihilo [HANDLER]", " Outputs a list of all ExNihilo recipes."}, new ExNihiloLogger()); + } - if (TweakerPlugin.isLoaded("ThermalExpansion")) { - MineTweakerAPI.server.addMineTweakerCommand("texpansion", new String[] {"/minetweaker texpansion [FILTER]", " Outputs a list of all Thermal Expansion recipes."}, new ThermalExpansionLogger()); + if (TweakerPlugin.isLoaded("factorization")) { + MineTweakerAPI.server.addMineTweakerCommand("factorization", new String[] {"/minetweaker factorization [HANDLER]", " Outputs a list of all Factorization recipes."}, new FactorizationLogger()); } - 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("Mekanism")) { + MineTweakerAPI.server.addMineTweakerCommand("gases", new String[] { "/minetweaker gases", " Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger()); + MineTweakerAPI.server.addMineTweakerCommand("mekanism", new String[] { "/minetweaker mekanism [HANDLER]", " Outputs a list of all Mekanism recipes." }, new MekanismLogger()); } if (TweakerPlugin.isLoaded("Railcraft")) { - MineTweakerAPI.server.addMineTweakerCommand("railcraft", new String[] {"/minetweaker railcraft [FILTER]", " Outputs a list of all Railcraft recipes."}, new RailcraftLogger()); + MineTweakerAPI.server.addMineTweakerCommand("railcraft", new String[] {"/minetweaker railcraft [HANDLER]", " Outputs a list of all Railcraft recipes."}, new RailcraftLogger()); + } + + if (TweakerPlugin.isLoaded("TConstruct")) { + MineTweakerAPI.server.addMineTweakerCommand("materials", new String[] { "/minetweaker materials", " Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger()); + MineTweakerAPI.server.addMineTweakerCommand("tconstruct", new String[]{ "/minetweaker tconstruct [HANDLER]", " Outputs a list of all Tinkers Construct recipes."}, new TConstructLogger()); + } + + if (TweakerPlugin.isLoaded("Thaumcraft")) { + MineTweakerAPI.server.addMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", " Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger()); + MineTweakerAPI.server.addMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", " Outputs a list of all aspects registered to entities and items" }, new AspectLogger()); } - if (TweakerPlugin.isLoaded("exnihilo")) { - MineTweakerAPI.server.addMineTweakerCommand("exnihilo", new String[] {"/minetweaker exnihilo [FILTER]", " Outputs a list of all ExNihilo recipes."}, new ExNihiloLogger()); + if (TweakerPlugin.isLoaded("ThermalExpansion")) { + MineTweakerAPI.server.addMineTweakerCommand("thermalexpansion", new String[] {"/minetweaker thermalexpansion [HANDLER]", " Outputs a list of all Thermal Expansion recipes."}, new ThermalExpansionLogger()); } } } diff --git a/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java b/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java index 1fe753a..3fa9ef6 100644 --- a/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java +++ b/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java @@ -19,8 +19,8 @@ public class AppliedEnergisticsLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); static { - validArguments.add("grinder"); - validArguments.add("inscriber"); + validArguments.add("Grinder"); + validArguments.add("Inscriber"); } @Override @@ -32,7 +32,7 @@ public class AppliedEnergisticsLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("grinder")) { + 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);", LogHelper.getStackDescription(recipe.getInput()), @@ -45,7 +45,7 @@ public class AppliedEnergisticsLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("inscriber")) { + 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\");", LogHelper.getListDescription(recipe.getInputs()), diff --git a/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java b/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java index a1a6636..39fae4f 100644 --- a/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java +++ b/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java @@ -24,12 +24,12 @@ public class BotaniaLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); static { - validArguments.add("apothecary"); - validArguments.add("brew"); - validArguments.add("elventrade"); - validArguments.add("manainfusion"); - validArguments.add("puredaisy"); - validArguments.add("runealtar"); + validArguments.add("Apothecary"); + validArguments.add("Brew"); + validArguments.add("ElvenTrade"); + validArguments.add("ManaInfusion"); + validArguments.add("PureDaisy"); + validArguments.add("RuneAltar"); } @Override @@ -41,7 +41,7 @@ public class BotaniaLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("apothecary")) { + if(args.isEmpty() || args.contains("Apothecary")) { for(RecipePetals recipe : BotaniaAPI.petalRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.Apothecary.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.getOutput()), @@ -50,7 +50,7 @@ public class BotaniaLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("brew")) { + if(args.isEmpty() || args.contains("Brew")) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.Brew.addRecipe(%s, \"%s\");", LogHelper.getListDescription(recipe.getInputs()), @@ -58,7 +58,7 @@ public class BotaniaLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("elventrade")) { + if(args.isEmpty() || args.contains("ElvenTrade")) { for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.ElvenTrade.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.getOutput()), @@ -67,7 +67,7 @@ public class BotaniaLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("manainfusion")) { + if(args.isEmpty() || args.contains("ManaInfusion")) { for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.ManaInfusion.add%s(%s, %s, %d);", recipe.isAlchemy() ? "Alchemy" : recipe.isConjuration() ? "Conjuration" : "Infusion", @@ -78,7 +78,7 @@ public class BotaniaLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("puredaisy")) { + if(args.isEmpty() || args.contains("PureDaisy")) { for(RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.PureDaisy.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.getInput()), @@ -86,7 +86,7 @@ public class BotaniaLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("runealtar")) { + if(args.isEmpty() || args.contains("RuneAltar")) { for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) { MineTweakerAPI.logCommand(String.format("mods.botania.RuneAltar.addRecipe(%s, %s, %d);", LogHelper.getStackDescription(recipe.getOutput()), diff --git a/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java b/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java index 0c27f30..fe9c06c 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java +++ b/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java @@ -30,10 +30,10 @@ public class ExNihiloLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); static { - validArguments.add("compost"); - validArguments.add("crucible"); - validArguments.add("hammer"); - validArguments.add("sieve"); + validArguments.add("Composting"); + validArguments.add("Crucible"); + validArguments.add("Hammer"); + validArguments.add("Sieve"); } @Override @@ -45,7 +45,7 @@ public class ExNihiloLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("compost")) { + if(args.isEmpty() || args.contains("Composting")) { for(Entry recipe : CompostRegistry.entries.entrySet()) { MineTweakerAPI.logCommand(String.format("mods.exnihilo.Composting.addRecipe(%s, %s, \"%s\");", LogHelper.getStackDescription(recipe.getKey().getStack()), @@ -54,7 +54,7 @@ public class ExNihiloLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("crucible")) { + if(args.isEmpty() || args.contains("Crucible")) { for(Meltable recipe : CrucibleRegistry.entries.values()) { MineTweakerAPI.logCommand(String.format("mods.exnihilo.Crucible.addRecipe(%s, %s);", LogHelper.getStackDescription(new ItemStack(recipe.block, 1, recipe.meta)), @@ -68,7 +68,7 @@ public class ExNihiloLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("hammer")) { + if(args.isEmpty() || args.contains("Hammer")) { for(Entry> entry : HammerRegistry.getRewards().entrySet()) { for(Smashable recipe : entry.getValue()) { MineTweakerAPI.logCommand(String.format("mods.exnihilo.Hammer.addRecipe(%s, %s, %s, %s);", @@ -80,7 +80,7 @@ public class ExNihiloLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("sieve")) { + if(args.isEmpty() || args.contains("Sieve")) { for(Entry> entry : SieveRegistry.getSiftables().entrySet()) { for(SiftingResult recipe : entry.getValue()) { MineTweakerAPI.logCommand(String.format("mods.exnihilo.Sieve.addRecipe(%s, %s, %s);", diff --git a/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java b/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java index b7188ad..ba06923 100644 --- a/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java +++ b/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java @@ -19,9 +19,9 @@ public class FactorizationLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); static { - validArguments.add("crystallizer"); - validArguments.add("lacerator"); - validArguments.add("slagfurnace"); + validArguments.add("Crystallizer"); + validArguments.add("Lacerator"); + validArguments.add("SlagFurnace"); } @Override @@ -33,7 +33,7 @@ public class FactorizationLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("crystallizer")) { + if(args.isEmpty() || args.contains("Crystallizer")) { for(Object recipe : FactorizationHelper.crystallizer) { MineTweakerAPI.logCommand(String.format("mods.factorization.Crystallizer.addRecipe(%s, %s, %s, %s);", LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "input")), @@ -43,7 +43,7 @@ public class FactorizationLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("lacerator")) { + if(args.isEmpty() || args.contains("Lacerator")) { for(Object recipe : FactorizationHelper.lacerator) { MineTweakerAPI.logCommand(String.format("mods.factorization.Lacerator.addRecipe(%s, %s, %s);", ReflectionHelper.getObject(recipe, "oreName") != null ? @@ -54,7 +54,7 @@ public class FactorizationLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("slagfurnace")) { + if(args.isEmpty() || args.contains("SlagFurnace")) { for(Object recipe : FactorizationHelper.slag) { MineTweakerAPI.logCommand(String.format("mods.factorization.SlagFurnace.addRecipe(%s, %s, %s, %s, %s);", LogHelper.getStackDescription(ReflectionHelper.getObject(recipe, "input")), diff --git a/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java b/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java index 3d91585..72140da 100644 --- a/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java +++ b/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java @@ -36,22 +36,22 @@ public class MekanismLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); static { - validArguments.add("combiner"); - validArguments.add("compressor"); - validArguments.add("crusher"); - validArguments.add("crystallizer"); - validArguments.add("dissolution"); - validArguments.add("enrichment"); - validArguments.add("evaporation"); - validArguments.add("infuser"); - validArguments.add("injection"); - validArguments.add("neutron"); - validArguments.add("oxidizer"); - validArguments.add("purification"); - validArguments.add("reaction"); - validArguments.add("sawmill"); - validArguments.add("separator"); - validArguments.add("washer"); + validArguments.add("Combiner"); + validArguments.add("Compressor"); + validArguments.add("Crusher"); + validArguments.add("Crystallizer"); + validArguments.add("Dissolution"); + validArguments.add("Enrichment"); + validArguments.add("SolarEvaporation"); + validArguments.add("Infuser"); + validArguments.add("Injection"); + validArguments.add("SolarNeutronActivator"); + validArguments.add("Oxidizer"); + validArguments.add("Purification"); + validArguments.add("Reaction"); + validArguments.add("Sawmill"); + validArguments.add("Separator"); + validArguments.add("Washer"); } @SuppressWarnings({ "unchecked" }) @@ -64,7 +64,7 @@ public class MekanismLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("crystallizer")) { + if(args.isEmpty() || args.contains("Crystallizer")) { for(CrystallizerRecipe recipe : (Collection)Recipe.CHEMICAL_CRYSTALLIZER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.chemical.Crystallizer.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -72,7 +72,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("dissolution")) { + if(args.isEmpty() || args.contains("Dissolution")) { for(DissolutionRecipe recipe : (Collection)Recipe.CHEMICAL_DISSOLUTION_CHAMBER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.chemical.Dissolution.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -80,7 +80,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("infuser")) { + if(args.isEmpty() || args.contains("Infuser")) { for(ChemicalInfuserRecipe recipe : (Collection)Recipe.CHEMICAL_INFUSER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.chemical.Infuser.addRecipe(%s, %s, %s);", LogHelper.getStackDescription(recipe.recipeInput.leftGas), @@ -89,7 +89,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("injection")) { + if(args.isEmpty() || args.contains("Injection")) { for(InjectionRecipe recipe : (Collection)Recipe.CHEMICAL_INJECTION_CHAMBER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.chemical.Injection.addRecipe(%s, %s, %s);", LogHelper.getStackDescription(recipe.recipeInput.itemStack), @@ -98,7 +98,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("oxidizer")) { + if(args.isEmpty() || args.contains("Oxidizer")) { for(OxidationRecipe recipe : (Collection)Recipe.CHEMICAL_OXIDIZER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.chemical.Oxidizer.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -106,7 +106,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("washer")) { + if(args.isEmpty() || args.contains("Washer")) { for(WasherRecipe recipe : (Collection)Recipe.CHEMICAL_WASHER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.chemical.Washer.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -114,7 +114,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("combiner")) { + if(args.isEmpty() || args.contains("Combiner")) { for(CombinerRecipe recipe : (Collection)Recipe.COMBINER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Combiner.addRecipe(%s, %s, %s);", LogHelper.getStackDescription(recipe.recipeInput.itemStack), @@ -123,7 +123,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("compressor")) { + if(args.isEmpty() || args.contains("Compressor")) { for(CombinerRecipe recipe : (Collection)Recipe.COMBINER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Compressor.addRecipe(%s, %s, %s);", LogHelper.getStackDescription(recipe.recipeInput.itemStack), @@ -132,7 +132,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("crusher")) { + if(args.isEmpty() || args.contains("Crusher")) { for(CrusherRecipe recipe : (Collection)Recipe.CRUSHER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Crusher.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -140,7 +140,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("crusher")) { + if(args.isEmpty() || args.contains("Smelter")) { for(SmeltingRecipe recipe : (Collection)Recipe.ENERGIZED_SMELTER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Smelter.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -148,7 +148,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("enrichment")) { + if(args.isEmpty() || args.contains("Enrichment")) { for(EnrichmentRecipe recipe : (Collection)Recipe.ENRICHMENT_CHAMBER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Enrichment.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -156,7 +156,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("infuser")) { + if(args.isEmpty() || args.contains("Infuser")) { for(MetallurgicInfuserRecipe recipe : (Collection)Recipe.METALLURGIC_INFUSER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Infuser.addRecipe(\"%s\", %d, %s, %s);", recipe.getInput().infuse.type.name, @@ -166,7 +166,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("purification")) { + if(args.isEmpty() || args.contains("Purification")) { for(PurificationRecipe recipe : (Collection)Recipe.PURIFICATION_CHAMBER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Purification.addRecipe(%s, %s, %s);", LogHelper.getStackDescription(recipe.recipeInput.itemStack), @@ -175,7 +175,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("reaction")) { + if(args.isEmpty() || args.contains("Reaction")) { for(PressurizedRecipe recipe : (Collection)Recipe.PRESSURIZED_REACTION_CHAMBER.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Reaction.addRecipe(%s, %s, %s, %s, %s, %s, %d);", LogHelper.getStackDescription(recipe.recipeInput.getSolid()), @@ -188,7 +188,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("sawmill")) { + if(args.isEmpty() || args.contains("Sawmill")) { for(SawmillRecipe recipe : (Collection)Recipe.PRECISION_SAWMILL.get().values()) { if(recipe.getOutput().hasSecondary()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Sawmill.addRecipe(%s, %s, %s, %s);", @@ -204,7 +204,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("separator")) { + if(args.isEmpty() || args.contains("Separator")) { for(SeparatorRecipe recipe : (Collection)Recipe.ELECTROLYTIC_SEPARATOR.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.Separator.addRecipe(%s, %s, %s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -214,7 +214,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("evaporation")) { + if(args.isEmpty() || args.contains("SolarEvaporation")) { for(SolarEvaporationRecipe recipe : (Collection)Recipe.SOLAR_EVAPORATION_PLANT.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.SolarEvaporation.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), @@ -222,7 +222,7 @@ public class MekanismLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("neutron")) { + if(args.isEmpty() || args.contains("SolarNeutronActivator")) { for(SolarNeutronRecipe recipe : (Collection)Recipe.SOLAR_NEUTRON_ACTIVATOR.get().values()) { MineTweakerAPI.logCommand(String.format("mods.mekanism.SolarNeutronActivator.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), diff --git a/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java b/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java index 9e2b33b..183eb95 100644 --- a/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java +++ b/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java @@ -25,10 +25,10 @@ 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"); + validArguments.add("BlastFurnace"); + validArguments.add("CokeOven"); + validArguments.add("RockCrusher"); + validArguments.add("RollingMachine"); } @Override @@ -40,7 +40,7 @@ public class RailcraftLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("blastfurnace")) { + 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()), @@ -51,7 +51,7 @@ public class RailcraftLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("cokeoven")) { + 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()), @@ -63,7 +63,7 @@ public class RailcraftLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("rockcrusher")) { + 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()), @@ -73,7 +73,7 @@ public class RailcraftLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("rollingmachine")) { + 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()), diff --git a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java b/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java index 3c5f964..58fff47 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java +++ b/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java @@ -25,9 +25,9 @@ public class TConstructLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); static { - validArguments.add("casting"); - validArguments.add("drying"); - validArguments.add("smeltery"); + validArguments.add("Casting"); + validArguments.add("Drying"); + validArguments.add("Smeltery"); } @Override @@ -39,7 +39,7 @@ public class TConstructLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("casting")) { + if(args.isEmpty() || args.contains("Casting")) { for(CastingRecipe recipe : TConstructHelper.basinCasting) { MineTweakerAPI.logCommand(String.format("mods.tconstruct.Casting.addBasinRecipe(%s, %s, %s, %s, %d);", LogHelper.getStackDescription(recipe.output), @@ -59,7 +59,7 @@ public class TConstructLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("drying")) { + if(args.isEmpty() || args.contains("Drying")) { for(DryingRecipe recipe : DryingRackRecipes.recipes) { MineTweakerAPI.logCommand(String.format("mods.tconstruct.Drying.addRecipe(%s, %s, %d);", LogHelper.getStackDescription(recipe.input), @@ -68,7 +68,7 @@ public class TConstructLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("smeltery")) { + if(args.isEmpty() || args.contains("Smeltery")) { for(Entry recipe : TConstructHelper.smeltingList.entrySet()) { int temperature = TConstructHelper.temperatureList.get(recipe.getKey()); diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java b/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java index ac90c1c..2e923ac 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java @@ -29,13 +29,13 @@ public class ThermalExpansionLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); static { - validArguments.add("crucible"); - validArguments.add("furnace"); - validArguments.add("insolator"); - validArguments.add("pulverizer"); - validArguments.add("sawmill"); - validArguments.add("smelter"); - validArguments.add("transposer"); + validArguments.add("Crucible"); + validArguments.add("Furnace"); + validArguments.add("Insolator"); + validArguments.add("Pulverizer"); + validArguments.add("Sawmill"); + validArguments.add("Smelter"); + validArguments.add("Transposer"); } @Override @@ -47,7 +47,7 @@ public class ThermalExpansionLogger implements ICommandFunction { player.sendChat(MineTweakerImplementationAPI.platform.getMessage("Invalid arguments for command. Valid arguments: " + StringHelper.join(validArguments, ", "))); } } else { - if(args.isEmpty() || args.contains("crucible")) { + if(args.isEmpty() || args.contains("Crucible")) { for(RecipeCrucible recipe : CrucibleManager.getRecipeList()) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Crucible.addRecipe(%d, %s, %s);", recipe.getEnergy(), @@ -56,7 +56,7 @@ public class ThermalExpansionLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("furnace")) { + if(args.isEmpty() || args.contains("Furnace")) { for(RecipeFurnace recipe : FurnaceManager.getRecipeList()) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Furnace.addRecipe(%d, %s, %s);", recipe.getEnergy(), @@ -65,7 +65,7 @@ public class ThermalExpansionLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("insolator")) { + if(args.isEmpty() || args.contains("Insolator")) { for(RecipeInsolator recipe : InsolatorManager.getRecipeList()) { if(recipe.getSecondaryOutput() != null) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Insolator.addRecipe(%d, %s, %s, %s, %s, %d);", @@ -85,7 +85,7 @@ public class ThermalExpansionLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("pulverizer")) { + if(args.isEmpty() || args.contains("Pulverizer")) { for(RecipePulverizer recipe : PulverizerManager.getRecipeList()) { if(recipe.getSecondaryOutput() != null) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Pulverizer.addRecipe(%d, %s, %s, %s, %d);", @@ -103,7 +103,7 @@ public class ThermalExpansionLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("sawmill")) { + if(args.isEmpty() || args.contains("Sawmill")) { for(RecipeSawmill recipe : SawmillManager.getRecipeList()) { if(recipe.getSecondaryOutput() != null) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Sawmill.addRecipe(%d, %s, %s, %s, %d);", @@ -121,7 +121,7 @@ public class ThermalExpansionLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("smelter")) { + if(args.isEmpty() || args.contains("Smelter")) { for(RecipeSmelter recipe : SmelterManager.getRecipeList()) { if(recipe.getSecondaryOutput() != null) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Smelter.addRecipe(%d, %s, %s, %s, %s, %d);", @@ -141,7 +141,7 @@ public class ThermalExpansionLogger implements ICommandFunction { } } - if(args.isEmpty() || args.contains("transposer")) { + if(args.isEmpty() || args.contains("Transposer")) { for(RecipeTransposer recipe : TransposerManager.getFillRecipeList()) { MineTweakerAPI.logCommand(String.format("mods.thermalexpansion.Transposer.addFillRecipe(%d, %s, %s, %s);", recipe.getEnergy(),