diff --git a/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index cde67222d..056876a1a 100644 --- a/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -91,4 +91,9 @@ public class ProtocolVersion { public int hashCode() { return id; } + + @Override + public String toString() { + return String.format("%s(%d)", this.getName(), this.getId()); + } } diff --git a/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DumpSubCmd.java b/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DumpSubCmd.java index 31698eac3..03ad3472d 100644 --- a/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DumpSubCmd.java +++ b/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DumpSubCmd.java @@ -23,6 +23,7 @@ import java.net.URL; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.logging.Level; public class DumpSubCmd extends ViaSubCommand { @@ -52,7 +53,9 @@ public class DumpSubCmd extends ViaSubCommand { for (Plugin p : Bukkit.getPluginManager().getPlugins()) plugins.add(new PluginInfo(p.isEnabled(), p.getDescription().getName(), p.getDescription().getVersion(), p.getDescription().getMain(), p.getDescription().getAuthors())); - final DumpTemplate template = new DumpTemplate(version, plugins); + Map configuration = ((ViaVersionPlugin) ViaVersion.getInstance()).getConfig().getValues(false); + + final DumpTemplate template = new DumpTemplate(version, configuration, plugins); Bukkit.getScheduler().runTaskAsynchronously((ViaVersionPlugin) ViaVersion.getInstance(), new Runnable() { @Override diff --git a/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java b/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java index e72cd7f70..e6b5451ba 100644 --- a/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java +++ b/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java @@ -4,10 +4,12 @@ import lombok.AllArgsConstructor; import lombok.Data; import java.util.List; +import java.util.Map; @Data @AllArgsConstructor public class DumpTemplate { - private VersionInfo versions; + private VersionInfo versionInfo; + private Map configuration; private List plugins; }