From 3c9a7edfa185d228d1024274f5db4de353c8449c Mon Sep 17 00:00:00 2001 From: l4zs Date: Sat, 19 Mar 2022 16:12:00 +0100 Subject: [PATCH] update to 1.18.2 --- build.gradle.kts | 6 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/net/axay/kspigot/chat/KColors.java | 302 +++++++++--------- .../commands/internal/BrigardierSupport.kt | 4 +- .../net/axay/kspigot/data/NBTDataLoader.kt | 6 +- .../extensions/bukkit/ColorExtensions.kt | 52 ++- .../bukkit/ConsoleSenderExtensions.kt | 20 +- .../extensions/bukkit/EntityExtensions.kt | 2 +- .../net/axay/kspigot/items/ItemStackUtils.kt | 15 +- .../net/axay/kspigot/structures/Structure.kt | 3 +- 10 files changed, 203 insertions(+), 209 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3aea4d80..9597a6cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile val githubRepo = "jakobkmar/KSpigot" group = "net.axay" -version = "1.18.1" +version = "1.18.2" description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain" @@ -17,7 +17,7 @@ plugins { id("org.jetbrains.dokka") version "1.6.10" kotlin("plugin.serialization") version "1.6.10" - id("io.papermc.paperweight.userdev") version "1.3.3" + id("io.papermc.paperweight.userdev") version "1.3.5" } repositories { @@ -25,7 +25,7 @@ repositories { } dependencies { - paperDevBundle("1.18.1-R0.1-SNAPSHOT") + paperDevBundle("1.18.2-R0.1-SNAPSHOT") api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85f..00e33ede 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/net/axay/kspigot/chat/KColors.java b/src/main/java/net/axay/kspigot/chat/KColors.java index b5c00b6b..6112961f 100644 --- a/src/main/java/net/axay/kspigot/chat/KColors.java +++ b/src/main/java/net/axay/kspigot/chat/KColors.java @@ -1,17 +1,15 @@ package net.axay.kspigot.chat; -import net.md_5.bungee.api.ChatColor; - -import java.awt.*; +import net.kyori.adventure.text.format.TextColor; +import net.kyori.adventure.text.format.TextDecoration; @SuppressWarnings("unused") public class KColors { - public static final ChatColor MAGIC = ChatColor.MAGIC; - public static final ChatColor BOLD = ChatColor.BOLD; - public static final ChatColor STRIKETHROUGH = ChatColor.STRIKETHROUGH; - public static final ChatColor UNDERLINE = ChatColor.UNDERLINE; - public static final ChatColor ITALIC = ChatColor.ITALIC; - public static final ChatColor RESET = ChatColor.RESET; + public static final TextDecoration MAGIC = TextDecoration.OBFUSCATED; + public static final TextDecoration BOLD = TextDecoration.BOLD; + public static final TextDecoration STRIKETHROUGH = TextDecoration.STRIKETHROUGH; + public static final TextDecoration UNDERLINE = TextDecoration.UNDERLINED; + public static final TextDecoration ITALIC = TextDecoration.ITALIC; // DEFAULT COLORS @@ -19,77 +17,77 @@ public class KColors { * #0000AA *
*/ - public static final ChatColor DARKBLUE = ChatColor.DARK_BLUE; + public static final TextColor DARKBLUE = TextColor.color(0, 0, 170); /** * #00AA00 *
*/ - public static final ChatColor DARKGREEN = ChatColor.DARK_GREEN; + public static final TextColor DARKGREEN = TextColor.color(0, 170, 0); /** * #00AAAA *
*/ - public static final ChatColor DARKAQUA = ChatColor.DARK_AQUA; + public static final TextColor DARKAQUA = TextColor.color(0, 170, 170); /** * #AA0000 *
*/ - public static final ChatColor DARKRED = ChatColor.DARK_RED; + public static final TextColor DARKRED = TextColor.color(170, 0, 0); /** * #AA00AA *
*/ - public static final ChatColor DARKPURPLE = ChatColor.DARK_PURPLE; + public static final TextColor DARKPURPLE = TextColor.color(170, 0, 170); /** * #FFAA00 *
*/ - public static final ChatColor GOLD = ChatColor.GOLD; + public static final TextColor GOLD = TextColor.color(255, 170, 0); /** * #AAAAAA *
*/ - public static final ChatColor GRAY = ChatColor.GRAY; + public static final TextColor GRAY = TextColor.color(170, 170, 170); /** * #555555 *
*/ - public static final ChatColor DARKGRAY = ChatColor.DARK_GRAY; + public static final TextColor DARKGRAY = TextColor.color(85, 85, 85); /** * #5555FF *
*/ - public static final ChatColor BLUE = ChatColor.BLUE; + public static final TextColor BLUE = TextColor.color(85, 85, 255); /** * #55FF55 *
*/ - public static final ChatColor GREEN = ChatColor.GREEN; + public static final TextColor GREEN = TextColor.color(85, 255, 85); /** * #55FFFF *
*/ - public static final ChatColor AQUA = ChatColor.AQUA; + public static final TextColor AQUA = TextColor.color(85, 255, 255); /** * #FF5555 *
*/ - public static final ChatColor RED = ChatColor.RED; + public static final TextColor RED = TextColor.color(255, 85, 85); /** * #FF55FF *
*/ - public static final ChatColor LIGHTPURPLE = ChatColor.LIGHT_PURPLE; + public static final TextColor LIGHTPURPLE = TextColor.color(255, 85, 255); /** * #FFFF55 *
*/ - public static final ChatColor YELLOW = ChatColor.YELLOW; + public static final TextColor YELLOW = TextColor.color(255, 255, 85); /** * #FFFFFF *
*/ - public static final ChatColor WHITE = ChatColor.WHITE; + public static final TextColor WHITE = TextColor.color(255, 255, 255); // ADDITIONAL COLORS @@ -97,640 +95,640 @@ public class KColors { * #F0F8FF *
*/ - public static final ChatColor ALICEBLUE = ChatColor.of(new Color(0.9411765f, 0.972549f, 1.0f)); + public static final TextColor ALICEBLUE = TextColor.color(240, 248, 255); /** * #FAEBD7 *
*/ - public static final ChatColor ANTIQUEWHITE = ChatColor.of(new Color(0.98039216f, 0.92156863f, 0.84313726f)); + public static final TextColor ANTIQUEWHITE = TextColor.color(250, 235, 215); /** * #7FFFD4 *
*/ - public static final ChatColor AQUAMARINE = ChatColor.of(new Color(0.49803922f, 1.0f, 0.83137256f)); + public static final TextColor AQUAMARINE = TextColor.color(127, 255, 212); /** * #F0FFFF *
*/ - public static final ChatColor AZURE = ChatColor.of(new Color(0.9411765f, 1.0f, 1.0f)); + public static final TextColor AZURE = TextColor.color(240, 255, 255); /** * #F5F5DC *
*/ - public static final ChatColor BEIGE = ChatColor.of(new Color(0.9607843f, 0.9607843f, 0.8627451f)); + public static final TextColor BEIGE = TextColor.color(245, 245, 220); /** * #FFE4C4 *
*/ - public static final ChatColor BISQUE = ChatColor.of(new Color(1.0f, 0.89411765f, 0.76862746f)); + public static final TextColor BISQUE = TextColor.color(255, 228, 196); /** * #000000 *
*/ - public static final ChatColor BLACK = ChatColor.of(new Color(0.0f, 0.0f, 0.0f)); + public static final TextColor BLACK = TextColor.color(0, 0, 0); /** * #FFEBCD *
*/ - public static final ChatColor BLANCHEDALMOND = ChatColor.of(new Color(1.0f, 0.92156863f, 0.8039216f)); + public static final TextColor BLANCHEDALMOND = TextColor.color(255, 235, 205); /** * #8A2BE2 *
*/ - public static final ChatColor BLUEVIOLET = ChatColor.of(new Color(0.5411765f, 0.16862746f, 0.8862745f)); + public static final TextColor BLUEVIOLET = TextColor.color(138, 43, 226); /** * #A52A2A *
*/ - public static final ChatColor BROWN = ChatColor.of(new Color(0.64705884f, 0.16470589f, 0.16470589f)); + public static final TextColor BROWN = TextColor.color(165, 42, 42); /** * #DEB887 *
*/ - public static final ChatColor BURLYWOOD = ChatColor.of(new Color(0.87058824f, 0.72156864f, 0.5294118f)); + public static final TextColor BURLYWOOD = TextColor.color(222, 184, 135); /** * #5F9EA0 *
*/ - public static final ChatColor CADETBLUE = ChatColor.of(new Color(0.37254903f, 0.61960787f, 0.627451f)); + public static final TextColor CADETBLUE = TextColor.color(95, 158, 160); /** * #7FFF00 *
*/ - public static final ChatColor CHARTREUSE = ChatColor.of(new Color(0.49803922f, 1.0f, 0.0f)); + public static final TextColor CHARTREUSE = TextColor.color(127, 255, 0); /** * #D2691E *
*/ - public static final ChatColor CHOCOLATE = ChatColor.of(new Color(0.8235294f, 0.4117647f, 0.11764706f)); + public static final TextColor CHOCOLATE = TextColor.color(210, 105, 30); /** * #FF7F50 *
*/ - public static final ChatColor CORAL = ChatColor.of(new Color(1.0f, 0.49803922f, 0.3137255f)); + public static final TextColor CORAL = TextColor.color(255, 127, 80); /** * #6495ED *
*/ - public static final ChatColor CORNFLOWERBLUE = ChatColor.of(new Color(0.39215687f, 0.58431375f, 0.92941177f)); + public static final TextColor CORNFLOWERBLUE = TextColor.color(100, 149, 237); /** * #FFF8DC *
*/ - public static final ChatColor CORNSILK = ChatColor.of(new Color(1.0f, 0.972549f, 0.8627451f)); + public static final TextColor CORNSILK = TextColor.color(255, 248, 220); /** * #DC143C *
*/ - public static final ChatColor CRIMSON = ChatColor.of(new Color(0.8627451f, 0.078431375f, 0.23529412f)); + public static final TextColor CRIMSON = TextColor.color(220, 20, 60); /** * #00FFFF *
*/ - public static final ChatColor CYAN = ChatColor.of(new Color(0.0f, 1.0f, 1.0f)); + public static final TextColor CYAN = TextColor.color(0, 255, 255); /** * #008B8B *
*/ - public static final ChatColor DARKCYAN = ChatColor.of(new Color(0.0f, 0.54509807f, 0.54509807f)); + public static final TextColor DARKCYAN = TextColor.color(0, 139, 139); /** * #B8860B *
*/ - public static final ChatColor DARKGOLDENROD = ChatColor.of(new Color(0.72156864f, 0.5254902f, 0.043137256f)); + public static final TextColor DARKGOLDENROD = TextColor.color(184, 134, 11); /** * #BDB76B *
*/ - public static final ChatColor DARKKHAKI = ChatColor.of(new Color(0.7411765f, 0.7176471f, 0.41960785f)); + public static final TextColor DARKKHAKI = TextColor.color(189, 183, 107); /** * #8B008B *
*/ - public static final ChatColor DARKMAGENTA = ChatColor.of(new Color(0.54509807f, 0.0f, 0.54509807f)); + public static final TextColor DARKMAGENTA = TextColor.color(139, 0, 139); /** * #556B2F *
*/ - public static final ChatColor DARKOLIVEGREEN = ChatColor.of(new Color(0.33333334f, 0.41960785f, 0.18431373f)); + public static final TextColor DARKOLIVEGREEN = TextColor.color(85, 107, 47); /** * #FF8C00 *
*/ - public static final ChatColor DARKORANGE = ChatColor.of(new Color(1.0f, 0.54901963f, 0.0f)); + public static final TextColor DARKORANGE = TextColor.color(255, 140, 0); /** * #9932CC *
*/ - public static final ChatColor DARKORCHID = ChatColor.of(new Color(0.6f, 0.19607843f, 0.8f)); + public static final TextColor DARKORCHID = TextColor.color(153, 50, 204); /** * #E9967A *
*/ - public static final ChatColor DARKSALMON = ChatColor.of(new Color(0.9137255f, 0.5882353f, 0.47843137f)); + public static final TextColor DARKSALMON = TextColor.color(233, 150, 122); /** * #8FBC8F *
*/ - public static final ChatColor DARKSEAGREEN = ChatColor.of(new Color(0.56078434f, 0.7372549f, 0.56078434f)); + public static final TextColor DARKSEAGREEN = TextColor.color(143, 188, 143); /** * #483D8B *
*/ - public static final ChatColor DARKSLATEBLUE = ChatColor.of(new Color(0.28235295f, 0.23921569f, 0.54509807f)); + public static final TextColor DARKSLATEBLUE = TextColor.color(72, 61, 139); /** * #2F4F4F *
*/ - public static final ChatColor DARKSLATEGRAY = ChatColor.of(new Color(0.18431373f, 0.30980393f, 0.30980393f)); + public static final TextColor DARKSLATEGRAY = TextColor.color(47, 79, 79); /** * #00CED1 *
*/ - public static final ChatColor DARKTURQUOISE = ChatColor.of(new Color(0.0f, 0.80784315f, 0.81960785f)); + public static final TextColor DARKTURQUOISE = TextColor.color(0, 206, 209); /** * #9400D3 *
*/ - public static final ChatColor DARKVIOLET = ChatColor.of(new Color(0.5803922f, 0.0f, 0.827451f)); + public static final TextColor DARKVIOLET = TextColor.color(148, 0, 211); /** * #FF1493 *
*/ - public static final ChatColor DEEPPINK = ChatColor.of(new Color(1.0f, 0.078431375f, 0.5764706f)); + public static final TextColor DEEPPINK = TextColor.color(255, 20, 147); /** * #00BFFF *
*/ - public static final ChatColor DEEPSKYBLUE = ChatColor.of(new Color(0.0f, 0.7490196f, 1.0f)); + public static final TextColor DEEPSKYBLUE = TextColor.color(0, 191, 255); /** * #696969 *
*/ - public static final ChatColor DIMGRAY = ChatColor.of(new Color(0.4117647f, 0.4117647f, 0.4117647f)); + public static final TextColor DIMGRAY = TextColor.color(105, 105, 105); /** * #1E90FF *
*/ - public static final ChatColor DODGERBLUE = ChatColor.of(new Color(0.11764706f, 0.5647059f, 1.0f)); + public static final TextColor DODGERBLUE = TextColor.color(30, 144, 255); /** * #B22222 *
*/ - public static final ChatColor FIREBRICK = ChatColor.of(new Color(0.69803923f, 0.13333334f, 0.13333334f)); + public static final TextColor FIREBRICK = TextColor.color(178, 34, 34); /** * #FFFAF0 *
*/ - public static final ChatColor FLORALWHITE = ChatColor.of(new Color(1.0f, 0.98039216f, 0.9411765f)); + public static final TextColor FLORALWHITE = TextColor.color(255, 250, 240); /** * #228B22 *
*/ - public static final ChatColor FORESTGREEN = ChatColor.of(new Color(0.13333334f, 0.54509807f, 0.13333334f)); + public static final TextColor FORESTGREEN = TextColor.color(34, 139, 34); /** * #FF00FF *
*/ - public static final ChatColor FUCHSIA = ChatColor.of(new Color(1.0f, 0.0f, 1.0f)); + public static final TextColor FUCHSIA = TextColor.color(255, 0, 255); /** * #DCDCDC *
*/ - public static final ChatColor GAINSBORO = ChatColor.of(new Color(0.8627451f, 0.8627451f, 0.8627451f)); + public static final TextColor GAINSBORO = TextColor.color(220, 220, 220); /** * #F8F8FF *
*/ - public static final ChatColor GHOSTWHITE = ChatColor.of(new Color(0.972549f, 0.972549f, 1.0f)); + public static final TextColor GHOSTWHITE = TextColor.color(248, 248, 255); /** * #DAA520 *
*/ - public static final ChatColor GOLDENROD = ChatColor.of(new Color(0.85490197f, 0.64705884f, 0.1254902f)); + public static final TextColor GOLDENROD = TextColor.color(218, 165, 32); /** * #ADFF2F *
*/ - public static final ChatColor GREENYELLOW = ChatColor.of(new Color(0.6784314f, 1.0f, 0.18431373f)); + public static final TextColor GREENYELLOW = TextColor.color(173, 255, 47); /** * #F0FFF0 *
*/ - public static final ChatColor HONEYDEW = ChatColor.of(new Color(0.9411765f, 1.0f, 0.9411765f)); + public static final TextColor HONEYDEW = TextColor.color(240, 255, 240); /** * #FF69B4 *
*/ - public static final ChatColor HOTPINK = ChatColor.of(new Color(1.0f, 0.4117647f, 0.7058824f)); + public static final TextColor HOTPINK = TextColor.color(255, 105, 180); /** * #CD5C5C *
*/ - public static final ChatColor INDIANRED = ChatColor.of(new Color(0.8039216f, 0.36078432f, 0.36078432f)); + public static final TextColor INDIANRED = TextColor.color(205, 92, 92); /** * #4B0082 *
*/ - public static final ChatColor INDIGO = ChatColor.of(new Color(0.29411766f, 0.0f, 0.50980395f)); + public static final TextColor INDIGO = TextColor.color(75, 0, 130); /** * #FFFFF0 *
*/ - public static final ChatColor IVORY = ChatColor.of(new Color(1.0f, 1.0f, 0.9411765f)); + public static final TextColor IVORY = TextColor.color(255, 255, 240); /** * #F0E68C *
*/ - public static final ChatColor KHAKI = ChatColor.of(new Color(0.9411765f, 0.9019608f, 0.54901963f)); + public static final TextColor KHAKI = TextColor.color(240, 230, 140); /** * #E6E6FA *
*/ - public static final ChatColor LAVENDER = ChatColor.of(new Color(0.9019608f, 0.9019608f, 0.98039216f)); + public static final TextColor LAVENDER = TextColor.color(230, 230, 250); /** * #FFF0F5 *
*/ - public static final ChatColor LAVENDERBLUSH = ChatColor.of(new Color(1.0f, 0.9411765f, 0.9607843f)); + public static final TextColor LAVENDERBLUSH = TextColor.color(255, 240, 245); /** * #7CFC00 *
*/ - public static final ChatColor LAWNGREEN = ChatColor.of(new Color(0.4862745f, 0.9882353f, 0.0f)); + public static final TextColor LAWNGREEN = TextColor.color(124, 252, 0); /** * #FFFACD *
*/ - public static final ChatColor LEMONCHIFFON = ChatColor.of(new Color(1.0f, 0.98039216f, 0.8039216f)); + public static final TextColor LEMONCHIFFON = TextColor.color(255, 250, 205); /** * #ADD8E6 *
*/ - public static final ChatColor LIGHTBLUE = ChatColor.of(new Color(0.6784314f, 0.84705883f, 0.9019608f)); + public static final TextColor LIGHTBLUE = TextColor.color(173, 216, 230); /** * #F08080 *
*/ - public static final ChatColor LIGHTCORAL = ChatColor.of(new Color(0.9411765f, 0.5019608f, 0.5019608f)); + public static final TextColor LIGHTCORAL = TextColor.color(240, 128, 128); /** * #E0FFFF *
*/ - public static final ChatColor LIGHTCYAN = ChatColor.of(new Color(0.8784314f, 1.0f, 1.0f)); + public static final TextColor LIGHTCYAN = TextColor.color(224, 255, 255); /** * #FAFAD2 *
*/ - public static final ChatColor LIGHTGOLDENRODYELLOW = ChatColor.of(new Color(0.98039216f, 0.98039216f, 0.8235294f)); + public static final TextColor LIGHTGOLDENRODYELLOW = TextColor.color(250, 250, 210); /** * #D3D3D3 *
*/ - public static final ChatColor LIGHTGRAY = ChatColor.of(new Color(0.827451f, 0.827451f, 0.827451f)); + public static final TextColor LIGHTGRAY = TextColor.color(211, 211, 211); /** * #90EE90 *
*/ - public static final ChatColor LIGHTGREEN = ChatColor.of(new Color(0.5647059f, 0.93333334f, 0.5647059f)); + public static final TextColor LIGHTGREEN = TextColor.color(144, 238, 144); /** * #FFB6C1 *
*/ - public static final ChatColor LIGHTPINK = ChatColor.of(new Color(1.0f, 0.7137255f, 0.75686276f)); + public static final TextColor LIGHTPINK = TextColor.color(255, 182, 193); /** * #FFA07A *
*/ - public static final ChatColor LIGHTSALMON = ChatColor.of(new Color(1.0f, 0.627451f, 0.47843137f)); + public static final TextColor LIGHTSALMON = TextColor.color(255, 160, 122); /** * #20B2AA *
*/ - public static final ChatColor LIGHTSEAGREEN = ChatColor.of(new Color(0.1254902f, 0.69803923f, 0.6666667f)); + public static final TextColor LIGHTSEAGREEN = TextColor.color(32, 178, 170); /** * #87CEFA *
*/ - public static final ChatColor LIGHTSKYBLUE = ChatColor.of(new Color(0.5294118f, 0.80784315f, 0.98039216f)); + public static final TextColor LIGHTSKYBLUE = TextColor.color(135, 206, 250); /** * #778899 *
*/ - public static final ChatColor LIGHTSLATEGRAY = ChatColor.of(new Color(0.46666667f, 0.53333336f, 0.6f)); + public static final TextColor LIGHTSLATEGRAY = TextColor.color(119, 136, 153); /** * #B0C4DE *
*/ - public static final ChatColor LIGHTSTEELBLUE = ChatColor.of(new Color(0.6901961f, 0.76862746f, 0.87058824f)); + public static final TextColor LIGHTSTEELBLUE = TextColor.color(176, 196, 222); /** * #FFFFE0 *
*/ - public static final ChatColor LIGHTYELLOW = ChatColor.of(new Color(1.0f, 1.0f, 0.8784314f)); + public static final TextColor LIGHTYELLOW = TextColor.color(255, 255, 224); /** * #00FF00 *
*/ - public static final ChatColor LIME = ChatColor.of(new Color(0.0f, 1.0f, 0.0f)); + public static final TextColor LIME = TextColor.color(0, 255, 0); /** * #32CD32 *
*/ - public static final ChatColor LIMEGREEN = ChatColor.of(new Color(0.19607843f, 0.8039216f, 0.19607843f)); + public static final TextColor LIMEGREEN = TextColor.color(50, 205, 50); /** * #FAF0E6 *
*/ - public static final ChatColor LINEN = ChatColor.of(new Color(0.98039216f, 0.9411765f, 0.9019608f)); + public static final TextColor LINEN = TextColor.color(250, 240, 230); /** * #FF00FF *
*/ - public static final ChatColor MAGENTA = ChatColor.of(new Color(1.0f, 0.0f, 1.0f)); + public static final TextColor MAGENTA = TextColor.color(255, 0, 255); /** * #800000 *
*/ - public static final ChatColor MAROON = ChatColor.of(new Color(0.5019608f, 0.0f, 0.0f)); + public static final TextColor MAROON = TextColor.color(128, 0, 0); /** * #66CDAA *
*/ - public static final ChatColor MEDIUMAQUAMARINE = ChatColor.of(new Color(0.4f, 0.8039216f, 0.6666667f)); + public static final TextColor MEDIUMAQUAMARINE = TextColor.color(102, 205, 170); /** * #0000CD *
*/ - public static final ChatColor MEDIUMBLUE = ChatColor.of(new Color(0.0f, 0.0f, 0.8039216f)); + public static final TextColor MEDIUMBLUE = TextColor.color(0, 0, 205); /** * #BA55D3 *
*/ - public static final ChatColor MEDIUMORCHID = ChatColor.of(new Color(0.7294118f, 0.33333334f, 0.827451f)); + public static final TextColor MEDIUMORCHID = TextColor.color(186, 85, 211); /** * #9370DB *
*/ - public static final ChatColor MEDIUMPURPLE = ChatColor.of(new Color(0.5764706f, 0.4392157f, 0.85882354f)); + public static final TextColor MEDIUMPURPLE = TextColor.color(147, 112, 219); /** * #3CB371 *
*/ - public static final ChatColor MEDIUMSEAGREEN = ChatColor.of(new Color(0.23529412f, 0.7019608f, 0.44313726f)); + public static final TextColor MEDIUMSEAGREEN = TextColor.color(60, 179, 113); /** * #7B68EE *
*/ - public static final ChatColor MEDIUMSLATEBLUE = ChatColor.of(new Color(0.48235294f, 0.40784314f, 0.93333334f)); + public static final TextColor MEDIUMSLATEBLUE = TextColor.color(123, 104, 238); /** * #00FA9A *
*/ - public static final ChatColor MEDIUMSPRINGGREEN = ChatColor.of(new Color(0.0f, 0.98039216f, 0.6039216f)); + public static final TextColor MEDIUMSPRINGGREEN = TextColor.color(0, 250, 154); /** * #48D1CC *
*/ - public static final ChatColor MEDIUMTURQUOISE = ChatColor.of(new Color(0.28235295f, 0.81960785f, 0.8f)); + public static final TextColor MEDIUMTURQUOISE = TextColor.color(72, 209, 204); /** * #C71585 *
*/ - public static final ChatColor MEDIUMVIOLETRED = ChatColor.of(new Color(0.78039217f, 0.08235294f, 0.52156866f)); + public static final TextColor MEDIUMVIOLETRED = TextColor.color(199, 21, 133); /** * #191970 *
*/ - public static final ChatColor MIDNIGHTBLUE = ChatColor.of(new Color(0.09803922f, 0.09803922f, 0.4392157f)); + public static final TextColor MIDNIGHTBLUE = TextColor.color(25, 25, 112); /** * #F5FFFA *
*/ - public static final ChatColor MINTCREAM = ChatColor.of(new Color(0.9607843f, 1.0f, 0.98039216f)); + public static final TextColor MINTCREAM = TextColor.color(245, 255, 250); /** * #FFE4E1 *
*/ - public static final ChatColor MISTYROSE = ChatColor.of(new Color(1.0f, 0.89411765f, 0.88235295f)); + public static final TextColor MISTYROSE = TextColor.color(255, 228, 225); /** * #FFE4B5 *
*/ - public static final ChatColor MOCCASIN = ChatColor.of(new Color(1.0f, 0.89411765f, 0.70980394f)); + public static final TextColor MOCCASIN = TextColor.color(255, 228, 181); /** * #FFDEAD *
*/ - public static final ChatColor NAVAJOWHITE = ChatColor.of(new Color(1.0f, 0.87058824f, 0.6784314f)); + public static final TextColor NAVAJOWHITE = TextColor.color(255, 222, 173); /** * #000080 *
*/ - public static final ChatColor NAVY = ChatColor.of(new Color(0.0f, 0.0f, 0.5019608f)); + public static final TextColor NAVY = TextColor.color(0, 0, 128); /** * #FDF5E6 *
*/ - public static final ChatColor OLDLACE = ChatColor.of(new Color(0.99215686f, 0.9607843f, 0.9019608f)); + public static final TextColor OLDLACE = TextColor.color(253, 245, 230); /** * #808000 *
*/ - public static final ChatColor OLIVE = ChatColor.of(new Color(0.5019608f, 0.5019608f, 0.0f)); + public static final TextColor OLIVE = TextColor.color(128, 128, 0); /** * #6B8E23 *
*/ - public static final ChatColor OLIVEDRAB = ChatColor.of(new Color(0.41960785f, 0.5568628f, 0.13725491f)); + public static final TextColor OLIVEDRAB = TextColor.color(107, 142, 35); /** * #FFA500 *
*/ - public static final ChatColor ORANGE = ChatColor.of(new Color(1.0f, 0.64705884f, 0.0f)); + public static final TextColor ORANGE = TextColor.color(255, 165, 0); /** * #FF4500 *
*/ - public static final ChatColor ORANGERED = ChatColor.of(new Color(1.0f, 0.27058825f, 0.0f)); + public static final TextColor ORANGERED = TextColor.color(255, 69, 0); /** * #DA70D6 *
*/ - public static final ChatColor ORCHID = ChatColor.of(new Color(0.85490197f, 0.4392157f, 0.8392157f)); + public static final TextColor ORCHID = TextColor.color(218, 112, 214); /** * #EEE8AA *
*/ - public static final ChatColor PALEGOLDENROD = ChatColor.of(new Color(0.93333334f, 0.9098039f, 0.6666667f)); + public static final TextColor PALEGOLDENROD = TextColor.color(238, 232, 170); /** * #98FB98 *
*/ - public static final ChatColor PALEGREEN = ChatColor.of(new Color(0.59607846f, 0.9843137f, 0.59607846f)); + public static final TextColor PALEGREEN = TextColor.color(152, 251, 152); /** * #AFEEEE *
*/ - public static final ChatColor PALETURQUOISE = ChatColor.of(new Color(0.6862745f, 0.93333334f, 0.93333334f)); + public static final TextColor PALETURQUOISE = TextColor.color(175, 238, 238); /** * #DB7093 *
*/ - public static final ChatColor PALEVIOLETRED = ChatColor.of(new Color(0.85882354f, 0.4392157f, 0.5764706f)); + public static final TextColor PALEVIOLETRED = TextColor.color(219, 112, 147); /** * #FFEFD5 *
*/ - public static final ChatColor PAPAYAWHIP = ChatColor.of(new Color(1.0f, 0.9372549f, 0.8352941f)); + public static final TextColor PAPAYAWHIP = TextColor.color(255, 239, 213); /** * #FFDAB9 *
*/ - public static final ChatColor PEACHPUFF = ChatColor.of(new Color(1.0f, 0.85490197f, 0.7254902f)); + public static final TextColor PEACHPUFF = TextColor.color(255, 218, 185); /** * #CD853F *
*/ - public static final ChatColor PERU = ChatColor.of(new Color(0.8039216f, 0.52156866f, 0.24705882f)); + public static final TextColor PERU = TextColor.color(205, 133, 63); /** * #FFC0CB *
*/ - public static final ChatColor PINK = ChatColor.of(new Color(1.0f, 0.7529412f, 0.79607844f)); + public static final TextColor PINK = TextColor.color(255, 192, 203); /** * #DDA0DD *
*/ - public static final ChatColor PLUM = ChatColor.of(new Color(0.8666667f, 0.627451f, 0.8666667f)); + public static final TextColor PLUM = TextColor.color(221, 160, 221); /** * #B0E0E6 *
*/ - public static final ChatColor POWDERBLUE = ChatColor.of(new Color(0.6901961f, 0.8784314f, 0.9019608f)); + public static final TextColor POWDERBLUE = TextColor.color(176, 224, 230); /** * #800080 *
*/ - public static final ChatColor PURPLE = ChatColor.of(new Color(0.5019608f, 0.0f, 0.5019608f)); + public static final TextColor PURPLE = TextColor.color(128, 0, 128); /** * #BC8F8F *
*/ - public static final ChatColor ROSYBROWN = ChatColor.of(new Color(0.7372549f, 0.56078434f, 0.56078434f)); + public static final TextColor ROSYBROWN = TextColor.color(188, 143, 143); /** * #4169E1 *
*/ - public static final ChatColor ROYALBLUE = ChatColor.of(new Color(0.25490198f, 0.4117647f, 0.88235295f)); + public static final TextColor ROYALBLUE = TextColor.color(65, 105, 225); /** * #8B4513 *
*/ - public static final ChatColor SADDLEBROWN = ChatColor.of(new Color(0.54509807f, 0.27058825f, 0.07450981f)); + public static final TextColor SADDLEBROWN = TextColor.color(139, 69, 19); /** * #FA8072 *
*/ - public static final ChatColor SALMON = ChatColor.of(new Color(0.98039216f, 0.5019608f, 0.44705883f)); + public static final TextColor SALMON = TextColor.color(250, 128, 114); /** * #F4A460 *
*/ - public static final ChatColor SANDYBROWN = ChatColor.of(new Color(0.95686275f, 0.6431373f, 0.3764706f)); + public static final TextColor SANDYBROWN = TextColor.color(244, 164, 96); /** * #2E8B57 *
*/ - public static final ChatColor SEAGREEN = ChatColor.of(new Color(0.18039216f, 0.54509807f, 0.34117648f)); + public static final TextColor SEAGREEN = TextColor.color(46, 139, 87); /** * #FFF5EE *
*/ - public static final ChatColor SEASHELL = ChatColor.of(new Color(1.0f, 0.9607843f, 0.93333334f)); + public static final TextColor SEASHELL = TextColor.color(255, 245, 238); /** * #A0522D *
*/ - public static final ChatColor SIENNA = ChatColor.of(new Color(0.627451f, 0.32156864f, 0.1764706f)); + public static final TextColor SIENNA = TextColor.color(160, 82, 45); /** * #C0C0C0 *
*/ - public static final ChatColor SILVER = ChatColor.of(new Color(0.7529412f, 0.7529412f, 0.7529412f)); + public static final TextColor SILVER = TextColor.color(192, 192, 192); /** * #87CEEB *
*/ - public static final ChatColor SKYBLUE = ChatColor.of(new Color(0.5294118f, 0.80784315f, 0.92156863f)); + public static final TextColor SKYBLUE = TextColor.color(135, 206, 235); /** * #6A5ACD *
*/ - public static final ChatColor SLATEBLUE = ChatColor.of(new Color(0.41568628f, 0.3529412f, 0.8039216f)); + public static final TextColor SLATEBLUE = TextColor.color(106, 90, 205); /** * #708090 *
*/ - public static final ChatColor SLATEGRAY = ChatColor.of(new Color(0.4392157f, 0.5019608f, 0.5647059f)); + public static final TextColor SLATEGRAY = TextColor.color(112, 128, 144); /** * #FFFAFA *
*/ - public static final ChatColor SNOW = ChatColor.of(new Color(1.0f, 0.98039216f, 0.98039216f)); + public static final TextColor SNOW = TextColor.color(255, 250, 250); /** * #00FF7F *
*/ - public static final ChatColor SPRINGGREEN = ChatColor.of(new Color(0.0f, 1.0f, 0.49803922f)); + public static final TextColor SPRINGGREEN = TextColor.color(0, 255, 127); /** * #4682B4 *
*/ - public static final ChatColor STEELBLUE = ChatColor.of(new Color(0.27450982f, 0.50980395f, 0.7058824f)); + public static final TextColor STEELBLUE = TextColor.color(70, 130, 180); /** * #D2B48C *
*/ - public static final ChatColor TAN = ChatColor.of(new Color(0.8235294f, 0.7058824f, 0.54901963f)); + public static final TextColor TAN = TextColor.color(210, 180, 140); /** * #008080 *
*/ - public static final ChatColor TEAL = ChatColor.of(new Color(0.0f, 0.5019608f, 0.5019608f)); + public static final TextColor TEAL = TextColor.color(0, 128, 128); /** * #D8BFD8 *
*/ - public static final ChatColor THISTLE = ChatColor.of(new Color(0.84705883f, 0.7490196f, 0.84705883f)); + public static final TextColor THISTLE = TextColor.color(216, 191, 216); /** * #FF6347 *
*/ - public static final ChatColor TOMATO = ChatColor.of(new Color(1.0f, 0.3882353f, 0.2784314f)); + public static final TextColor TOMATO = TextColor.color(255, 99, 71); /** * #40E0D0 *
*/ - public static final ChatColor TURQUOISE = ChatColor.of(new Color(0.2509804f, 0.8784314f, 0.8156863f)); + public static final TextColor TURQUOISE = TextColor.color(64, 224, 208); /** * #EE82EE *
*/ - public static final ChatColor VIOLET = ChatColor.of(new Color(0.93333334f, 0.50980395f, 0.93333334f)); + public static final TextColor VIOLET = TextColor.color(238, 130, 238); /** * #F5DEB3 *
*/ - public static final ChatColor WHEAT = ChatColor.of(new Color(0.9607843f, 0.87058824f, 0.7019608f)); + public static final TextColor WHEAT = TextColor.color(245, 222, 179); /** * #F5F5F5 *
*/ - public static final ChatColor WHITESMOKE = ChatColor.of(new Color(0.9607843f, 0.9607843f, 0.9607843f)); + public static final TextColor WHITESMOKE = TextColor.color(245, 245, 245); /** * #9ACD32 *
*/ - public static final ChatColor YELLOWGREEN = ChatColor.of(new Color(0.6039216f, 0.8039216f, 0.19607843f)); + public static final TextColor YELLOWGREEN = TextColor.color(154, 205, 50); } diff --git a/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt b/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt index f4a01162..457af4d4 100644 --- a/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt +++ b/src/main/kotlin/net/axay/kspigot/commands/internal/BrigardierSupport.kt @@ -33,7 +33,7 @@ object BrigardierSupport { } @Suppress("HasPlatformType") - fun resolveCommandManager() = (server as org.bukkit.craftbukkit.v1_18_R1.CraftServer) + fun resolveCommandManager() = (server as org.bukkit.craftbukkit.v1_18_R2.CraftServer) .server.vanillaCommandDispatcher internal fun registerAll() { @@ -52,7 +52,7 @@ object BrigardierSupport { fun updateCommandTree() { onlinePlayers.forEach { // send the command tree - resolveCommandManager().sendCommands((it as org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer).handle) + resolveCommandManager().sendCommands((it as org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer).handle) } } } diff --git a/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt b/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt index 61d72460..615dd449 100644 --- a/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt +++ b/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt @@ -1,9 +1,11 @@ +@file:Suppress("unused") + package net.axay.kspigot.data import net.axay.kspigot.annotations.NMS_General import net.minecraft.nbt.CompoundTag -import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity -import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack +import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity +import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack import org.bukkit.entity.Entity import org.bukkit.inventory.ItemStack diff --git a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ColorExtensions.kt b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ColorExtensions.kt index 7871ae34..c7ee3dd3 100644 --- a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ColorExtensions.kt +++ b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ColorExtensions.kt @@ -1,64 +1,50 @@ +@file:Suppress("unused") + package net.axay.kspigot.extensions.bukkit -// FROM BUNGEE COLOR +import net.kyori.adventure.text.format.TextColor +import org.bukkit.Color as BukkitColor +import java.awt.Color as JavaColor + +// FROM ADVENTURE TEXTCOLOR /** * Returns the corresponding Bukkit Color object. */ -val net.md_5.bungee.api.ChatColor.bukkitColor - get() = org.bukkit.Color.fromRGB(color.rgb) +val TextColor.bukkitColor + get() = BukkitColor.fromRGB(value()) /** * Returns the corresponding Java Color object. * @see net.md_5.bungee.api.ChatColor.color */ -val net.md_5.bungee.api.ChatColor.javaAwtColor: java.awt.Color - get() = color +val TextColor.javaAwtColor: JavaColor + get() = JavaColor(value()) // FROM BUKKIT COLOR /** * Returns the corresponding Bungee Color object. */ -val org.bukkit.Color.bungeeColor: net.md_5.bungee.api.ChatColor - get() = net.md_5.bungee.api.ChatColor.of(java.awt.Color(asRGB())) +val BukkitColor.textColor: TextColor + get() = TextColor.color(asRGB()) /** * Returns the corresponding Java Color object. */ -val org.bukkit.Color.javaAwtColor: java.awt.Color - get() = java.awt.Color(asRGB()) +val BukkitColor.javaAwtColor: JavaColor + get() = JavaColor(asRGB()) // FROM JAVA AWT COLOR /** * Returns the corresponding Bukkit Color object. */ -val java.awt.Color.bukkitColor - get() = org.bukkit.Color.fromRGB(rgb) +val JavaColor.bukkitColor + get() = BukkitColor.fromRGB(rgb) /** * Returns the corresponding Bungee Color object. */ -val java.awt.Color.bungeeColor: net.md_5.bungee.api.ChatColor - get() = net.md_5.bungee.api.ChatColor.of(this) - -// FROM BUKKIT CHAT COLOR - -/** - * Returns the corresponding Bukkit Color object. - */ -val org.bukkit.ChatColor.bukkitColor - get() = bungeeColor.bukkitColor - -/** - * Returns the corresponding Bungee Color object. - */ -val org.bukkit.ChatColor.bungeeColor: net.md_5.bungee.api.ChatColor - get() = net.md_5.bungee.api.ChatColor.of(name) - -/** - * Returns the corresponding Java Color object. - */ -val org.bukkit.ChatColor.javaAwtColor: java.awt.Color - get() = bungeeColor.javaAwtColor +val JavaColor.textColor: TextColor + get() = TextColor.color(rgb) diff --git a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ConsoleSenderExtensions.kt b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ConsoleSenderExtensions.kt index 8732d561..377d9995 100644 --- a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ConsoleSenderExtensions.kt +++ b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/ConsoleSenderExtensions.kt @@ -1,36 +1,40 @@ +@file:Suppress("unused") + package net.axay.kspigot.extensions.bukkit +import net.axay.kspigot.chat.KColors import net.axay.kspigot.main.PluginInstance -import net.md_5.bungee.api.ChatColor +import net.kyori.adventure.text.Component +import net.kyori.adventure.text.format.TextColor import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.bukkit.plugin.Plugin /** @see printColoredPrefix */ fun CommandSender.print(text: String, plugin: Plugin? = PluginInstance) = - printColoredPrefix(text, ChatColor.RESET, plugin?.name ?: "INFO", ChatColor.GRAY) + printColoredPrefix(text, KColors.WHITE, plugin?.name ?: "INFO", KColors.GRAY) /** @see printColoredPrefix */ fun CommandSender.info(text: String, plugin: Plugin? = PluginInstance) = - printColoredPrefix(text, ChatColor.WHITE, plugin?.name ?: "INFO", ChatColor.DARK_AQUA) + printColoredPrefix(text, KColors.WHITE, plugin?.name ?: "INFO", KColors.DARKAQUA) /** @see printColoredPrefix */ fun CommandSender.success(text: String, plugin: Plugin? = PluginInstance) = - printColoredPrefix(text, ChatColor.GREEN, plugin?.name ?: "SUCCESS", ChatColor.DARK_AQUA) + printColoredPrefix(text, KColors.GREEN, plugin?.name ?: "SUCCESS", KColors.DARKAQUA) /** @see printColoredPrefix */ fun CommandSender.warn(text: String, plugin: Plugin? = PluginInstance) = - printColoredPrefix(text, ChatColor.WHITE, plugin?.name?.plus(" - WARN") ?: "WARN", ChatColor.YELLOW) + printColoredPrefix(text, KColors.WHITE, plugin?.name?.plus(" - WARN") ?: "WARN", KColors.YELLOW) /** @see printColoredPrefix */ fun CommandSender.error(text: String, plugin: Plugin? = PluginInstance) = - printColoredPrefix(text, ChatColor.RED, plugin?.name?.plus(" - ERROR") ?: "ERROR", ChatColor.DARK_RED) + printColoredPrefix(text, KColors.RED, plugin?.name?.plus(" - ERROR") ?: "ERROR", KColors.DARKRED) /** * Sends the given message and adds the given prefix with the given color to it. */ -fun CommandSender.printColoredPrefix(text: String, textColor: ChatColor, prefix: String, prefixColor: ChatColor) = - sendMessage("${prefixColor}[${prefix}]${textColor} $text") +fun CommandSender.printColoredPrefix(text: String, textColor: TextColor, prefix: String, prefixColor: TextColor) = + sendMessage(Component.text(prefix).color(prefixColor).append(Component.text(text).color(textColor))) /** * Dispatches the command given by [commandLine]. diff --git a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt index a76831eb..299d0499 100644 --- a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt +++ b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt @@ -108,7 +108,7 @@ fun Player.showOnlinePlayers() { @Deprecated("This function is unstable and it cannot be guaranteed that it will work at any time in the future.") @NMS_General fun Location.spawnCleanEntity(entityType: EntityType): Entity? { - val craftWorld = world as? org.bukkit.craftbukkit.v1_18_R1.CraftWorld ?: return null + val craftWorld = world as? org.bukkit.craftbukkit.v1_18_R2.CraftWorld ?: return null return craftWorld.createEntity(this, entityType.entityClass)?.let { craftWorld.handle.addFreshEntity(it) return@let it.bukkitEntity diff --git a/src/main/kotlin/net/axay/kspigot/items/ItemStackUtils.kt b/src/main/kotlin/net/axay/kspigot/items/ItemStackUtils.kt index c8996c85..c1918ee5 100644 --- a/src/main/kotlin/net/axay/kspigot/items/ItemStackUtils.kt +++ b/src/main/kotlin/net/axay/kspigot/items/ItemStackUtils.kt @@ -1,18 +1,21 @@ +@file:Suppress("unused") + package net.axay.kspigot.items import net.axay.kspigot.chat.KColors -import net.md_5.bungee.api.ChatColor +import net.kyori.adventure.text.Component +import net.kyori.adventure.text.format.TextColor +import net.kyori.adventure.text.format.TextDecoration /** - * Converts this string into a list of strings, which + * Converts this string into a list of components, which * can be used for minecraft lorelists. */ -fun String.toLoreList(vararg lineColors: ChatColor = arrayOf(KColors.RESET), lineLength: Int = 40): List { - val lineColor = lineColors.joinToString(separator = "") - val loreList = ArrayList() +fun String.toLoreList(lineColor: TextColor = KColors.WHITE, vararg lineDecorations: TextDecoration = arrayOf(), lineLength: Int = 40): List { + val loreList = ArrayList() val lineBuilder = StringBuilder() fun submitLine() { - loreList += "$lineColor$lineBuilder" + loreList += Component.text(lineBuilder.toString()).color(lineColor).decorations(lineDecorations.toMutableSet(), true) lineBuilder.clear() } diff --git a/src/main/kotlin/net/axay/kspigot/structures/Structure.kt b/src/main/kotlin/net/axay/kspigot/structures/Structure.kt index fc150da9..fdd5f8d6 100644 --- a/src/main/kotlin/net/axay/kspigot/structures/Structure.kt +++ b/src/main/kotlin/net/axay/kspigot/structures/Structure.kt @@ -10,7 +10,7 @@ import org.bukkit.Location import org.bukkit.Material import org.bukkit.block.Block import org.bukkit.block.data.BlockData -import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity +import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity import org.bukkit.entity.Entity import org.bukkit.entity.EntityType @@ -60,6 +60,7 @@ data class StructureDataEntity( constructor(entity: Entity) : this(entity.type, entity.nbtData) constructor(entityType: EntityType) : this(entityType, CompoundTag()) + @Suppress("DEPRECATION") override fun createAt(loc: Location) { (loc.spawnCleanEntity(entityType) as CraftEntity).handle.load(nbtData) }