Skip to content

Commit bd8b6c7

Browse files
Joo200Joo200
committed
Rebased
1 parent 40e25d3 commit bd8b6c7

File tree

39 files changed

+426
-73
lines changed

39 files changed

+426
-73
lines changed

‎build-logic/src/main/kotlin/buildlogic.libs.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ configurations {
2525
group = "${rootProject.group}.worldedit-libs"
2626

2727
val relocations = mapOf(
28+
"net.kyori.adventure" to "com.sk89q.worldedit.util.adventure",
29+
"net.kyori.examination" to "com.sk89q.worldedit.util.examination",
30+
"net.kyori.option" to "com.sk89q.worldedit.util.option",
2831
"net.kyori.text" to "com.sk89q.worldedit.util.formatting.text",
2932
"net.kyori.minecraft" to "com.sk89q.worldedit.util.kyori",
3033
)

‎gradle/libs.versions.toml‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ sponge-spongegradle = "org.spongepowered.gradle.plugin:2.2.0"
55
sponge-vanillagradle = { id = "org.spongepowered.gradle.vanilla", version.ref = "sponge-vanillagradle" }
66

77
[versions]
8+
adventureText = "4.21.0-SNAPSHOT"
9+
adventureBukkit = "4.3.5-SNAPSHOT"
810
kyoriText = "3.0.4"
9-
piston = "0.5.10"
11+
piston = "0.6.0-SNAPSHOT"
12+
#piston = "0.5.10"
1013
autoValue = "1.10.4"
1114
antlr = "4.13.1"
1215

@@ -107,6 +110,30 @@ fastutil = "it.unimi.dsi:fastutil:8.5.15!!"
107110
# may not be the same as the ones in the latest Bukkit API.
108111
snakeyaml = "org.yaml:snakeyaml:2.0"
109112

113+
[libraries.adventureText-api]
114+
module = "net.kyori:adventure-api"
115+
version.ref = "adventureText"
116+
117+
[libraries.adventureText-serializer-gson]
118+
module = "net.kyori:adventure-text-serializer-gson"
119+
version.ref = "adventureText"
120+
121+
[libraries.adventureText-serializer-legacy]
122+
module = "net.kyori:adventure-text-serializer-legacy"
123+
version.ref = "adventureText"
124+
125+
[libraries.adventureText-serializer-plain]
126+
module = "net.kyori:adventure-text-serializer-plain"
127+
version.ref = "adventureText"
128+
129+
[libraries.adventureText-serializer-ansi]
130+
module = "net.kyori:adventure-text-serializer-ansi"
131+
version.ref = "adventureText"
132+
133+
[libraries.adventureText-adapter-bukkit]
134+
module = "net.kyori:adventure-platform-bukkit"
135+
version.ref = "adventureBukkit"
136+
110137
[libraries.kyoriText-api]
111138
module = "net.kyori:text-api"
112139
version.ref = "kyoriText"

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ listOf("1.21.3", "1.21.4", "1.21.5").forEach {
7575
include("worldedit-bukkit:adapters:adapter-$it")
7676
}
7777

78-
listOf("bukkit", "core", "fabric", "neoforge", "sponge", "cli").forEach {
78+
listOf("bukkit", "core", "fabric", "neoforge", "sponge").forEach {
7979
include("worldedit-libs:$it")
8080
include("worldedit-$it")
8181
}

‎verification/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tasks.check {
2828
// Generic setup for all tasks
2929
// Pull the version before our current version.
3030
val baseVersion = "(,${rootProject.version.toString().substringBefore("-SNAPSHOT")}["
31-
for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "neoforge", "sponge")) {
31+
for (projectFragment in listOf("bukkit", "core", "fabric", "neoforge", "sponge")) {
3232
val capitalizedFragment =
3333
projectFragment.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }
3434
val proj = project(":worldedit-$projectFragment")

‎verification/src/changes/accepted-bukkit-public-api-changes.json‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,98 @@
2121
"METHOD_REMOVED"
2222
]
2323
}
24+
],
25+
"Moved to super class": [
26+
{
27+
"type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
28+
"member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.print(java.lang.String)",
29+
"changes": [
30+
"METHOD_REMOVED"
31+
]
32+
},
33+
{
34+
"type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
35+
"member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
36+
"changes": [
37+
"METHOD_REMOVED"
38+
]
39+
},
40+
{
41+
"type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
42+
"member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.printDebug(java.lang.String)",
43+
"changes": [
44+
"METHOD_REMOVED"
45+
]
46+
},
47+
{
48+
"type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
49+
"member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.printError(java.lang.String)",
50+
"changes": [
51+
"METHOD_REMOVED"
52+
]
53+
},
54+
{
55+
"type": "com.sk89q.worldedit.bukkit.BukkitBlockRegistry",
56+
"member": "Method com.sk89q.worldedit.bukkit.BukkitBlockRegistry.getRichName(com.sk89q.worldedit.world.block.BlockType)",
57+
"changes": [
58+
"METHOD_REMOVED"
59+
]
60+
},
61+
{
62+
"type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
63+
"member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.print(java.lang.String)",
64+
"changes": [
65+
"METHOD_REMOVED"
66+
]
67+
},
68+
{
69+
"type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
70+
"member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
71+
"changes": [
72+
"METHOD_REMOVED"
73+
]
74+
},
75+
{
76+
"type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
77+
"member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.printDebug(java.lang.String)",
78+
"changes": [
79+
"METHOD_REMOVED"
80+
]
81+
},
82+
{
83+
"type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
84+
"member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.printError(java.lang.String)",
85+
"changes": [
86+
"METHOD_REMOVED"
87+
]
88+
},
89+
{
90+
"type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
91+
"member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.print(java.lang.String)",
92+
"changes": [
93+
"METHOD_REMOVED"
94+
]
95+
},
96+
{
97+
"type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
98+
"member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.print(com.sk89q.worldedit.util.formatting.text.Component)",
99+
"changes": [
100+
"METHOD_REMOVED"
101+
]
102+
},
103+
{
104+
"type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
105+
"member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.printDebug(java.lang.String)",
106+
"changes": [
107+
"METHOD_REMOVED"
108+
]
109+
},
110+
{
111+
"type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
112+
"member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.printError(java.lang.String)",
113+
"changes": [
114+
"METHOD_REMOVED"
115+
]
116+
}
24117
]
25118
}

‎verification/src/changes/accepted-core-public-api-changes.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,58 @@
7979
"METHOD_NEW_DEFAULT"
8080
]
8181
}
82+
],
83+
"Moved to super class": [
84+
{
85+
"type": "com.sk89q.worldedit.extension.platform.Actor",
86+
"member": "Method com.sk89q.worldedit.extension.platform.Actor.print(java.lang.String)",
87+
"changes": [
88+
"METHOD_ABSTRACT_NOW_DEFAULT"
89+
]
90+
},
91+
{
92+
"type": "com.sk89q.worldedit.extension.platform.Actor",
93+
"member": "Method com.sk89q.worldedit.extension.platform.Actor.printDebug(java.lang.String)",
94+
"changes": [
95+
"METHOD_ABSTRACT_NOW_DEFAULT"
96+
]
97+
},
98+
{
99+
"type": "com.sk89q.worldedit.extension.platform.Actor",
100+
"member": "Method com.sk89q.worldedit.extension.platform.Actor.printError(java.lang.String)",
101+
"changes": [
102+
"METHOD_ABSTRACT_NOW_DEFAULT"
103+
]
104+
}
105+
],
106+
"New API": [
107+
{
108+
"type": "com.sk89q.worldedit.extension.platform.Actor",
109+
"member": "Method com.sk89q.worldedit.extension.platform.Actor.printDebug(com.sk89q.worldedit.util.adventure.text.Component)",
110+
"changes": [
111+
"METHOD_NEW_DEFAULT"
112+
]
113+
},
114+
{
115+
"type": "com.sk89q.worldedit.extension.platform.Actor",
116+
"member": "Method com.sk89q.worldedit.extension.platform.Actor.printError(com.sk89q.worldedit.util.adventure.text.Component)",
117+
"changes": [
118+
"METHOD_NEW_DEFAULT"
119+
]
120+
},
121+
{
122+
"type": "com.sk89q.worldedit.extension.platform.Actor",
123+
"member": "Method com.sk89q.worldedit.extension.platform.Actor.printInfo(com.sk89q.worldedit.util.adventure.text.Component)",
124+
"changes": [
125+
"METHOD_NEW_DEFAULT"
126+
]
127+
},
128+
{
129+
"type": "com.sk89q.worldedit.world.registry.ItemRegistry",
130+
"member": "Method com.sk89q.worldedit.world.registry.ItemRegistry.getDisplayName(com.sk89q.worldedit.blocks.BaseItemStack)",
131+
"changes": [
132+
"METHOD_NEW_DEFAULT"
133+
]
134+
}
82135
]
83136
}

‎worldedit-bukkit/adapters/adapter-1.21.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightAdapter.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import com.sk89q.worldedit.util.Direction;
5252
import com.sk89q.worldedit.util.SideEffect;
5353
import com.sk89q.worldedit.util.adventure.text.Component;
54+
import com.sk89q.worldedit.util.adventure.text.serializer.gson.GsonComponentSerializer;
5455
import com.sk89q.worldedit.util.concurrency.LazyReference;
5556
import com.sk89q.worldedit.util.io.file.SafeFiles;
5657
import com.sk89q.worldedit.world.DataFixer;
@@ -544,7 +545,12 @@ public Component getRichItemName(ItemType itemType) {
544545

545546
@Override
546547
public Component getRichItemName(BaseItemStack itemStack) {
547-
return Component.translatable(CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getDescriptionId());
548+
return GsonComponentSerializer.gson().deserialize(
549+
net.minecraft.network.chat.Component.Serializer.toJson(
550+
CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getItemName(),
551+
((CraftServer) Bukkit.getServer()).getServer().registryAccess()
552+
)
553+
);
548554
}
549555

550556
@SuppressWarnings({ "unchecked", "rawtypes" })

‎worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import com.sk89q.worldedit.util.Direction;
5353
import com.sk89q.worldedit.util.SideEffect;
5454
import com.sk89q.worldedit.util.adventure.text.Component;
55+
import com.sk89q.worldedit.util.adventure.text.serializer.gson.GsonComponentSerializer;
5556
import com.sk89q.worldedit.util.concurrency.LazyReference;
5657
import com.sk89q.worldedit.util.io.file.SafeFiles;
5758
import com.sk89q.worldedit.world.DataFixer;
@@ -544,7 +545,12 @@ public Component getRichItemName(ItemType itemType) {
544545

545546
@Override
546547
public Component getRichItemName(BaseItemStack itemStack) {
547-
return Component.translatable(CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getDescriptionId());
548+
return GsonComponentSerializer.gson().deserialize(
549+
net.minecraft.network.chat.Component.Serializer.toJson(
550+
CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getItemName(),
551+
((CraftServer) Bukkit.getServer()).getServer().registryAccess()
552+
)
553+
);
548554
}
549555

550556
@SuppressWarnings({ "unchecked", "rawtypes" })

‎worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import com.sk89q.worldedit.util.Direction;
5353
import com.sk89q.worldedit.util.SideEffect;
5454
import com.sk89q.worldedit.util.adventure.text.Component;
55+
import com.sk89q.worldedit.util.adventure.text.serializer.gson.GsonComponentSerializer;
5556
import com.sk89q.worldedit.util.concurrency.LazyReference;
5657
import com.sk89q.worldedit.util.io.file.SafeFiles;
5758
import com.sk89q.worldedit.world.DataFixer;
@@ -542,7 +543,12 @@ public Component getRichItemName(ItemType itemType) {
542543

543544
@Override
544545
public Component getRichItemName(BaseItemStack itemStack) {
545-
return Component.translatable(CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getDescriptionId());
546+
return GsonComponentSerializer.gson().deserialize(
547+
net.minecraft.network.chat.Component.Serializer.toJson(
548+
CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getItemName(),
549+
((CraftServer) Bukkit.getServer()).getServer().registryAccess()
550+
)
551+
);
546552
}
547553

548554
@SuppressWarnings({ "unchecked", "rawtypes" })

‎worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import com.sk89q.worldedit.util.adventure.text.Component;
3535
import com.sk89q.worldedit.util.adventure.text.event.ClickEvent;
3636
import com.sk89q.worldedit.util.adventure.text.format.NamedTextColor;
37+
import com.sk89q.worldedit.util.adventure.text.serializer.gson.GsonComponentSerializer;
3738
import com.sk89q.worldedit.util.formatting.WorldEditText;
3839
import com.sk89q.worldedit.util.formatting.component.TextUtils;
3940
import com.sk89q.worldedit.world.World;

0 commit comments

Comments
 (0)