Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 02:10:30 +01:00
Code Issues Projects Releases Wiki Activity
693102cce7
Paper/Spigot-API-Patches/0001-POM-changes.patch

117 lines
4.4 KiB
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2019-06-14 04:27:40 +02:00
From 4110bb0715fb2cd59da12c0b29d17b6d92065689 Mon Sep 17 00:00:00 2001
Paper 1.9
2016-03-01 00:09:49 +01:00
From: Zach Brown <zach.brown@destroystokyo.com>
Update to 1.12.1
2017-08-03 16:36:06 +02: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-21 22:46:54 +02:00
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
Update to 1.14.2
2019-05-28 01:01:45 +02:00
index 5ddf33938..2a2abac96 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-21 22:46:54 +02:00
--- a/pom.xml
+++ b/pom.xml
MC 1.14.1
2019-05-14 04:20:58 +02:00
@@ -2,34 +2,29 @@
<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 00:36:47 +02: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 08:10:11 +01:00
<modelVersion>4.0.0</modelVersion>
Update B/CB/S
2017-08-06 00:36:47 +02:00
+ <parent>
Paper 1.9
2016-03-01 00:09:49 +01:00
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
update upstream
2016-04-24 04:41:46 +02:00
+ <version>dev-SNAPSHOT</version>
Update B/CB/S
2017-08-06 00:36:47 +02:00
+ </parent>
MC 1.14.1
2019-05-14 04:20:58 +02:00
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
Initial work on 1.14 pre-5
2019-04-23 06:47:07 +02:00
+ <groupId>com.destroystokyo.paper</groupId>
Paper 1.9
2016-03-01 00:09:49 +01:00
+ <artifactId>paper-api</artifactId>
Update to 1.14.2
2019-05-28 01:01:45 +02:00
<version>1.14.2-R0.1-SNAPSHOT</version>
Rebuild patches for upstream changes
2015-01-07 05:13:40 +01: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-21 22:46:54 +02:00
- <name>Spigot-API</name>
Update B/CB/S
2017-08-06 00:36:47 +02:00
- <url>https://www.spigotmc.org/</url>
Paper 1.9
2016-03-01 00:09:49 +01:00
+ <name>Paper-API</name>
@Zbob750 missed a few name changes
2016-09-04 08:26:05 +02:00
+ <url>https://github.com/PaperMC/Paper</url>
Rebuild patches for upstream changes
2015-01-07 05:13:40 +01: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-21 22:46:54 +02: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-04 20:19:36 +01:00
- <skipTests>true</skipTests>
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
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 03:53:17 +02:00
+ <!-- Paper - #Logic -->
Update Upstream
2019-05-06 04:58:04 +02: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 03:53:17 +02:00
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Squash Java 8 patches into pom changes patches
2016-01-29 09:51:53 +01:00
Fix up maven stuff hopefully
2018-09-22 18:58:09 +02:00
- <distributionManagement>
- <repository>
Proper maven repo details
2016-02-21 11:12:03 +01:00
- <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
Fix up maven stuff hopefully
2018-09-22 18:58:09 +02:00
- </repository>
- <snapshotRepository>
Proper maven repo details
2016-02-21 11:12:03 +01:00
- <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
Fix up maven stuff hopefully
2018-09-22 18:58:09 +02:00
- </snapshotRepository>
- </distributionManagement>
-
<repositories>
Updated Upstream (Bukkit/CraftBukkit) 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: d58803c2 SPIGOT-4597: Make BlockDropItemEvent use a list d450fdf1 Add note about Maven repository usage to pom.xml CraftBukkit Changes: ed274c51 SPIGOT-4597: Make BlockDropItemEvent use a list 1734f378 SPIGOT-4598: Shift click on custom workbench inventory causes crash a65b73ad Add note about Maven repository usage to pom.xml
2019-01-30 14:26:12 +01:00
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
MC 1.14.1
2019-05-14 04:20:58 +02:00
@@ -41,6 +36,10 @@
Update to 1.12.1
2017-08-03 16:36:06 +02:00
<id>spigotmc-public</id>
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 03:44:35 +02:00
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
Update to 1.12.1
2017-08-03 16:36:06 +02:00
+ <repository>
Add repo to handle the bungee-cord chat dependency
2016-06-23 07:32:41 +02:00
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
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 03:44:35 +02:00
</repositories>
<pluginRepositories>
MC 1.14.1
2019-05-14 04:20:58 +02:00
@@ -57,6 +56,20 @@
Initial work on 1.14 pre-5
2019-04-23 06:47:07 +02:00
<version>2.6</version>
Add javax.annotations to the API Used this set specifically because they are present in NMS already.
2016-09-16 21:38:52 +02:00
<scope>compile</scope>
</dependency>
t
2016-11-03 20:28:58 +01: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-16 21:38:52 +02:00
+ <dependency>
Move nullable annotation dependency to JSR
2016-11-03 20:25:50 +01:00
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
MC uses JSR 1.3.9
2016-11-03 20:51:00 +01: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-16 21:38:52 +02:00
+ <scope>compile</scope>
Initial work on 1.14 pre-5
2019-04-23 06:47:07 +02: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-16 21:38:52 +02:00
+ </dependency>
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
MC 1.14.1
2019-05-14 04:20:58 +02:00
@@ -113,15 +126,12 @@
set default goals on all pom poms </cheer>
2016-03-18 07:13:51 +01:00
</dependencies>
<build>
+ <defaultGoal>clean install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Move eclipse compiler patch to POM changes patch Also update to Paperclip 1.1-SNAPSHOT
2017-09-23 20:17:20 +02:00
<artifactId>maven-compiler-plugin</artifactId>
Updated Upstream (Bukkit/CraftBukkit) 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: d38ac1be Update compiler 2844ce20 Add CookTimeTotal API to Furnace CraftBukkit Changes: 13f71402 Update compiler 61c762f4 Add CookTimeTotal API to Furnace
2019-01-24 22:36:24 +01:00
<version>3.8.0</version>
Move eclipse compiler patch to POM changes patch Also update to Paperclip 1.1-SNAPSHOT
2017-09-23 20:17:20 +02:00
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- </configuration>
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
MC 1.14.1
2019-05-14 04:20:58 +02:00
@@ -156,6 +166,7 @@
Re-add dependency reduced pom Learned the correct way to handle that file
2016-11-19 03:09:03 +01:00
</execution>
</executions>
<configuration>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
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-21 22:46:54 +02:00
--
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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 01:28:15 +01:00
2.21.0
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-21 22:46:54 +02:00
Reference in New Issue Copy Permalink