mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-09 06:50:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
8fcef3c1f6
Paper/Spigot-API-Patches/0001-POM-changes.patch

107 lines
4.1 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 17:48:49 +08:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Paper 1.9
2016-03-01 07:09:49 +08:00
From: Zach Brown <zach.brown@destroystokyo.com>
Update to 1.12.1
2017-08-03 22:36:06 +08:00
Date: Tue, 1 Mar 2016 00:16:08 +0100
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-22 04:46:54 +08:00
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
index 5f3253b9c4a533e746707d602d4a7988519742ef..61b8ee4e3e122dd2671f50ea3b432e4abd4600a2 100644
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-22 04:46:54 +08:00
--- a/pom.xml
+++ b/pom.xml
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
@@ -2,33 +2,34 @@
MC 1.14.1
2019-05-14 10:20:58 +08:00
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Update B/CB/S
2017-08-06 06:36:47 +08:00
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Fix parent warning in PaperSpigot-API... and rebuild other patches
2015-01-11 15:10:11 +08:00
<modelVersion>4.0.0</modelVersion>
Update B/CB/S
2017-08-06 06:36:47 +08:00
+ <parent>
Paper 1.9
2016-03-01 07:09:49 +08:00
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
update upstream
2016-04-24 10:41:46 +08:00
+ <version>dev-SNAPSHOT</version>
Update B/CB/S
2017-08-06 06:36:47 +08:00
+ </parent>
MC 1.14.1
2019-05-14 10:20:58 +08:00
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
Initial work on 1.14 pre-5
2019-04-23 12:47:07 +08:00
+ <groupId>com.destroystokyo.paper</groupId>
Paper 1.9
2016-03-01 07:09:49 +08:00
+ <artifactId>paper-api</artifactId>
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 85b16b8a Update to Minecraft 1.16.5 CraftBukkit Changes: f3f30947 Update to Minecraft 1.16.5 Spigot Changes: 018b9a0d Update to Minecraft 1.16.5
2021-01-16 10:18:08 +08:00
<version>1.16.5-R0.1-SNAPSHOT</version>
Rebuild patches for upstream changes
2015-01-07 12:13:40 +08:00
<packaging>jar</packaging>
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-22 04:46:54 +08:00
- <name>Spigot-API</name>
Update B/CB/S
2017-08-06 06:36:47 +08:00
- <url>https://www.spigotmc.org/</url>
Paper 1.9
2016-03-01 07:09:49 +08:00
+ <name>Paper-API</name>
@Zbob750 missed a few name changes
2016-09-04 14:26:05 +08:00
+ <url>https://github.com/PaperMC/Paper</url>
Rebuild patches for upstream changes
2015-01-07 12:13:40 +08:00
<description>An enhanced plugin API for Minecraft servers.</description>
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-22 04:46:54 +08:00
<properties>
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 79f6ba25 Skip tests on default builds b85cc32f Further discourage World.regenerateChunk CraftBukkit Changes: 7560d3b5 Skip tests on default builds d0a9130d SPIGOT-4563: Fix regenerating chunks saved to disk already Spigot Changes: 8173d06f Remove need for redundant second clone of repositories 8ede0393 Rebuild patches
2019-01-05 03:19:36 +08:00
- <skipTests>true</skipTests>
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
Update Upstream
2019-05-06 10:58:04 +08:00
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 09:53:17 +08:00
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Squash Java 8 patches into pom changes patches
2016-01-29 16:51:53 +08:00
Fix up maven stuff hopefully
2018-09-23 00:58:09 +08:00
- <distributionManagement>
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
+ <repositories>
<repository>
Proper maven repo details
2016-02-21 18:12:03 +08:00
- <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
</repository>
Fix up maven stuff hopefully
2018-09-23 00:58:09 +08:00
- <snapshotRepository>
Proper maven repo details
2016-02-21 18:12:03 +08:00
- <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
Fix up maven stuff hopefully
2018-09-23 00:58:09 +08:00
- </snapshotRepository>
- </distributionManagement>
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
+ </repositories>
Initial Paper-API for Bukkit 1.13 Preview 4 - THIS IS NOT SERVER This branch/commit is only useful to those who purely use a clean Bukkit/Spigot/Paper API and does not use NMS/OBC references. This will let you start updating your plugin to the latest 1.13 builds of Bukkit Preview (4 as of now) Note that this release is not final!!! API breakages may occur! It is up to you if you find use out of this work.
2018-07-14 09:44:35 +08:00
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
<dependencies>
<dependency>
@@ -37,6 +38,20 @@
Initial work on 1.14 pre-5
2019-04-23 12:47:07 +08:00
<version>2.6</version>
Add javax.annotations to the API Used this set specifically because they are present in NMS already.
2016-09-17 03:38:52 +08:00
<scope>compile</scope>
</dependency>
t
2016-11-04 03:28:58 +08:00
+ <!-- bundled with Minecraft, shouldn't ever change -->
Add javax.annotations to the API Used this set specifically because they are present in NMS already.
2016-09-17 03:38:52 +08:00
+ <dependency>
Move nullable annotation dependency to JSR
2016-11-04 03:25:50 +08:00
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
MC uses JSR 1.3.9
2016-11-04 03:51:00 +08:00
+ <version>1.3.9</version>
Add javax.annotations to the API Used this set specifically because they are present in NMS already.
2016-09-17 03:38:52 +08:00
+ <scope>compile</scope>
Initial work on 1.14 pre-5
2019-04-23 12:47:07 +08:00
+ </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>
Add javax.annotations to the API Used this set specifically because they are present in NMS already.
2016-09-17 03:38:52 +08:00
+ </dependency>
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
@@ -93,6 +108,7 @@
set default goals on all pom poms </cheer>
2016-03-18 14:13:51 +08:00
</dependencies>
<build>
+ <defaultGoal>clean install</defaultGoal>
<plugins>
<plugin>
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 15:34:45 +08:00
<groupId>net.md-5</groupId>
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
@@ -111,10 +127,6 @@
set default goals on all pom poms </cheer>
2016-03-18 14:13:51 +08:00
<groupId>org.apache.maven.plugins</groupId>
Move eclipse compiler patch to POM changes patch Also update to Paperclip 1.1-SNAPSHOT
2017-09-24 02:17:20 +08:00
<artifactId>maven-compiler-plugin</artifactId>
API
2019-12-11 07:56:33 +08:00
<version>3.8.1</version>
Move eclipse compiler patch to POM changes patch Also update to Paperclip 1.1-SNAPSHOT
2017-09-24 02:17:20 +08:00
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- </configuration>
<dependencies>
<dependency>
Updated Upstream (Bukkit) (#5359) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c589f546 Use upstream plexus-compiler-eclipse
2021-03-15 03:35:51 +08:00
<groupId>org.codehaus.plexus</groupId>
@@ -164,6 +176,7 @@
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 15:34:45 +08:00
</excludes>
</filter>
</filters>
Re-add dependency reduced pom Learned the correct way to handle that file
2016-11-19 10:09:03 +08:00
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
Reference in New Issue Copy Permalink