Initial work on 1.14 pre-5

This commit is contained in:
Shane Freeder 2019-04-23 05:47:07 +01:00
parent fb25dc17c6
commit 6c3f04049d
315 changed files with 1547 additions and 1648 deletions

View file

@ -1,14 +1,14 @@
From 16f2fa8f86ea4272386830faf08c84cde635a753 Mon Sep 17 00:00:00 2001
From 37ba5cd5b415edd8e09513708652069efc410ddf Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index b3369ecf..c2ec40c7 100644
index 4118252f..0a61b4d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,33 +3,28 @@
@@ -3,33 +3,29 @@
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 +20,9 @@ index b3369ecf..c2ec40c7 100644
+ <version>dev-SNAPSHOT</version>
+ </parent>
+
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version>
<version>1.14-pre5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -55,7 +56,7 @@ index b3369ecf..c2ec40c7 100644
<repositories>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -41,6 +36,10 @@
@@ -41,6 +37,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@ -66,8 +67,8 @@ index b3369ecf..c2ec40c7 100644
</repositories>
<pluginRepositories>
@@ -63,6 +62,13 @@
<version>1.1.1</version>
@@ -57,6 +57,20 @@
<version>2.6</version>
<scope>compile</scope>
</dependency>
+ <!-- bundled with Minecraft, shouldn't ever change -->
@ -76,11 +77,18 @@ index b3369ecf..c2ec40c7 100644
+ <artifactId>jsr305</artifactId>
+ <version>1.3.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- used in previous versions of the API -->
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ </dependency>
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -119,15 +125,12 @@
@@ -113,15 +127,12 @@
</dependencies>
<build>
@ -97,7 +105,7 @@ index b3369ecf..c2ec40c7 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -162,6 +165,7 @@
@@ -156,6 +167,7 @@
</execution>
</executions>
<configuration>