ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upstream merge

Browse source
This commit is contained in:
Zach Brown 2014-06-26 15:07:23 -05:00
parent 075650527a
commit 0c622646fe
6 changed files with 119 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
.gitignore vendored Normal file
View file

@ -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

2
Bukkit

@ -1 +1 @@
Subproject commit 567b887d98f5889176b22c077d28e28c8dee2e3d
Subproject commit 0cf705d2353163f6510a25bb3393d891be7097a7

2
CraftBukkit

@ -1 +1 @@
Subproject commit 2f44766568653f960168574bfc66135ad62b1f1a
Subproject commit 7f086636ffaef387c7dbe7aca579c3c417981f42

72
MinecraftRelocate/pom.xml Normal file
View file

@ -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>

7
MinecraftRelocate/rename.sh Executable file
View file

@ -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' {} \;

1
pom.xml
View file

@ -19,6 +19,7 @@
<url>https://github.com/SpigotMC/Spigot</url>
<modules>
<module>MinecraftRelocate</module>
<module>Spigot-Server</module>
<module>Spigot-API</module>
</modules>