chore: cleanup annotations in api adventure patch
This commit is contained in:
parent
92f872c146
commit
9087a644a3
67 changed files with 1427 additions and 1365 deletions
|
@ -1,5 +1,5 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Riley Park <riley.park@meino.net>
|
||||
From: Riley Park <rileysebastianpark@gmail.com>
|
||||
Date: Fri, 29 Jan 2021 17:54:03 +0100
|
||||
Subject: [PATCH] Adventure
|
||||
|
||||
|
@ -2322,13 +2322,14 @@ index 000fd11480d783eab80a93fedde48f66e6b1298b..b3b6121dcfb6451d177431d51fa8a3e0
|
|||
- @Deprecated
|
||||
- public void disconnect(Component reason) {
|
||||
- this.disconnect(CraftChatMessage.fromComponent(reason));
|
||||
+ public void disconnect(String s) {
|
||||
- }
|
||||
- // CraftBukkit end
|
||||
-
|
||||
public void disconnect(String s) {
|
||||
+ // Paper start
|
||||
+ this.disconnect(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(s));
|
||||
}
|
||||
- // CraftBukkit end
|
||||
|
||||
- public void disconnect(String s) {
|
||||
+ }
|
||||
+
|
||||
+ public void disconnect(final Component reason) {
|
||||
+ this.disconnect(PaperAdventure.asAdventure(reason));
|
||||
+ }
|
||||
|
@ -2809,13 +2810,13 @@ index 059ba63319f6ca04750a7d6b095e6179cae68b4f..cb2dc6db887856c5f60d127f5999a078
|
|||
}
|
||||
|
||||
+ // Paper start
|
||||
+ @Override
|
||||
@Override
|
||||
+ public net.kyori.adventure.text.Component shutdownMessage() {
|
||||
+ String msg = getShutdownMessage();
|
||||
+ return msg != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(msg) : null;
|
||||
+ }
|
||||
+ // Paper end
|
||||
@Override
|
||||
+ @Override
|
||||
+ @Deprecated // Paper
|
||||
public String getShutdownMessage() {
|
||||
return this.configuration.getString("settings.shutdown-message");
|
||||
|
@ -2892,12 +2893,12 @@ index 059ba63319f6ca04750a7d6b095e6179cae68b4f..cb2dc6db887856c5f60d127f5999a078
|
|||
}
|
||||
|
||||
+ // Paper start
|
||||
+ @Override
|
||||
@Override
|
||||
+ public Merchant createMerchant(net.kyori.adventure.text.Component title) {
|
||||
+ return new org.bukkit.craftbukkit.inventory.CraftMerchantCustom(title == null ? InventoryType.MERCHANT.defaultTitle() : title);
|
||||
+ }
|
||||
+ // Paper end
|
||||
@Override
|
||||
+ @Override
|
||||
+ @Deprecated // Paper
|
||||
public Merchant createMerchant(String title) {
|
||||
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
|
||||
|
@ -2963,7 +2964,7 @@ index 3b9e42adb657d0feb99de4b55dc0c628e9cd5afd..253f965e52cd488af88d55cdd09f1bad
|
|||
// Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 7fc066ee281662192aad826840573e4181f5ceff..6569c9db3fa026ee4fbfaceac0e4f6a15c1fbe16 100644
|
||||
index fe726771b76cabcb58bf624969490d9595965082..e16a458a708080ff5321362cba440fa465dba7d6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -20,6 +20,12 @@ public class Main {
|
||||
|
@ -3949,7 +3950,7 @@ index b7f54a7d90a2a34e641f152eb8f5c3c62033e511..2d04443a9efd6e4b5eb1e360a727d849
|
|||
@Override
|
||||
public int getLineWidth() {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index f9499aa8fc5443b54617c8e84011af5d0325bd45..2c3518ea974be5fce424093e9b710c853fd52a7a 100644
|
||||
index 5e02ea662a1307b2718811bab98ed0d6d17edd87..54a9a630ca1aa3cabc9aa29ba7d9e516c0f88a00 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -820,9 +820,9 @@ public class CraftEventFactory {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue