From 8840dade682f8bf80c6285a06c14e9466fa6d933 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 9 Feb 2013 19:08:56 +1100
Subject: [PATCH] Finish merge of protocol subproject

---
 pom.xml             |  1 +
 protocol/.gitignore | 34 ----------------------------------
 protocol/README.md  | 20 --------------------
 protocol/pom.xml    | 29 ++++++++++++-----------------
 proxy/pom.xml       |  5 +++--
 5 files changed, 16 insertions(+), 73 deletions(-)
 delete mode 100644 protocol/.gitignore
 delete mode 100644 protocol/README.md

diff --git a/pom.xml b/pom.xml
index ca0dd096..2b9a2e4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
 
     <modules>
         <module>api</module>
+        <module>protocol</module>
         <module>proxy</module>
     </modules>
 
diff --git a/protocol/.gitignore b/protocol/.gitignore
deleted file mode 100644
index 433f53cf..00000000
--- a/protocol/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-# Eclipse stuff
-/.classpath
-/.project
-/.settings
-
-# netbeans
-/nbproject
-/nbactions.xml
-/nb-configuration.xml
-
-# we use maven!
-/build.xml
-
-# maven
-/target
-/dependency-reduced-pom.xml
-
-# vim
-.*.sw[a-p]
-
-# various other potential build files
-/build
-/bin
-/dist
-/manifest.mf
-
-# Mac filesystem dust
-/.DS_Store
-
-# intellij
-*.iml
-*.ipr
-*.iws
-.idea/
diff --git a/protocol/README.md b/protocol/README.md
deleted file mode 100644
index 47845734..00000000
--- a/protocol/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Mendax
-======
-The Minecraft protocol is a lie!
---------------------------------
-Mendax is a predominantly I Minecraft protocol parser and inspector. It also includes a built in proxy.
-
-History
--------
-MinecraftProtocolLib was designed to be the most efficient way of separating the Minecraft protocol into byte arrays. With other tools like SMProxy by @SirCmpwn and MinerHat by @sk89q becoming obsolete, the decision was made to expand MinecraftProtocolLib into a parser as well. Mendax is that parser.
-With no runtime dependencies Mendax is the perfect choice for use in your next Java, Minecraft related project.
-
-Operation
----------
-Mendax has 2 modes of operation.
-
-- Parsing Mode - Bytes are read from an InputStream and returned in byte arrays. This mode is the most efficient, however the raw data itself is not very useful
-- Inspection Mode - Bytes are read from an InputStream and Packet objects are returned. These packet objects contain all useable information about a packet. In this mode Items, Locations and Compressed Data are expanded into their own fields and data types.
-
-
->Please note that the above features may not be entirely implemented in the current version of Mendax. Additionally breaking changes may occur without warning, however they should all be easy to update.
\ No newline at end of file
diff --git a/protocol/pom.xml b/protocol/pom.xml
index f1e17718..c87c8171 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -1,25 +1,20 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>net.md-5</groupId>
+        <artifactId>bungeecord-parent</artifactId>
+        <version>1.4.7-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <groupId>net.md-5</groupId>
-    <artifactId>mendax</artifactId>
-    <version>1.4.6-SNAPSHOT</version>
+    <artifactId>bungeecord-protocol</artifactId>
+    <version>1.4.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Mendax</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <name>BungeeCord-Protocol</name>
+    <description>Minimal implementation of the Minecraft protocol for use in BungeeCord</description>
 </project>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 52dccd85..a9776f1d 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -1,3 +1,4 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -20,8 +21,8 @@
     <dependencies>
         <dependency>
             <groupId>net.md-5</groupId>
-            <artifactId>mendax</artifactId>
-            <version>1.4.6-SNAPSHOT</version>
+            <artifactId>bungeecord-protocol</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>