diff --git a/resources/assets/bdlib/lang/en_US.lang b/resources/assets/bdlib/lang/en_US.lang index 89a6735..e631441 100644 --- a/resources/assets/bdlib/lang/en_US.lang +++ b/resources/assets/bdlib/lang/en_US.lang @@ -17,8 +17,10 @@ bdlib.rsmode.rs_off=Disable on redstone bdlib.label.empty=Empty -bdlib.oredistribution.usage=/oredistribution [min height] [max height] +bdlib.oredistribution.usage=/oredistribution [] [] [--file] bdlib.oredistribution.start1=Checking ore distribution in (%s,%s,%s) to (%s,%s,%s) dim %s bdlib.oredistribution.start2=Server may lag for a while bdlib.oredistribution.entry=%s %s - %s (%s%%) -bdlib.oredistribution.warn=%s Warning: %s has multiple variants generated: \ No newline at end of file +bdlib.oredistribution.warn=%s Warning: %s has multiple variants generated: +bdlib.oredistribution.saved=Ore distribution dumped to %s +bdlib.oredistribution.error=Failed to save ore distribution dump: %s \ No newline at end of file diff --git a/src/net/bdew/lib/CommandOreDistribution.scala b/src/net/bdew/lib/CommandOreDistribution.scala index beb1e62..f3c9072 100644 --- a/src/net/bdew/lib/CommandOreDistribution.scala +++ b/src/net/bdew/lib/CommandOreDistribution.scala @@ -9,7 +9,10 @@ package net.bdew.lib +import java.io.{BufferedWriter, File, FileWriter} + import cpw.mods.fml.common.registry.GameData +import cpw.mods.fml.relauncher.FMLInjectionData import net.minecraft.command.{CommandBase, ICommandSender, WrongUsageException} import net.minecraft.entity.player.EntityPlayerMP import net.minecraft.item.Item @@ -32,7 +35,9 @@ object CommandOreDistribution extends CommandBase { def wrapColor(s: String, c: EnumChatFormatting) = c + s + EnumChatFormatting.RESET - def processCommand(sender: ICommandSender, params: Array[String]) { + def processCommand(sender: ICommandSender, baseParams: Array[String]) { + val (flags, params) = baseParams.partition(_.startsWith("--")) + if (params.length < 1 || params.length > 3) throw new WrongUsageException(getCommandUsage(sender)) @@ -42,13 +47,15 @@ object CommandOreDistribution extends CommandBase { case _ => (0, 0, sender.getEntityWorld) } - val radius = safeInt(params(0)) + val radius = safeInt(params.head) val minY = if (params.length >= 2) safeInt(params(1)) else 0 val maxY = if (params.length >= 3) safeInt(params(2)) else world.getHeight - 1 if (minY < 0 || radius <= 0 || minY > maxY || maxY > world.getHeight - 1) throw new WrongUsageException(getCommandUsage(sender)) + val toFile = flags.contains("--file") + // why java, WHY? CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.start1", Array[Integer](startX - radius, minY, startZ - radius, startX + radius, maxY, startZ + radius, world.provider.dimensionId): _*) @@ -77,19 +84,59 @@ object CommandOreDistribution extends CommandBase { } } - for ((id, types) <- kinds.filter(_._2.size > 1).toList.sortBy(_._1)) { - CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.warn", - wrapColor(" !", EnumChatFormatting.RED), wrapColor(id.substring(3), EnumChatFormatting.RED)) - for ((item, dmg) <- types) - CommandBase.func_152373_a(sender, this, wrapColor(" - ", EnumChatFormatting.RED) + GameData.getItemRegistry.getNameForObject(item) + "@" + dmg) - } - val total = distribution.map(_._2).sum + val warnings = kinds.filter(_._2.size > 1) - for ((id, num) <- distribution.filter(_._2 > 0).toList.sortBy(-_._2)) { - CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.entry", - " *", wrapColor(id.substring(3), EnumChatFormatting.YELLOW), - DecFormat.round(num), DecFormat.short(100F * num / total)) + if (toFile) { + // === OUTPUT TO FILE === + val mcHome = FMLInjectionData.data()(6).asInstanceOf[File] //is there a better way to get this? + val dumpFile = new File(mcHome, "ore_distribution.txt") + val dumpWriter = new BufferedWriter(new FileWriter(dumpFile)) + try { + dumpWriter.write("Ore distribution report - (%d,%d,%d) to (%d,%d,%d) dim %d".format( + startX - radius, minY, startZ - radius, startX + radius, maxY, startZ + radius, world.provider.dimensionId + )) + dumpWriter.newLine() + dumpWriter.newLine() + if (warnings.size > 0) { + for ((id, types) <- warnings.toList.sortBy(_._1)) { + dumpWriter.write("Warning: %s has multiple variants generated:".format(id.substring(3))) + dumpWriter.newLine() + for ((item, dmg) <- types) { + dumpWriter.write(" - %s@%s".format(GameData.getItemRegistry.getNameForObject(item), dmg)) + dumpWriter.newLine() + } + dumpWriter.newLine() + } + dumpWriter.write("=================") + dumpWriter.newLine() + dumpWriter.newLine() + } + for ((id, num) <- distribution.filter(_._2 > 0).toList.sortBy(-_._2)) { + dumpWriter.write("%s - %s (%s%%)".format(id.substring(3), DecFormat.round(num), DecFormat.short(100F * num / total))) + dumpWriter.newLine() + } + CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.saved", dumpFile.getCanonicalPath) + } catch { + case e: Throwable => + CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.error", e.toString) + BdLib.logErrorException("Failed to save ore distribution dump", e) + } finally { + dumpWriter.close() + } + } else { + // === OUTPUT TO CHAT === + for ((id, types) <- warnings.toList.sortBy(_._1)) { + CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.warn", + wrapColor(" !", EnumChatFormatting.RED), wrapColor(id.substring(3), EnumChatFormatting.RED)) + for ((item, dmg) <- types) + CommandBase.func_152373_a(sender, this, wrapColor(" - ", EnumChatFormatting.RED) + GameData.getItemRegistry.getNameForObject(item) + "@" + dmg) + } + for ((id, num) <- distribution.filter(_._2 > 0).toList.sortBy(-_._2)) { + CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.entry", + " *", wrapColor(id.substring(3), EnumChatFormatting.YELLOW), + DecFormat.round(num), DecFormat.short(100F * num / total)) + } } } } \ No newline at end of file