|
|
|
|
@@ -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;
|
|
|
|
|
|