Skip to content

Commit 4d22581

Browse files
MiniDiggerMiniDigger
committed
Move patches around
1 parent 73bcb74 commit 4d22581

File tree

1,895 files changed

+212111
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,895 files changed

+212111
-0
lines changed

‎build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ paperweight {
7474
serverProject.set(project(":Paper-Server"))
7575

7676
paper {
77+
spigotApiPatchDir.set(file("patches/api"))
78+
spigotServerPatchDir.set(file("patches/server"))
79+
7780
mappingsPatch.set(file("build-data/mappings-patch.tiny"))
7881

7982
additionalSpigotMemberMappings.set(file("build-data/additional-spigot-member-mappings.csrg"))

‎patches/api-unmapped/0001-POM-changes.patch

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Zach Brown <zach.brown@destroystokyo.com>
3+
Date: Tue, 1 Mar 2016 00:16:08 +0100
4+
Subject: [PATCH] POM changes
5+
6+
7+
diff --git a/pom.xml b/pom.xml
8+
index debe5bd7adb1f41e8a6878a8545de4bfcad1a590..d7cf64f05d0a2f5b186ca13b2b88e390abe84226 100644
9+
--- a/pom.xml
10+
+++ b/pom.xml
11+
@@ -2,33 +2,34 @@
12+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
13+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<modelVersion>4.0.0</modelVersion>
15+
+ <parent>
16+
+ <groupId>com.destroystokyo.paper</groupId>
17+
+ <artifactId>paper-parent</artifactId>
18+
+ <version>dev-SNAPSHOT</version>
19+
+ </parent>
20+
21+
- <groupId>org.spigotmc</groupId>
22+
- <artifactId>spigot-api</artifactId>
23+
+ <groupId>com.destroystokyo.paper</groupId>
24+
+ <artifactId>paper-api</artifactId>
25+
<version>1.17-R0.1-SNAPSHOT</version>
26+
<packaging>jar</packaging>
27+
28+
- <name>Spigot-API</name>
29+
- <url>https://www.spigotmc.org/</url>
30+
+ <name>Paper-API</name>
31+
+ <url>https://github.com/PaperMC/Paper</url>
32+
<description>An enhanced plugin API for Minecraft servers.</description>
33+
34+
<properties>
35+
- <skipTests>true</skipTests>
36+
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
37+
<maven.compiler.source>1.8</maven.compiler.source>
38+
<maven.compiler.target>1.8</maven.compiler.target>
39+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40+
</properties>
41+
42+
- <distributionManagement>
43+
+ <repositories>
44+
<repository>
45+
- <id>spigotmc-releases</id>
46+
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
47+
+ <id>sonatype</id>
48+
+ <url>https://oss.sonatype.org/content/groups/public/</url>
49+
</repository>
50+
- <snapshotRepository>
51+
- <id>spigotmc-snapshots</id>
52+
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
53+
- </snapshotRepository>
54+
- </distributionManagement>
55+
+ </repositories>
56+
57+
<dependencies>
58+
<dependency>
59+
@@ -37,6 +38,20 @@
60+
<version>2.6</version>
61+
<scope>compile</scope>
62+
</dependency>
63+
+ <!-- bundled with Minecraft, shouldn't ever change -->
64+
+ <dependency>
65+
+ <groupId>com.google.code.findbugs</groupId>
66+
+ <artifactId>jsr305</artifactId>
67+
+ <version>1.3.9</version>
68+
+ <scope>compile</scope>
69+
+ </dependency>
70+
+ <!-- used in previous versions of the API -->
71+
+ <dependency>
72+
+ <groupId>com.googlecode.json-simple</groupId>
73+
+ <artifactId>json-simple</artifactId>
74+
+ <version>1.1.1</version>
75+
+ <scope>compile</scope>
76+
+ </dependency>
77+
<!-- bundled with Minecraft, should be kept in sync -->
78+
<dependency>
79+
<groupId>com.google.guava</groupId>
80+
@@ -112,6 +127,7 @@
81+
</dependencies>
82+
83+
<build>
84+
+ <defaultGoal>clean install</defaultGoal>
85+
<plugins>
86+
<plugin>
87+
<groupId>net.md-5</groupId>
88+
@@ -130,10 +146,6 @@
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-compiler-plugin</artifactId>
91+
<version>3.8.1</version>
92+
- <configuration>
93+
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
94+
- <compilerId>eclipse</compilerId>
95+
- </configuration>
96+
<dependencies>
97+
<dependency>
98+
<groupId>org.codehaus.plexus</groupId>
99+
@@ -183,6 +195,7 @@
100+
</excludes>
101+
</filter>
102+
</filters>
103+
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
104+
<!-- when downloading via Maven we can pull depends individually -->
105+
<shadedArtifactAttached>true</shadedArtifactAttached>
106+
</configuration>

‎patches/api-unmapped/0002-Add-FastUtil-to-Bukkit.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Aikar <aikar@aikar.co>
3+
Date: Fri, 1 Apr 2016 00:02:47 -0400
4+
Subject: [PATCH] Add FastUtil to Bukkit
5+
6+
Doesn't expose to plugins, just allows Paper-API to use it for optimization
7+
8+
diff --git a/pom.xml b/pom.xml
9+
index 61b8ee4e3e122dd2671f50ea3b432e4abd4600a2..12306d830c6889c2c9b12699abebe0411262aef6 100644
10+
--- a/pom.xml
11+
+++ b/pom.xml
12+
@@ -32,6 +32,12 @@
13+
</repositories>
14+
15+
<dependencies>
16+
+ <dependency>
17+
+ <groupId>it.unimi.dsi</groupId>
18+
+ <artifactId>fastutil</artifactId>
19+
+ <version>8.2.2</version>
20+
+ <scope>provided</scope>
21+
+ </dependency>
22+
<dependency>
23+
<groupId>commons-lang</groupId>
24+
<artifactId>commons-lang</artifactId>

‎patches/api-unmapped/0003-Paper-Utils.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Aikar <aikar@aikar.co>
3+
Date: Sat, 23 Feb 2019 11:26:21 -0500
4+
Subject: [PATCH] Paper Utils
5+
6+
7+
diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
8+
new file mode 100644
9+
index 0000000000000000000000000000000000000000..9db0056ab94145819628b3ad8d8d26130d117fcf
10+
--- /dev/null
11+
+++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
12+
@@ -0,0 +1,16 @@
13+
+package com.destroystokyo.paper.util;
14+
+
15+
+import org.jetbrains.annotations.NotNull;
16+
+
17+
+public class SneakyThrow {
18+
+
19+
+ public static void sneaky(@NotNull Throwable exception) {
20+
+ SneakyThrow.<RuntimeException>throwSneaky(exception);
21+
+ }
22+
+
23+
+ @SuppressWarnings("unchecked")
24+
+ private static <T extends Throwable> void throwSneaky(@NotNull Throwable exception) throws T {
25+
+ throw (T) exception;
26+
+ }
27+
+
28+
+}

0 commit comments

Comments
 (0)