Merge branch 'master' into master

src/main/resources/mapping.json

@@ -19,7 +19,8 @@
     "0x13": "PacketPlayInRotation",
     "0x0A": "PacketPlayInPluginMessaging",
     "0x06": "PacketPlayInTabComplete",
-    "0x25": "PacketPlayInHeldItemChange"
+    "0x25": "PacketPlayInHeldItemChange",
+    "0x21": "PacketPlayInResourcePackStatus"
   },
   "PlayOut": {
     "PacketPlayOutLogin": "0x26",
@@ -44,7 +45,8 @@
     "PacketPlayOutSpawnEntity": "0x00",
     "PacketPlayOutSpawnEntityLiving": "0x02",
     "PacketPlayOutHeldItemChange": "0x48",
-    "PacketPlayOutPlayerListHeaderFooter": "0x5E"
+    "PacketPlayOutPlayerListHeaderFooter": "0x5E",
+    "PacketPlayOutResourcePackSend": "0x3C"
   },
   "StatusIn": {
     "0x01": "PacketStatusInPing",

src/main/resources/server.properties

@@ -59,8 +59,20 @@ motd={"text":"","extra":[{"text":"Limbo Server!","color":"yellow"}]}
 #Server list version as string
 version=Limbo!
 
-#Tab-List Header
-tab-header={"text":"","extra":[{"text":"Welcome to Limbo!","color":"green"}]}
+#Tab-List Header (May be left blank)
+tab-header=
 
-#Tab-List Footer
-tab-footer={"text":"","extra":[{"text":"Limbo Server by LOOHP","color":"yellow"}]}
+#Tab-List Footer (May be left blank)
+tab-footer=
+
+#Server resource pack url (May be left blank)
+resource-pack=
+
+#Server resource pack hash (May be left blank)
+resource-pack-sha1=
+
+#Whether to kick players if they do not accept the server resource pack
+required-resource-pack=false
+
+#JSON formatted text to show when prompting the player to install the resource pack (May be left blank)
+resource-pack-prompt={"text":"","extra":[{"text":"Install server resource pack!","color":"yellow"}]}