v9.4.0

Author: CryptoMorin

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.cryptomorin</groupId>
     <artifactId>XSeries</artifactId>
-    <version>9.3.1</version>
+    <version>9.4.0</version>
 
     <name>XSeries</name>
     <description>A set of utilities for Minecraft plugins</description>
@@ -68,7 +68,7 @@
 
     <properties>
         <!-- Latest version -->
-        <spigotVersion>1.19.4-R0.1-SNAPSHOT</spigotVersion>
+        <spigotVersion>1.20-R0.1-SNAPSHOT</spigotVersion>
     </properties>
 
     <dependencies>

src/main/java/com/cryptomorin/xseries/NMSExtras.java

@@ -22,6 +22,7 @@
 package com.cryptomorin.xseries;
 
 import org.bukkit.Chunk;
+import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -44,7 +45,7 @@
  * All the parameters are non-null.
  *
  * @author Crypto Morin
- * @version 5.2.1
+ * @version 5.3.0
  */
 public final class NMSExtras {
     public static final MethodHandle EXP_PACKET;
@@ -62,7 +63,8 @@ public final class NMSExtras {
     public static final MethodHandle PLAY_BLOCK_ACTION;
     public static final MethodHandle GET_BUKKIT_ENTITY;
     public static final MethodHandle GET_BLOCK_TYPE;
-    public static final MethodHandle GET_BLOCK, GET_IBLOCK_DATA, SANITIZE_LINES, TILE_ENTITY_SIGN, TILE_ENTITY_SIGN__GET_UPDATE_PACKET, TILE_ENTITY_SIGN__SET_LINE;
+    public static final MethodHandle GET_BLOCK, GET_IBLOCK_DATA, SANITIZE_LINES, TILE_ENTITY_SIGN,
+            TILE_ENTITY_SIGN__GET_UPDATE_PACKET, TILE_ENTITY_SIGN__SET_LINE, SIGN_TEXT;
 
     public static final Class<?>
             MULTI_BLOCK_CHANGE_INFO_CLASS = null, // getNMSClass("PacketPlayOutMultiBlockChange$MultiBlockChangeInfo")
@@ -89,7 +91,7 @@ public final class NMSExtras {
         MethodHandle getBlock = null;
         MethodHandle getIBlockData = null;
         MethodHandle sanitizeLines = null;
-        MethodHandle tileEntitySign = null, tileEntitySign_getUpdatePacket = null, tileEntitySign_setLine = null;
+        MethodHandle tileEntitySign = null, tileEntitySign_getUpdatePacket = null, tileEntitySign_setLine = null, signText = null;
 
         MethodHandle playOutMultiBlockChange = null, multiBlockChangeInfo = null, chunkWrapper = null, chunkWrapperSet = null,
                 shortsOrInfo = null, setBlockData = null;
@@ -200,7 +202,9 @@ public final class NMSExtras {
             getBlock = lookup.findVirtual(BLOCK_DATA, v(18, "b").orElse("getBlock"), MethodType.methodType(block));
             playBlockAction = lookup.findVirtual(world, v(18, "a").orElse("playBlockAction"), MethodType.methodType(void.class, blockPos, block, int.class, int.class));
 
-            signEditorPacket = lookup.findConstructor(signOpenPacket, MethodType.methodType(void.class, blockPos));
+            signEditorPacket = lookup.findConstructor(signOpenPacket,
+                    v(20, MethodType.methodType(void.class, blockPos, boolean.class))
+                            .orElse(MethodType.methodType(void.class, blockPos)));
             if (supports(17)) {
                 packetPlayOutBlockChange = lookup.findConstructor(packetPlayOutBlockChangeClass, MethodType.methodType(void.class, blockPos, BLOCK_DATA));
                 getIBlockData = lookup.findStatic(CraftMagicNumbers, "getBlock", MethodType.methodType(BLOCK_DATA, Material.class, byte.class));
@@ -209,9 +213,24 @@ public final class NMSExtras {
 
                 tileEntitySign = lookup.findConstructor(TileEntitySign, MethodType.methodType(void.class, blockPos, BLOCK_DATA));
                 tileEntitySign_getUpdatePacket = lookup.findVirtual(TileEntitySign,
-                        v(19, "f").v(18, "c").orElse("getUpdatePacket"),
+                        v(20, "j").v(19, "f").v(18, "c").orElse("getUpdatePacket"),
                         MethodType.methodType(PacketPlayOutTileEntityData));
-                tileEntitySign_setLine = lookup.findVirtual(TileEntitySign, "a", MethodType.methodType(void.class, int.class, IChatBaseComponent, IChatBaseComponent));
+
+                if (supports(20)) {
+                    Class<?> SignText = getNMSClass("world.level.block.entity.SignText");
+                    // public boolean a(SignText signtext, boolean flag) {
+                    //        return flag ? this.c(signtext) : this.b(signtext);
+                    // }
+                    tileEntitySign_setLine = lookup.findVirtual(TileEntitySign, "a", MethodType.methodType(boolean.class, SignText, boolean.class));
+
+                    // public SignText(net.minecraft.network.chat.IChatBaseComponent[] var0, IChatBaseComponent[] var1,
+                    // EnumColor var2, boolean var3) {
+                    Class<?> EnumColor = getNMSClass("world.item.EnumColor");
+                    signText = lookup.findConstructor(SignText, MethodType.methodType(void.class,
+                            IChatBaseComponent.arrayType(), IChatBaseComponent.arrayType(), EnumColor, boolean.class));
+                } else {
+                    tileEntitySign_setLine = lookup.findVirtual(TileEntitySign, "a", MethodType.methodType(void.class, int.class, IChatBaseComponent, IChatBaseComponent));
+                }
             }
         } catch (NoSuchMethodException | IllegalAccessException | NoSuchFieldException ex) {
             ex.printStackTrace();
@@ -247,6 +266,7 @@ public final class NMSExtras {
         CHUNK_WRAPPER_SET = chunkWrapperSet;
         SHORTS_OR_INFO = shortsOrInfo;
         SET_BLOCK_DATA = setBlockData;
+        SIGN_TEXT = signText;
     }
 
     private NMSExtras() {
@@ -387,7 +407,7 @@ protected static void sendBlockChange(Player player, Chunk chunk, Map<WorldlessB
     /**
      * Currently only supports 1.17
      */
-    public static void openSign(Player player, String[] lines) {
+    public static void openSign(Player player, DyeColor textColor, String[] lines, boolean frontSide) {
         try {
             Location loc = player.getLocation();
             Object position = BLOCK_POSITION.invoke(loc.getBlockX(), 1, loc.getBlockY());
@@ -396,13 +416,32 @@ public static void openSign(Player player, String[] lines) {
 
             Object components = SANITIZE_LINES.invoke((Object[]) lines);
             Object tileSign = TILE_ENTITY_SIGN.invoke(position, signBlockData);
-            for (int i = 0; i < lines.length; i++) {
-                Object component = java.lang.reflect.Array.get(components, i);
-                TILE_ENTITY_SIGN__SET_LINE.invoke(tileSign, i, component, component);
+            if (supports(20)) {
+                // When can we use this without blocks... player.openSign();
+                Class<?> EnumColor = ReflectionUtils.getNMSClass("world.item.EnumColor");
+                Object enumColor = null;
+                for (Field field : EnumColor.getFields()) {
+                    Object color = field.get(null);
+                    String colorName = (String) EnumColor.getDeclaredMethod("b").invoke(color); // gets its name
+                    if (textColor.name().equalsIgnoreCase(colorName)) {
+                        enumColor = color;
+                        break;
+                    }
+                }
+
+                Object signText = SIGN_TEXT.invoke(components, components, enumColor, frontSide);
+                TILE_ENTITY_SIGN__SET_LINE.invoke(signText, true);
+            } else {
+                for (int i = 0; i < lines.length; i++) {
+                    Object component = java.lang.reflect.Array.get(components, i);
+                    TILE_ENTITY_SIGN__SET_LINE.invoke(tileSign, i, component, component);
+                }
             }
             Object signLinesUpdatePacket = TILE_ENTITY_SIGN__GET_UPDATE_PACKET.invoke(tileSign);
 
-            Object signPacket = PACKET_PLAY_OUT_OPEN_SIGN_EDITOR.invoke(position);
+            Object signPacket =
+                    v(20, PACKET_PLAY_OUT_OPEN_SIGN_EDITOR.invoke(position, true))
+                            .orElse(PACKET_PLAY_OUT_OPEN_SIGN_EDITOR.invoke(position));
 
             sendPacket(player, blockChangePacket, signLinesUpdatePacket, signPacket);
         } catch (Throwable x) {

src/main/java/com/cryptomorin/xseries/ReflectionUtils.java

@@ -133,8 +133,8 @@ public final class ReflectionUtils {
             throw new RuntimeException("Failed to parse minor number: " + minorVer + ' ' + getVersionInformation(), ex);
         }
 
-        // Don't use \d, it'd also match negative number (if it somehow ever happened?)
-        Matcher bukkitVer = Pattern.compile("^[0-9]+\\.[0-9]+\\.([0-9]+)").matcher(Bukkit.getBukkitVersion());
+        // Bukkit.getBukkitVersion() = "1.12.2-R0.1-SNAPSHOT"
+        Matcher bukkitVer = Pattern.compile("^\\d+\\.\\d+\\.(\\d+)").matcher(Bukkit.getBukkitVersion());
         if (bukkitVer.find()) { // matches() won't work, we just want to match the start using "^"
             try {
                 // group(0) gives the whole matched string, we just want the captured group.

src/main/java/com/cryptomorin/xseries/XMaterial.java

@@ -104,9 +104,12 @@ public enum XMaterial {
     ANDESITE_SLAB,
     ANDESITE_STAIRS,
     ANDESITE_WALL,
+    ANGLER_POTTERY_SHERD,
     ANVIL,
     APPLE,
+    ARCHER_POTTERY_SHERD,
     ARMOR_STAND,
+    ARMS_UP_POTTERY_SHERD,
     ARROW,
     ATTACHED_MELON_STEM(7, "MELON_STEM"),
     ATTACHED_PUMPKIN_STEM(7, "PUMPKIN_STEM"),
@@ -198,6 +201,7 @@ public enum XMaterial {
     BLACK_TERRACOTTA(15, "STAINED_CLAY"),
     BLACK_WALL_BANNER("WALL_BANNER"),
     BLACK_WOOL(15, "WOOL"),
+    BLADE_POTTERY_SHERD,
     BLAST_FURNACE,
     BLAZE_POWDER,
     BLAZE_ROD,
@@ -231,6 +235,7 @@ public enum XMaterial {
     BRAIN_CORAL_FAN,
     BRAIN_CORAL_WALL_FAN,
     BREAD,
+    BREWER_POTTERY_SHERD,
     BREWING_STAND("BREWING_STAND", "BREWING_STAND_ITEM"),
     BRICK("CLAY_BRICK"),
     BRICKS("BRICK"),
@@ -263,9 +268,11 @@ public enum XMaterial {
     BUCKET,
     BUDDING_AMETHYST,
     BUNDLE,
+    BURN_POTTERY_SHERD,
     CACTUS,
     CAKE("CAKE_BLOCK"),
     CALCITE,
+    CALIBRATED_SCULK_SENSOR,
     CAMEL_SPAWN_EGG,
     CAMPFIRE,
     CANDLE,
@@ -430,6 +437,7 @@ public enum XMaterial {
     CYAN_WOOL(9, "WOOL"),
     DAMAGED_ANVIL(2, "ANVIL"),
     DANDELION("YELLOW_FLOWER"),
+    DANGER_POTTERY_SHERD,
     DARK_OAK_BOAT("BOAT_DARK_OAK"),
     DARK_OAK_BUTTON("WOOD_BUTTON"),
     DARK_OAK_CHEST_BOAT,
@@ -558,6 +566,7 @@ public enum XMaterial {
     END_STONE_BRICK_WALL,
     EVOKER_SPAWN_EGG(34, "MONSTER_EGG"),
     EXPERIENCE_BOTTLE("EXP_BOTTLE"),
+    EXPLORER_POTTERY_SHERD,
     EXPOSED_COPPER,
     EXPOSED_CUT_COPPER,
     EXPOSED_CUT_COPPER_SLAB,
@@ -591,6 +600,7 @@ public enum XMaterial {
     FLOWER_BANNER_PATTERN,
     FLOWER_POT("FLOWER_POT", "FLOWER_POT_ITEM"),
     FOX_SPAWN_EGG,
+    FRIEND_POTTERY_SHERD,
     FROGSPAWN,
     FROG_SPAWN_EGG,
     /**
@@ -678,7 +688,9 @@ public enum XMaterial {
     GUNPOWDER("SULPHUR"),
     HANGING_ROOTS,
     HAY_BLOCK,
+    HEARTBREAK_POTTERY_SHERD,
     HEART_OF_THE_SEA,
+    HEART_POTTERY_SHERD,
     HEAVY_WEIGHTED_PRESSURE_PLATE("IRON_PLATE"),
     HOGLIN_SPAWN_EGG("MONSTER_EGG"),
     HONEYCOMB,
@@ -692,6 +704,8 @@ public enum XMaterial {
     HORN_CORAL_FAN,
     HORN_CORAL_WALL_FAN,
     HORSE_SPAWN_EGG(100, "MONSTER_EGG"),
+    HOST_ARMOR_TRIM_SMITHING_TEMPLATE,
+    HOWL_POTTERY_SHERD,
     HUSK_SPAWN_EGG(23, "MONSTER_EGG"),
     ICE,
     INFESTED_CHISELED_STONE_BRICKS(5, "MONSTER_EGGS"),
@@ -882,6 +896,7 @@ public enum XMaterial {
     MELON_STEM,
     MILK_BUCKET,
     MINECART,
+    MINER_POTTERY_SHERD,
     MOJANG_BANNER_PATTERN,
     MOOSHROOM_SPAWN_EGG(96, "MONSTER_EGG"),
     MOSSY_COBBLESTONE,
@@ -894,6 +909,7 @@ public enum XMaterial {
     MOSSY_STONE_BRICK_WALL,
     MOSS_BLOCK,
     MOSS_CARPET,
+    MOURNER_POTTERY_SHERD,
     MOVING_PISTON("PISTON_MOVING_PIECE"),
     MUD,
     MUDDY_MANGROVE_ROOTS,
@@ -915,6 +931,7 @@ public enum XMaterial {
     MUSIC_DISC_MELLOHI("RECORD_7"),
     MUSIC_DISC_OTHERSIDE,
     MUSIC_DISC_PIGSTEP,
+    MUSIC_DISC_RELIC,
     MUSIC_DISC_STAL("RECORD_8"),
     MUSIC_DISC_STRAD("RECORD_9"),
     MUSIC_DISC_WAIT("RECORD_12"),
@@ -1037,8 +1054,12 @@ public enum XMaterial {
     PINK_WOOL(6, "WOOL"),
     PISTON("PISTON_BASE"),
     PISTON_HEAD("PISTON_EXTENSION"),
+    PITCHER_CROP,
+    PITCHER_PLANT,
+    PITCHER_POD,
     PLAYER_HEAD(3, "SKULL", "SKULL_ITEM"),
     PLAYER_WALL_HEAD(3, "SKULL", "SKULL_ITEM"),
+    PLENTY_POTTERY_SHERD,
     PODZOL(2, "DIRT"),
     POINTED_DRIPSTONE,
     POISONOUS_POTATO,
@@ -1124,6 +1145,7 @@ public enum XMaterial {
     PRISMARINE_SLAB,
     PRISMARINE_STAIRS,
     PRISMARINE_WALL,
+    PRIZE_POTTERY_SHERD,
     PUFFERFISH(3, "RAW_FISH"),
     PUFFERFISH_BUCKET,
     PUFFERFISH_SPAWN_EGG,
@@ -1162,6 +1184,7 @@ public enum XMaterial {
     RABBIT_SPAWN_EGG(101, "MONSTER_EGG"),
     RABBIT_STEW,
     RAIL("RAILS"),
+    RAISER_ARMOR_TRIM_SMITHING_TEMPLATE,
     RAVAGER_SPAWN_EGG,
     RAW_COPPER,
     RAW_COPPER_BLOCK,
@@ -1250,19 +1273,24 @@ public enum XMaterial {
     SEA_LANTERN,
     SEA_PICKLE,
     SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE,
+    SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE,
+    SHEAF_POTTERY_SHERD,
     SHEARS,
     SHEEP_SPAWN_EGG(91, "MONSTER_EGG"),
+    SHELTER_POTTERY_SHERD,
     SHIELD,
     SHROOMLIGHT,
     SHULKER_BOX("PURPLE_SHULKER_BOX"),
     SHULKER_SHELL,
     SHULKER_SPAWN_EGG(69, "MONSTER_EGG"),
+    SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE,
     SILVERFISH_SPAWN_EGG(60, "MONSTER_EGG"),
     SKELETON_HORSE_SPAWN_EGG(28, "MONSTER_EGG"),
     SKELETON_SKULL("SKULL", "SKULL_ITEM"),
     SKELETON_SPAWN_EGG(51, "MONSTER_EGG"),
     SKELETON_WALL_SKULL("SKULL", "SKULL_ITEM"),
     SKULL_BANNER_PATTERN,
+    SKULL_POTTERY_SHERD,
     SLIME_BALL,
     SLIME_BLOCK,
     SLIME_SPAWN_EGG(55, "MONSTER_EGG"),
@@ -1282,7 +1310,9 @@ public enum XMaterial {
     SMOOTH_SANDSTONE_STAIRS,
     SMOOTH_STONE,
     SMOOTH_STONE_SLAB,
+    SNIFFER_EGG,
     SNIFFER_SPAWN_EGG,
+    SNORT_POTTERY_SHERD,
     SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE,
     SNOW,
     SNOWBALL("SNOW_BALL"),
@@ -1377,6 +1407,7 @@ public enum XMaterial {
      */
     SUGAR_CANE("SUGAR_CANE_BLOCK"),
     SUNFLOWER("DOUBLE_PLANT"),
+    SUSPICIOUS_GRAVEL,
     SUSPICIOUS_SAND,
     SUSPICIOUS_STEW,
     SWEET_BERRIES,
@@ -1476,6 +1507,7 @@ public enum XMaterial {
     WAXED_WEATHERED_CUT_COPPER,
     WAXED_WEATHERED_CUT_COPPER_SLAB,
     WAXED_WEATHERED_CUT_COPPER_STAIRS,
+    WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE,
     WEATHERED_COPPER,
     WEATHERED_CUT_COPPER,
     WEATHERED_CUT_COPPER_SLAB,