diff --git a/src/main/java/modtweaker2/Commands.java b/src/main/java/modtweaker2/Commands.java index 4e0ef63..792b04d 100644 --- a/src/main/java/modtweaker2/Commands.java +++ b/src/main/java/modtweaker2/Commands.java @@ -19,7 +19,8 @@ import modtweaker2.mods.factorization.commands.FactorizationLogger; import modtweaker2.mods.mekanism.commands.GasLogger; import modtweaker2.mods.mekanism.commands.MekanismLogger; import modtweaker2.mods.railcraft.commands.RailcraftLogger; -import modtweaker2.mods.tconstruct.MaterialLogger; +import modtweaker2.mods.tconstruct.commands.MaterialLogger; +import modtweaker2.mods.tconstruct.commands.ModifierLogger; import modtweaker2.mods.tconstruct.commands.TConstructLogger; import modtweaker2.mods.thaumcraft.commands.AspectLogger; import modtweaker2.mods.thaumcraft.research.commands.ResearchLogger; @@ -81,6 +82,7 @@ public class Commands { 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("modifiers", new String[] { "/minetweaker modifiers", " Outputs a list of all Tinker's Construct modifier names in the game to the minetweaker log" }, new ModifierLogger()); MineTweakerAPI.server.addMineTweakerCommand("tconstruct", new String[]{ "/minetweaker tconstruct [HANDLER]", " Outputs a list of all Tinkers Construct recipes."}, new TConstructLogger()); } diff --git a/src/main/java/modtweaker2/mods/tconstruct/MaterialLogger.java b/src/main/java/modtweaker2/mods/tconstruct/commands/MaterialLogger.java similarity index 54% rename from src/main/java/modtweaker2/mods/tconstruct/MaterialLogger.java rename to src/main/java/modtweaker2/mods/tconstruct/commands/MaterialLogger.java index 2f66b28..788b5b9 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/MaterialLogger.java +++ b/src/main/java/modtweaker2/mods/tconstruct/commands/MaterialLogger.java @@ -1,10 +1,4 @@ -package modtweaker2.mods.tconstruct; - -import static modtweaker2.helpers.LogHelper.logPrinted; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Map; +package modtweaker2.mods.tconstruct.commands; import minetweaker.MineTweakerAPI; import minetweaker.api.player.IPlayer; @@ -12,25 +6,17 @@ import minetweaker.api.server.ICommandFunction; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.ToolMaterial; +import java.util.Map; + +import static modtweaker2.helpers.LogHelper.logPrinted; + public class MaterialLogger implements ICommandFunction { - private static ArrayList materials = new ArrayList(); - static { - materials = new ArrayList(); - for (Map.Entry entry : TConstructRegistry.toolMaterialStrings.entrySet()) { - materials.add(entry.getKey()); - } - - Collections.sort(materials); - } - @Override public void execute(String[] arguments, IPlayer player) { - System.out.println("Materials: " + materials.size()); - for (String s : materials) { - System.out.println("Material " + s); - MineTweakerAPI.logCommand("<" + s + "> -- "); + MineTweakerAPI.logCommand(TConstructRegistry.toolMaterialStrings.entrySet().size() + " Materials:"); + for (Map.Entry entry : TConstructRegistry.toolMaterialStrings.entrySet()) { + MineTweakerAPI.logCommand(entry.getKey()); } - logPrinted(player); } } diff --git a/src/main/java/modtweaker2/mods/tconstruct/commands/ModifierLogger.java b/src/main/java/modtweaker2/mods/tconstruct/commands/ModifierLogger.java new file mode 100644 index 0000000..d6b772c --- /dev/null +++ b/src/main/java/modtweaker2/mods/tconstruct/commands/ModifierLogger.java @@ -0,0 +1,21 @@ +package modtweaker2.mods.tconstruct.commands; + +import minetweaker.MineTweakerAPI; +import minetweaker.api.player.IPlayer; +import minetweaker.api.server.ICommandFunction; +import modtweaker2.mods.tconstruct.TConstructHelper; +import tconstruct.library.modifier.ItemModifier; + +import static modtweaker2.helpers.LogHelper.logPrinted; + +public class ModifierLogger implements ICommandFunction{ + @Override + public void execute(String[] arguments, IPlayer player) { + MineTweakerAPI.logCommand(TConstructHelper.modifiers.size() + " Tinker's Construct modifiers:"); + for (ItemModifier modifier : TConstructHelper.modifiers) { + if (!modifier.key.equals("")) + MineTweakerAPI.logCommand(modifier.key); + } + logPrinted(player); + } +}