Merge branch 'master' of https://github.com/MylesIsCool/ViaVersion into 1.11-DEV

README.md

@@ -2,6 +2,8 @@
 [![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
 [![Gitter](https://badges.gitter.im/MylesIsCool/ViaVersion.svg)](https://gitter.im/MylesIsCool/ViaVersion)
 
+IRC: [#viaversion](http://buzz.spi.gt/iris/?channels=viaversion) on irc.spi.gt for Support.
+
 **Allows the connection of higher client versions to lower server versions**
 
 Allows 1.10, 1.9 on 1.8 server and 1.10 on a 1.9 server.
@@ -14,40 +16,14 @@ Allows 1.10, 1.9 on 1.8 server and 1.10 on a 1.9 server.
 
 Sources:
 --------
+**wiki.vg** (Used for various information, we also contribute back)
 
-**wiki.vg** (Protocol info, though I did have to find a lot myself)
+**Burger** (See [PAaaS](https://github.com/Matsv/Paaas))
-
-**Burger** We use this tool to get protocol and other useful information for new / undocumented Minecraft versions
 
 **OpenNBT** (used for slot rewriting)
 
 
 
-All Time Contributors:
---------
-
-**Myself** (harhar)
-
-**Matsv**
-
-**HugoDaBosss**
-
-**SanderGielisse**
-
-**Paulomart**
-
-**gigosaurus**
-
-**fillefilip8**
-
-**lenis0012**
-
-**fuzzy_bot**
-
-**joserobjr**
-
-
-
 Releases / Dev Builds:
 --------
 You can find official releases here:
@@ -70,5 +46,5 @@ License:
 
 MIT License, see LICENSE for more details.
 
-Thanks!
 
+Special thanks to all our [Contributors](https://github.com/MylesIsCool/ViaVersion/graphs/contributors)

src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -93,4 +93,9 @@ public class ProtocolVersion {
     public int hashCode() {
         return id;
     }
+
+    @Override
+    public String toString() {
+        return String.format("%s(%d)", this.getName(), this.getId());
+    }
 }

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<String, Object> configuration = ((ViaVersionPlugin) ViaVersion.getInstance()).getConfig().getValues(false);
+
+        final DumpTemplate template = new DumpTemplate(version, configuration, plugins);
 
         Bukkit.getScheduler().runTaskAsynchronously((ViaVersionPlugin) ViaVersion.getInstance(), new Runnable() {
             @Override

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<String, Object> configuration;
     private List<PluginInfo> plugins;
 }