Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
Extract Adventure Version into a variable, add reminder to update the linked JD on the homepage (#5422)
Dieser Commit ist enthalten in:
Ursprung
809466f2e7
Commit
b8020379c6
@ -7,10 +7,18 @@ Co-authored-by: zml <zml@stellardrift.ca>
|
||||
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e3744ee042e0426a513c4fdf4abedafe85e31cd2..75b2830340051deb0fa39149e80872d2b88ed6f0 100644
|
||||
index e3744ee042e0426a513c4fdf4abedafe85e31cd2..363c66f7ec247820bd8db7b05f861ed40c48f384 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -31,7 +31,39 @@
|
||||
@@ -22,6 +22,7 @@
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
+ <adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
|
||||
</properties>
|
||||
|
||||
<repositories>
|
||||
@@ -31,7 +32,39 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
@ -20,7 +28,7 @@ index e3744ee042e0426a513c4fdf4abedafe85e31cd2..75b2830340051deb0fa39149e80872d2
|
||||
+ <dependency>
|
||||
+ <groupId>net.kyori</groupId>
|
||||
+ <artifactId>adventure-bom</artifactId>
|
||||
+ <version>4.7.0</version> <!-- keep this version in synch with javadoc section below! -->
|
||||
+ <version>${adventure.version}</version>
|
||||
+ <type>pom</type>
|
||||
+ <scope>import</scope>
|
||||
+ </dependency>
|
||||
@ -50,15 +58,15 @@ index e3744ee042e0426a513c4fdf4abedafe85e31cd2..75b2830340051deb0fa39149e80872d2
|
||||
<dependency>
|
||||
<groupId>it.unimi.dsi</groupId>
|
||||
<artifactId>fastutil</artifactId>
|
||||
@@ -197,6 +229,12 @@
|
||||
@@ -197,6 +230,12 @@
|
||||
<link>https://javadoc.io/doc/org.yaml/snakeyaml/1.27/</link>
|
||||
<link>https://javadoc.io/doc/org.jetbrains/annotations-java5/20.1.0/</link>
|
||||
<link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
|
||||
+ <!-- Paper start -->
|
||||
+ <link>https://jd.adventure.kyori.net/api/4.7.0/</link>
|
||||
+ <link>https://jd.adventure.kyori.net/text-serializer-gson/4.7.0/</link>
|
||||
+ <link>https://jd.adventure.kyori.net/text-serializer-legacy/4.7.0/</link>
|
||||
+ <link>https://jd.adventure.kyori.net/text-serializer-plain/4.7.0/</link>
|
||||
+ <link>https://jd.adventure.kyori.net/api/${adventure.version}/</link>
|
||||
+ <link>https://jd.adventure.kyori.net/text-serializer-gson/${adventure.version}/</link>
|
||||
+ <link>https://jd.adventure.kyori.net/text-serializer-legacy/${adventure.version}/</link>
|
||||
+ <link>https://jd.adventure.kyori.net/text-serializer-plain/${adventure.version}/</link>
|
||||
+ <!-- Paper end -->
|
||||
</links>
|
||||
</configuration>
|
||||
@ -401,7 +409,7 @@ index 0000000000000000000000000000000000000000..13c5df5fb8ce1d0203d99e88dd691019
|
||||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/text/PaperComponents.java b/src/main/java/io/papermc/paper/text/PaperComponents.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..239f41e32dd94c75a8a549816465417bb4c63d71
|
||||
index 0000000000000000000000000000000000000000..77db592d05b754f879f8d1790642e9d9bbd30a4e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/text/PaperComponents.java
|
||||
@@ -0,0 +1,88 @@
|
||||
@ -1031,7 +1039,7 @@ index efb97712cc9dc7c1e12a59f5b94e4f2ad7c6b7d8..3024468af4c073324e536c1cb26beffb
|
||||
return warning == null || warning.value();
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 0fcf1dbb7b9cd2cfcb803b1a430d6131de87c92d..f9dea4ed6c57c88fa2f5b710440a35f4d310dd5f 100644
|
||||
index bc4417d8ffa92a78f690bfa5705d3e42cdc11fd2..d3519fa5b99e2888a194c6382415537785fbeef0 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
|
||||
Uses method handles for private or static methods.
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 75b2830340051deb0fa39149e80872d2b88ed6f0..c3d65e441f5c26b6c6b10f4924504d8f3837e674 100644
|
||||
index 363c66f7ec247820bd8db7b05f861ed40c48f384..88d42ef3b615eb93738faaf453db9e3b5dabc2c2 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -143,6 +143,17 @@
|
||||
@@ -144,6 +144,17 @@
|
||||
<version>9.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
|
||||
several layers of logging abstraction.
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 89918b5af7fbf42357e96dffb00b8a011a8ef13c..e1d1635889d68d1e17dc66f3a65545b44deffa69 100644
|
||||
index 88d42ef3b615eb93738faaf453db9e3b5dabc2c2..9d0b4f6224e055f4e1da87d5e70703798bef5fba 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -124,6 +124,13 @@
|
||||
@@ -125,6 +125,13 @@
|
||||
<version>20.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
@ -5,10 +5,10 @@ Subject: [PATCH] Better AnnotationTest printout
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index de6a5b697535b9532fee1521363432c76c233952..e66661eb84308dc13faa0d39b7487f40c1180443 100644
|
||||
index 9d0b4f6224e055f4e1da87d5e70703798bef5fba..c2e9ca1cc7f14d3a696385edc3cb341f902fa2fd 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -237,6 +237,19 @@
|
||||
@@ -238,6 +238,19 @@
|
||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren