From 0c622646fefd267a6767526c43289000d6f1df94 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Thu, 26 Jun 2014 15:07:23 -0500
Subject: [PATCH] Upstream merge

---
 .gitignore                  | 37 +++++++++++++++++++
 Bukkit                      |  2 +-
 CraftBukkit                 |  2 +-
 MinecraftRelocate/pom.xml   | 72 +++++++++++++++++++++++++++++++++++++
 MinecraftRelocate/rename.sh |  7 ++++
 pom.xml                     |  1 +
 6 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 MinecraftRelocate/pom.xml
 create mode 100755 MinecraftRelocate/rename.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..deab816f06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+# Eclipse stuff
+.classpath
+.project
+.settings/
+
+# netbeans
+nbproject/
+nbactions.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/
+
+# other stuff
+Spigot-API
+Spigot-Server
diff --git a/Bukkit b/Bukkit
index 567b887d98..0cf705d235 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 567b887d98f5889176b22c077d28e28c8dee2e3d
+Subproject commit 0cf705d2353163f6510a25bb3393d891be7097a7
diff --git a/CraftBukkit b/CraftBukkit
index 2f44766568..7f086636ff 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 2f44766568653f960168574bfc66135ad62b1f1a
+Subproject commit 7f086636ffaef387c7dbe7aca579c3c417981f42
diff --git a/MinecraftRelocate/pom.xml b/MinecraftRelocate/pom.xml
new file mode 100644
index 0000000000..23c0d22160
--- /dev/null
+++ b/MinecraftRelocate/pom.xml
@@ -0,0 +1,72 @@
+<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>org.spigotmc</groupId>
+        <artifactId>spigot-parent</artifactId>
+        <version>dev-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.spigotmc</groupId>
+    <artifactId>minecraft-server</artifactId>
+    <version>1.7.9-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>Minecraft Server</name>
+
+    <repositories>
+        <repository>
+            <id>repobo-snap</id>
+            <url>http://repo.bukkit.org/content/groups/public</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>minecraft-server</artifactId>
+            <version>1.7.9</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>net.minecraft.util.com.google</pattern>
+                            <shadedPattern>com.google</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>net.minecraft.util.gnu</pattern>
+                            <shadedPattern>gnu</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>net.minecraft.util.io</pattern>
+                            <shadedPattern>io</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>net.minecraft.util.org</pattern>
+                            <shadedPattern>org</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/MinecraftRelocate/rename.sh b/MinecraftRelocate/rename.sh
new file mode 100755
index 0000000000..b814ea54a7
--- /dev/null
+++ b/MinecraftRelocate/rename.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+find ../Spigot-Server/src/ -type f -exec sed -i 's/net.minecraft.util.//g' {} \;
+find ../CraftBukkit-Patches/ -type f -exec sed -i 's/net.minecraft.util.//g' {} \;
+
+find ../Spigot-Server/src/ -type f -exec sed -i 's/com.mojang.authlib./net.minecraft.util.com.mojang.authlib./g' {} \;
+find ../CraftBukkit-Patches/ -type f -exec sed -i 's/com.mojang.authlib./net.minecraft.util.com.mojang.authlib./g' {} \;
diff --git a/pom.xml b/pom.xml
index b95eec0b3e..151420d6cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
     <url>https://github.com/SpigotMC/Spigot</url>
 
     <modules>
+        <module>MinecraftRelocate</module>
         <module>Spigot-Server</module>
         <module>Spigot-API</module>
     </modules>