diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 3fa5e45f..15776c69 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } tasks.withType { - options.release.set(21) + options.release.set(25) options.encoding = "UTF-8" } @@ -38,7 +38,7 @@ extensions.configure { tasks.named("javadoc") { options.encoding = "UTF-8" (options as? StandardJavadocDocletOptions)?.apply { - source = "21" + source = "25" links("https://docs.oracle.com/en/java/javase/11/docs/api/") addStringOption("Xdoclint:none", "-quiet") if (JavaVersion.current() >= JavaVersion.VERSION_1_9 && JavaVersion.current() < JavaVersion.VERSION_12) { diff --git a/api/src/main/java/net/elytrium/limboapi/api/LimboFactory.java b/api/src/main/java/net/elytrium/limboapi/api/LimboFactory.java index 2d2e9373..d33ef1c1 100644 --- a/api/src/main/java/net/elytrium/limboapi/api/LimboFactory.java +++ b/api/src/main/java/net/elytrium/limboapi/api/LimboFactory.java @@ -72,12 +72,12 @@ public interface LimboFactory { /** * Creates new virtual block from id and data. * - * @param legacyID Block id. + * @param id Block protocol id, or a legacy id when {@code modern} is false. * @param modern Use the latest supported version ids or 1.12.2 and lower. * * @return new virtual block. */ - VirtualBlock createSimpleBlock(short legacyID, boolean modern); + VirtualBlock createSimpleBlock(char id, boolean modern); /** * Creates new virtual customizable block. @@ -89,7 +89,7 @@ public interface LimboFactory { * * @return new virtual block. */ - VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, short id); + VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, char id); /** * Creates new virtual customizable block. diff --git a/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java b/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java index 3556eed3..34c867ce 100644 --- a/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java +++ b/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java @@ -34,7 +34,8 @@ public enum BlockEntityVersion { MINECRAFT_1_21_9(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_9)), MINECRAFT_1_21_11(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_11)), MINECRAFT_26_1(EnumSet.of(ProtocolVersion.MINECRAFT_26_1)), - MINECRAFT_26_2(EnumSet.range(ProtocolVersion.MINECRAFT_26_2, ProtocolVersion.MAXIMUM_VERSION)); + MINECRAFT_26_2(EnumSet.of(ProtocolVersion.MINECRAFT_26_2)), + MINECRAFT_26_3(EnumSet.range(ProtocolVersion.MINECRAFT_26_3, ProtocolVersion.MAXIMUM_VERSION)); private static final EnumMap MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class); private static final Map KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values())); diff --git a/api/src/main/java/net/elytrium/limboapi/api/chunk/VirtualBlock.java b/api/src/main/java/net/elytrium/limboapi/api/chunk/VirtualBlock.java index c2de5c24..2c997a58 100644 --- a/api/src/main/java/net/elytrium/limboapi/api/chunk/VirtualBlock.java +++ b/api/src/main/java/net/elytrium/limboapi/api/chunk/VirtualBlock.java @@ -12,12 +12,12 @@ public interface VirtualBlock { - short getModernID(); + char getModernID(); String getModernStringID(); @Deprecated - short getID(ProtocolVersion version); + char getID(ProtocolVersion version); short getBlockID(WorldVersion version); @@ -27,7 +27,7 @@ public interface VirtualBlock { boolean isSupportedOn(WorldVersion version); - short getBlockStateID(ProtocolVersion version); + char getBlockStateID(ProtocolVersion version); boolean isSolid(); diff --git a/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java b/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java index 67bd8afb..1a37d1fb 100644 --- a/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java +++ b/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java @@ -38,7 +38,8 @@ public enum WorldVersion { MINECRAFT_1_21_9(ProtocolVersion.MINECRAFT_1_21_9), MINECRAFT_1_21_11(ProtocolVersion.MINECRAFT_1_21_11), MINECRAFT_26_1(ProtocolVersion.MINECRAFT_26_1), - MINECRAFT_26_2(EnumSet.range(ProtocolVersion.MINECRAFT_26_2, ProtocolVersion.MAXIMUM_VERSION)); + MINECRAFT_26_2(ProtocolVersion.MINECRAFT_26_2), + MINECRAFT_26_3(EnumSet.range(ProtocolVersion.MINECRAFT_26_3, ProtocolVersion.MAXIMUM_VERSION)); private static final EnumMap MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class); private static final Map KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values())); diff --git a/build.gradle.kts b/build.gradle.kts index 5d45062c..6ad5b0c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,8 +17,8 @@ allprojects { version = "1.1.27-SNAPSHOT" tasks.withType { - sourceCompatibility = JavaVersion.VERSION_21.toString() - targetCompatibility = JavaVersion.VERSION_21.toString() + sourceCompatibility = JavaVersion.VERSION_25.toString() + targetCompatibility = JavaVersion.VERSION_25.toString() } checkstyle { diff --git a/gradle.properties b/gradle.properties index 1f7c4519..26f65c2e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ manifestUrl=https://launchermeta.mojang.com/mc/game/version_manifest.json cacheValidMillis=604800000 # Change to invalidate mappings cache on CI -gameVersion=26.2 \ No newline at end of file +gameVersion=26.3 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ae75e77..a36c5267 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ gradle-shadow = "9.4.0" # https://github.com/GradleUp/shadow gradle-spotbugs = "6.4.8" # https://github.com/spotbugs/spotbugs-gradle-plugin minecraft-adventure = "4.15.0" # https://github.com/KyoriPowered/adventure minecraft-bstats = "3.0.0" # https://github.com/Bastian/bStats -minecraft-velocity = "3.5.0-SNAPSHOT" # https://github.com/PaperMC/Velocity +minecraft-velocity = "4.1.2-SNAPSHOT" # https://github.com/PaperMC/Velocity tool-commons-io = "2.6" # https://github.com/apache/commons-io tool-fastutil = "8.5.11" # https://github.com/vigna/fastutil/ tool-google-guava = "28.0-jre" # https://github.com/google/guava diff --git a/plugin/build.gradle b/plugin/build.gradle index 7bc11bd8..fc524135 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -13,7 +13,7 @@ plugins() { } compileJava() { - getOptions().getRelease().set(21) + getOptions().getRelease().set(25) getOptions().setEncoding("UTF-8") } @@ -150,7 +150,8 @@ enum MinecraftVersion { MINECRAFT_1_21_9(773), MINECRAFT_1_21_11(774), MINECRAFT_26_1(775), - MINECRAFT_26_2(776) + MINECRAFT_26_2(776), + MINECRAFT_26_3(777) public static final List WORLD_VERSIONS = List.of( MINECRAFT_1_13, @@ -174,7 +175,8 @@ enum MinecraftVersion { MINECRAFT_1_21_9, MINECRAFT_1_21_11, MINECRAFT_26_1, - MINECRAFT_26_2 + MINECRAFT_26_2, + MINECRAFT_26_3 ) public static final MinecraftVersion MINIMUM_VERSION = MINECRAFT_1_7_2 @@ -309,7 +311,25 @@ File generateData(MinecraftVersion version) { File java = new File(System.getProperty("java.home"), "bin/java") commandLine = ["bash", "-c", String.format(command, java)] } - commandLine.execute([], parent).waitFor() + // The data generator logs a lot to stdout. Groovy's List.execute() wires the child's stdout + // and stderr to pipes that nothing ever drains, so the child blocks as soon as the OS pipe + // buffer fills - which happens at an arbitrary point and stalls the build indefinitely. + // Redirect the output to a file instead, and give the child EOF on stdin so it can never + // block waiting for console input either. + Process process = new ProcessBuilder(commandLine) + .directory(parent) + .redirectErrorStream(true) + .redirectOutput(new File(parent, "generator.log")) + .start() + process.getOutputStream().close() + int exitCode = process.waitFor() + if (exitCode != 0 || !new File(targetDir, "reports/blocks.json").exists()) { + throw new GradleException( + "Generating data for Minecraft ${version.getVersionName()} failed (exit code ${exitCode}), " + + "see ${new File(parent, "generator.log")}. Note that recent Minecraft versions require a " + + "newer JDK than the one running Gradle." + ) + } // Remove/compact files, reduces disk usage from ~2.9gb to ~92mb (or ~9.5mb on a compressed filesystem) jarFile.delete() diff --git a/plugin/mapping/fallbackdata.json b/plugin/mapping/fallbackdata.json index 3c33c215..4fab42f9 100755 --- a/plugin/mapping/fallbackdata.json +++ b/plugin/mapping/fallbackdata.json @@ -1,4 +1,93 @@ { + "MINECRAFT_26_2": { + "minecraft:black_concrete_slab": "minecraft:black_concrete", + "minecraft:black_concrete_stairs": "minecraft:black_concrete", + "minecraft:black_wool_slab": "minecraft:black_wool", + "minecraft:black_wool_stairs": "minecraft:black_wool", + "minecraft:blue_concrete_slab": "minecraft:blue_concrete", + "minecraft:blue_concrete_stairs": "minecraft:blue_concrete", + "minecraft:blue_wool_slab": "minecraft:blue_wool", + "minecraft:blue_wool_stairs": "minecraft:blue_wool", + "minecraft:brown_concrete_slab": "minecraft:brown_concrete", + "minecraft:brown_concrete_stairs": "minecraft:brown_concrete", + "minecraft:brown_wool_slab": "minecraft:brown_wool", + "minecraft:brown_wool_stairs": "minecraft:brown_wool", + "minecraft:cyan_concrete_slab": "minecraft:cyan_concrete", + "minecraft:cyan_concrete_stairs": "minecraft:cyan_concrete", + "minecraft:cyan_wool_slab": "minecraft:cyan_wool", + "minecraft:cyan_wool_stairs": "minecraft:cyan_wool", + "minecraft:gray_concrete_slab": "minecraft:gray_concrete", + "minecraft:gray_concrete_stairs": "minecraft:gray_concrete", + "minecraft:gray_wool_slab": "minecraft:gray_wool", + "minecraft:gray_wool_stairs": "minecraft:gray_wool", + "minecraft:green_concrete_slab": "minecraft:green_concrete", + "minecraft:green_concrete_stairs": "minecraft:green_concrete", + "minecraft:green_wool_slab": "minecraft:green_wool", + "minecraft:green_wool_stairs": "minecraft:green_wool", + "minecraft:light_blue_concrete_slab": "minecraft:light_blue_concrete", + "minecraft:light_blue_concrete_stairs": "minecraft:light_blue_concrete", + "minecraft:light_blue_wool_slab": "minecraft:light_blue_wool", + "minecraft:light_blue_wool_stairs": "minecraft:light_blue_wool", + "minecraft:light_gray_concrete_slab": "minecraft:light_gray_concrete", + "minecraft:light_gray_concrete_stairs": "minecraft:light_gray_concrete", + "minecraft:light_gray_wool_slab": "minecraft:light_gray_wool", + "minecraft:light_gray_wool_stairs": "minecraft:light_gray_wool", + "minecraft:lime_concrete_slab": "minecraft:lime_concrete", + "minecraft:lime_concrete_stairs": "minecraft:lime_concrete", + "minecraft:lime_wool_slab": "minecraft:lime_wool", + "minecraft:lime_wool_stairs": "minecraft:lime_wool", + "minecraft:magenta_concrete_slab": "minecraft:magenta_concrete", + "minecraft:magenta_concrete_stairs": "minecraft:magenta_concrete", + "minecraft:magenta_wool_slab": "minecraft:magenta_wool", + "minecraft:magenta_wool_stairs": "minecraft:magenta_wool", + "minecraft:orange_concrete_slab": "minecraft:orange_concrete", + "minecraft:orange_concrete_stairs": "minecraft:orange_concrete", + "minecraft:orange_poplar_leaves": "minecraft:oak_leaves", + "minecraft:orange_wool_slab": "minecraft:orange_wool", + "minecraft:orange_wool_stairs": "minecraft:orange_wool", + "minecraft:pink_concrete_slab": "minecraft:pink_concrete", + "minecraft:pink_concrete_stairs": "minecraft:pink_concrete", + "minecraft:pink_wool_slab": "minecraft:pink_wool", + "minecraft:pink_wool_stairs": "minecraft:pink_wool", + "minecraft:poplar_button": "minecraft:oak_button", + "minecraft:poplar_door": "minecraft:oak_door", + "minecraft:poplar_fence": "minecraft:oak_fence", + "minecraft:poplar_fence_gate": "minecraft:oak_fence_gate", + "minecraft:poplar_hanging_sign": "minecraft:oak_hanging_sign", + "minecraft:poplar_log": "minecraft:oak_log", + "minecraft:poplar_planks": "minecraft:oak_planks", + "minecraft:poplar_pressure_plate": "minecraft:oak_pressure_plate", + "minecraft:poplar_sapling": "minecraft:oak_sapling", + "minecraft:poplar_shelf": "minecraft:oak_shelf", + "minecraft:poplar_sign": "minecraft:oak_sign", + "minecraft:poplar_slab": "minecraft:oak_slab", + "minecraft:poplar_stairs": "minecraft:oak_stairs", + "minecraft:poplar_trapdoor": "minecraft:oak_trapdoor", + "minecraft:poplar_wall_hanging_sign": "minecraft:oak_wall_hanging_sign", + "minecraft:poplar_wall_sign": "minecraft:oak_wall_sign", + "minecraft:poplar_wood": "minecraft:oak_wood", + "minecraft:potted_poplar_sapling": "minecraft:potted_oak_sapling", + "minecraft:purple_concrete_slab": "minecraft:purple_concrete", + "minecraft:purple_concrete_stairs": "minecraft:purple_concrete", + "minecraft:purple_wool_slab": "minecraft:purple_wool", + "minecraft:purple_wool_stairs": "minecraft:purple_wool", + "minecraft:red_concrete_slab": "minecraft:red_concrete", + "minecraft:red_concrete_stairs": "minecraft:red_concrete", + "minecraft:red_poplar_leaves": "minecraft:oak_leaves", + "minecraft:red_wool_slab": "minecraft:red_wool", + "minecraft:red_wool_stairs": "minecraft:red_wool", + "minecraft:stripped_poplar_log": "minecraft:stripped_oak_log", + "minecraft:stripped_poplar_wood": "minecraft:stripped_oak_wood", + "minecraft:white_concrete_slab": "minecraft:white_concrete", + "minecraft:white_concrete_stairs": "minecraft:white_concrete", + "minecraft:white_wool_slab": "minecraft:white_wool", + "minecraft:white_wool_stairs": "minecraft:white_wool", + "minecraft:yellow_concrete_slab": "minecraft:yellow_concrete", + "minecraft:yellow_concrete_stairs": "minecraft:yellow_concrete", + "minecraft:yellow_poplar_leaves": "minecraft:oak_leaves", + "minecraft:yellow_wool_slab": "minecraft:yellow_wool", + "minecraft:yellow_wool_stairs": "minecraft:yellow_wool" + }, "MINECRAFT_26_1": { "minecraft:sulfur": "minecraft:sandstone", "minecraft:potent_sulfur": "minecraft:end_stone", diff --git a/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java b/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java index 1feb146f..7c4f50ed 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java +++ b/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java @@ -130,7 +130,7 @@ ) public class LimboAPI implements LimboFactory { - private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 776; + private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 777; @MonotonicNonNull private static Logger LOGGER; @@ -357,16 +357,16 @@ public VirtualBlock createSimpleBlock(String modernID, Map prope } @Override - public VirtualBlock createSimpleBlock(short id, boolean modern) { + public VirtualBlock createSimpleBlock(char id, boolean modern) { if (modern) { return SimpleBlock.solid(id); } else { - return SimpleBlock.fromLegacyID(id); + return SimpleBlock.fromLegacyID((short) id); } } @Override - public VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, short id) { + public VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, char id) { return new SimpleBlock(solid, air, motionBlocking, id); } diff --git a/plugin/src/main/java/net/elytrium/limboapi/Settings.java b/plugin/src/main/java/net/elytrium/limboapi/Settings.java index 56b0ee9d..e69294a1 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/Settings.java +++ b/plugin/src/main/java/net/elytrium/limboapi/Settings.java @@ -88,7 +88,7 @@ public static class MAIN { "1_13, 1_13_1, 1_13_2, 1_14, 1_14_1, 1_14_2, 1_14_3, 1_14_4, 1_15, 1_15_1, 1_15_2,", "1_16, 1_16_1, 1_16_2, 1_16_3, 1_16_4, 1_17, 1_17_1, 1_18, 1_18_2, 1_19, 1_19_1, 1_19_3,", "1_20, 1_20_2, 1_20_3, 1_20_5, 1_21, 1_21_2, 1_21_4, 1_21_5, 1_21_6, 1_21_7, 1_21_9, 1_21_11,", - "26_1, 26_2, LATEST" + "26_1, 26_2, 26_3, LATEST" }) public String PREPARE_MIN_VERSION = "1_7_2"; public String PREPARE_MAX_VERSION = "LATEST"; diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/LimboProtocol.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/LimboProtocol.java index d5636219..cb378218 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/protocol/LimboProtocol.java +++ b/plugin/src/main/java/net/elytrium/limboapi/protocol/LimboProtocol.java @@ -198,7 +198,8 @@ public static void init() throws Throwable { createMapping(0x22, ProtocolVersion.MINECRAFT_1_20_5, true), createMapping(0x23, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x22, ProtocolVersion.MINECRAFT_1_21_5, true), - createMapping(0x26, ProtocolVersion.MINECRAFT_1_21_9, true) + createMapping(0x26, ProtocolVersion.MINECRAFT_1_21_9, true), + createMapping(0x27, ProtocolVersion.MINECRAFT_26_3, true) // game_event ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, ChunkDataPacket.class, ChunkDataPacket::new, @@ -219,7 +220,8 @@ public static void init() throws Throwable { createMapping(0x28, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x27, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x2C, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x2D, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x2D, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x2E, ProtocolVersion.MINECRAFT_26_3, true) // level_chunk_with_light ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, ChunkUnloadPacket.class, ChunkUnloadPacket::new, @@ -240,7 +242,8 @@ public static void init() throws Throwable { createMapping(0x21, ProtocolVersion.MINECRAFT_1_20_5, true), createMapping(0x22, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x21, ProtocolVersion.MINECRAFT_1_21_5, true), - createMapping(0x25, ProtocolVersion.MINECRAFT_1_21_9, true) + createMapping(0x25, ProtocolVersion.MINECRAFT_1_21_9, true), + createMapping(0x26, ProtocolVersion.MINECRAFT_26_3, true) // forget_level_chunk ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, DefaultSpawnPositionPacket.class, DefaultSpawnPositionPacket::new, @@ -263,7 +266,8 @@ public static void init() throws Throwable { createMapping(0x5B, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x5A, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x5F, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x61, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x61, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x63, ProtocolVersion.MINECRAFT_26_3, true) // set_default_spawn_position ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, MapDataPacket.class, MapDataPacket::new, @@ -283,7 +287,8 @@ public static void init() throws Throwable { createMapping(0x2D, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x2C, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x31, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x33, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x33, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x34, ProtocolVersion.MINECRAFT_26_3, true) // map_item_data ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, PlayerAbilitiesPacket.class, PlayerAbilitiesPacket::new, @@ -305,7 +310,8 @@ public static void init() throws Throwable { createMapping(0x3A, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x39, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x3E, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x40, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x40, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x41, ProtocolVersion.MINECRAFT_26_3, true) // player_abilities ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, PositionRotationPacket.class, PositionRotationPacket::new, @@ -327,7 +333,8 @@ public static void init() throws Throwable { createMapping(0x42, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x41, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x46, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x48, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x48, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x49, ProtocolVersion.MINECRAFT_26_3, true) // player_position ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, SetExperiencePacket.class, SetExperiencePacket::new, @@ -348,7 +355,8 @@ public static void init() throws Throwable { createMapping(0x61, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x60, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x65, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x67, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x67, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x69, ProtocolVersion.MINECRAFT_26_3, true) // set_experience ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, SetSlotPacket.class, SetSlotPacket::new, @@ -364,7 +372,8 @@ public static void init() throws Throwable { createMapping(0x12, ProtocolVersion.MINECRAFT_1_19_3, true), createMapping(0x14, ProtocolVersion.MINECRAFT_1_19_4, true), createMapping(0x15, ProtocolVersion.MINECRAFT_1_20_2, true), - createMapping(0x14, ProtocolVersion.MINECRAFT_1_21_5, true) + createMapping(0x14, ProtocolVersion.MINECRAFT_1_21_5, true), + createMapping(0x14, ProtocolVersion.MINECRAFT_26_3, true) ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, TimeUpdatePacket.class, TimeUpdatePacket::new, @@ -387,7 +396,8 @@ public static void init() throws Throwable { createMapping(0x6B, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x6A, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x6F, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x71, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x71, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x73, ProtocolVersion.MINECRAFT_26_3, true) // set_time ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, UpdateViewPositionPacket.class, UpdateViewPositionPacket::new, // ViewCentre, ChunkRenderDistanceCenter @@ -405,7 +415,8 @@ public static void init() throws Throwable { createMapping(0x58, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x57, ProtocolVersion.MINECRAFT_1_21_5, true), createMapping(0x5C, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x5E, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x5E, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x60, ProtocolVersion.MINECRAFT_26_3, true) // set_chunk_cache_center ); register(LIMBO_STATE_REGISTRY, PacketDirection.CLIENTBOUND, UpdateTagsPacket.class, UpdateTagsPacket::new, @@ -424,7 +435,8 @@ public static void init() throws Throwable { createMapping(0x78, ProtocolVersion.MINECRAFT_1_20_5, true), createMapping(0x7F, ProtocolVersion.MINECRAFT_1_21_2, true), createMapping(0x84, ProtocolVersion.MINECRAFT_1_21_9, true), - createMapping(0x86, ProtocolVersion.MINECRAFT_26_1, true) + createMapping(0x86, ProtocolVersion.MINECRAFT_26_1, true), + createMapping(0x89, ProtocolVersion.MINECRAFT_26_3, true) // update_tags ); register(LIMBO_STATE_REGISTRY, PacketDirection.SERVERBOUND, @@ -446,7 +458,8 @@ public static void init() throws Throwable { createMapping(0x1B, ProtocolVersion.MINECRAFT_1_20_5, false), createMapping(0x1D, ProtocolVersion.MINECRAFT_1_21_2, false), createMapping(0x1E, ProtocolVersion.MINECRAFT_1_21_6, false), - createMapping(0x1F, ProtocolVersion.MINECRAFT_26_1, false) + createMapping(0x1F, ProtocolVersion.MINECRAFT_26_1, false), + createMapping(0x1F, ProtocolVersion.MINECRAFT_26_3, false) ); register(LIMBO_STATE_REGISTRY, PacketDirection.SERVERBOUND, MovePositionOnlyPacket.class, MovePositionOnlyPacket::new, @@ -467,7 +480,8 @@ public static void init() throws Throwable { createMapping(0x1A, ProtocolVersion.MINECRAFT_1_20_5, false), createMapping(0x1C, ProtocolVersion.MINECRAFT_1_21_2, false), createMapping(0x1D, ProtocolVersion.MINECRAFT_1_21_6, false), - createMapping(0x1E, ProtocolVersion.MINECRAFT_26_1, false) + createMapping(0x1E, ProtocolVersion.MINECRAFT_26_1, false), + createMapping(0x1E, ProtocolVersion.MINECRAFT_26_3, false) ); register(LIMBO_STATE_REGISTRY, PacketDirection.SERVERBOUND, MoveRotationOnlyPacket.class, MoveRotationOnlyPacket::new, @@ -488,7 +502,8 @@ public static void init() throws Throwable { createMapping(0x1C, ProtocolVersion.MINECRAFT_1_20_5, false), createMapping(0x1E, ProtocolVersion.MINECRAFT_1_21_2, false), createMapping(0x1F, ProtocolVersion.MINECRAFT_1_21_6, false), - createMapping(0x20, ProtocolVersion.MINECRAFT_26_1, false) + createMapping(0x20, ProtocolVersion.MINECRAFT_26_1, false), + createMapping(0x20, ProtocolVersion.MINECRAFT_26_3, false) ); register(LIMBO_STATE_REGISTRY, PacketDirection.SERVERBOUND, MoveOnGroundOnlyPacket.class, MoveOnGroundOnlyPacket::new, diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/data/BlockStorage19.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/data/BlockStorage19.java index c42816dc..964a10ce 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/protocol/data/BlockStorage19.java +++ b/plugin/src/main/java/net/elytrium/limboapi/protocol/data/BlockStorage19.java @@ -38,7 +38,7 @@ public class BlockStorage19 implements BlockStorage { private final ProtocolVersion version; private final List palette; - private final Map rawToBlock; + private final Map rawToBlock; private CompactStorage storage; @@ -53,7 +53,7 @@ public BlockStorage19(ProtocolVersion version) { this.storage = this.createStorage(4); } - private BlockStorage19(ProtocolVersion version, List palette, Map rawToBlock, CompactStorage storage) { + private BlockStorage19(ProtocolVersion version, List palette, Map rawToBlock, CompactStorage storage) { this.version = version; this.palette = palette; this.rawToBlock = rawToBlock; @@ -87,7 +87,7 @@ public void set(int posX, int posY, int posZ, @NonNull VirtualBlock block) { private int getIndex(VirtualBlock block) { if (this.storage.getBitsPerEntry() > 8) { - short raw = block.getBlockStateID(this.version); + char raw = block.getBlockStateID(this.version); this.rawToBlock.put(raw, block); return raw; } else { @@ -124,7 +124,7 @@ private CompactStorage createStorage(int bitsPerEntry) { public VirtualBlock get(int posX, int posY, int posZ) { int id = this.storage.get(BlockStorage.index(posX, posY, posZ)); if (this.storage.getBitsPerEntry() > 8) { - return this.rawToBlock.get((short) id); + return this.rawToBlock.get((char) id); } else { return this.palette.get(id); } diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/TeleportConfirmPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/TeleportConfirmPacket.java index 3ec13d5e..5953c366 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/TeleportConfirmPacket.java +++ b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/TeleportConfirmPacket.java @@ -26,11 +26,26 @@ public class TeleportConfirmPacket implements MinecraftPacket { + // 26.3 makes the client echo the position and rotation it is confirming: three doubles and two floats. + private static final int CONFIRMED_POSITION_SIZE = 3 * Double.BYTES + 2 * Float.BYTES; + private int teleportID; + private double posX; + private double posY; + private double posZ; + private float yaw; + private float pitch; @Override public void decode(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion protocolVersion) { this.teleportID = ProtocolUtils.readVarInt(buf); + if (protocolVersion.noLessThan(ProtocolVersion.MINECRAFT_26_3)) { + this.posX = buf.readDouble(); + this.posY = buf.readDouble(); + this.posZ = buf.readDouble(); + this.yaw = buf.readFloat(); + this.pitch = buf.readFloat(); + } } @Override @@ -49,22 +64,47 @@ public boolean handle(MinecraftSessionHandler handler) { @Override public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) { - return 5; + return 5 + (version.noLessThan(ProtocolVersion.MINECRAFT_26_3) ? CONFIRMED_POSITION_SIZE : 0); } @Override public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) { - return 1; + return 1 + (version.noLessThan(ProtocolVersion.MINECRAFT_26_3) ? CONFIRMED_POSITION_SIZE : 0); } @Override public String toString() { return "TeleportConfirm{" + "teleportID=" + this.teleportID + + ", posX=" + this.posX + + ", posY=" + this.posY + + ", posZ=" + this.posZ + + ", yaw=" + this.yaw + + ", pitch=" + this.pitch + "}"; } public int getTeleportID() { return this.teleportID; } + + public double getPosX() { + return this.posX; + } + + public double getPosY() { + return this.posY; + } + + public double getPosZ() { + return this.posZ; + } + + public float getYaw() { + return this.yaw; + } + + public float getPitch() { + return this.pitch; + } } diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java index 3ecbde09..b10eb558 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java +++ b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java @@ -198,7 +198,12 @@ public void encode(ByteBuf buf, Direction direction, ProtocolVersion version) { blockEntityNbt.putInt("z", blockEntityEntry.getPosZ()); } - ProtocolUtils.writeBinaryTag(buf, version, blockEntityNbt); + if (version.noLessThan(ProtocolVersion.MINECRAFT_26_3) && blockEntityNbt.size() == 0) { + // 26.3 makes the block entity nbt optional; an empty one is written as absent. + buf.writeByte(0); + } else { + ProtocolUtils.writeBinaryTag(buf, version, blockEntityNbt); + } } } if (version.compareTo(ProtocolVersion.MINECRAFT_1_17_1) > 0) { @@ -206,13 +211,21 @@ public void encode(ByteBuf buf, Direction direction, ProtocolVersion version) { if (version.compareTo(ProtocolVersion.MINECRAFT_1_20) < 0) { buf.writeBoolean(true); // Trust edges. } - ProtocolUtils.writeVarInt(buf, mask.length); // Skylight mask. - for (long m : mask) { - buf.writeLong(m); - } - ProtocolUtils.writeVarInt(buf, mask.length); // BlockLight mask. - for (long m : mask) { - buf.writeLong(m); + // 26.3 switched the light masks from a long array ("count of longs" + longs, + // i.e. writeBitSet) to a byte array ("count of bytes" + bytes, i.e. byteArray). + if (version.noLessThan(ProtocolVersion.MINECRAFT_26_3)) { + byte[] maskBytes = BitSet.valueOf(mask).toByteArray(); + ProtocolUtils.writeByteArray(buf, maskBytes); // Skylight mask. + ProtocolUtils.writeByteArray(buf, maskBytes); // BlockLight mask. + } else { + ProtocolUtils.writeVarInt(buf, mask.length); // Skylight mask. + for (long m : mask) { + buf.writeLong(m); + } + ProtocolUtils.writeVarInt(buf, mask.length); // BlockLight mask. + for (long m : mask) { + buf.writeLong(m); + } } ProtocolUtils.writeVarInt(buf, 0); // EmptySkylight mask. ProtocolUtils.writeVarInt(buf, 0); // EmptyBlockLight mask. diff --git a/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java b/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java index 24e1566e..9b198403 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java +++ b/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java @@ -116,6 +116,7 @@ import net.kyori.adventure.nbt.BinaryTagIO; import net.kyori.adventure.nbt.BinaryTagTypes; import net.kyori.adventure.nbt.CompoundBinaryTag; +import net.kyori.adventure.nbt.IntBinaryTag; import net.kyori.adventure.nbt.ListBinaryTag; import net.kyori.adventure.nbt.StringBinaryTag; import net.kyori.adventure.text.Component; @@ -249,7 +250,10 @@ protected void refresh() { this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21_2, ProtocolVersion.MINECRAFT_1_21_4); this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21_5, ProtocolVersion.MINECRAFT_1_21_9); this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21_11, ProtocolVersion.MINECRAFT_1_21_11); - this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_26_1, ProtocolVersion.MAXIMUM_VERSION); + // The registry contents are built once per range from its first version, so a range must not + // span a version that changed a registry element's shape. 26.3 changed minecraft:trim_material. + this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_26_1, ProtocolVersion.MINECRAFT_26_2); + this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_26_3, ProtocolVersion.MAXIMUM_VERSION); if (this.shouldUpdateTags) { configPackets.prepare(this::createTagsUpdate, ProtocolVersion.MINECRAFT_1_20_2); } else { @@ -315,7 +319,9 @@ private void createRegistrySyncModern(PreparedPacket packet, ProtocolVersion fro tags = Arrays.copyOf(tags, id + 1); } - tags[id] = Pair.of(element.getString("name"), element.getCompound("element")); + // getCompound() would silently turn a non-compound element (26.3's block_transformer is a + // bare list) into an empty compound, so take the tag as-is. + tags[id] = Pair.of(element.getString("name"), element.get("element")); if (emptyTag == null) { emptyTag = tags[id]; } @@ -851,11 +857,11 @@ private boolean tryRegister(CommandRegistrar registrar, C } } - private CompoundBinaryTag createRegistry(String registryName, Map tags) { + private CompoundBinaryTag createRegistry(String registryName, Map tags) { int id = 0; ListBinaryTag.Builder builder = ListBinaryTag.builder(BinaryTagTypes.COMPOUND); - for (Entry tag : tags.entrySet()) { + for (Entry tag : tags.entrySet()) { builder.add(CompoundBinaryTag.builder() .putString("name", tag.getKey()) .putInt("id", id++) @@ -966,7 +972,10 @@ private JoinGamePacket createJoinGamePacket(ProtocolVersion version) { joinGame.setEntityId(1); joinGame.setIsHardcore(true); joinGame.setGamemode(this.gameMode); - joinGame.setPreviousGamemode((short) -1); + // 26.3 encodes this as an optional - a boolean flag followed by a VarInt, 0 meaning absent - + // while Velocity writes a bare VarInt. Sending 0 is what a 26.3 client reads back as + // "no previous gamemode"; older versions keep the -1 sentinel. + joinGame.setPreviousGamemode(version.noLessThan(ProtocolVersion.MINECRAFT_26_3) ? 0 : -1); joinGame.setDimension(dimension.getModernID()); joinGame.setDifficulty((short) 0); // TODO: different JoinGame packets for different login types, @@ -1239,21 +1248,32 @@ private JoinGamePacket createJoinGamePacket(ProtocolVersion version) { registryContainer.put("minecraft:chicken_sound_variant", this.createRegistry("minecraft:chicken_sound_variant", Map.of("minecraft:classic", soundVariant))); - // Trim material - CompoundBinaryTag trim = CompoundBinaryTag.builder() - .putString("asset_name", "redstone") - .put("description", CompoundBinaryTag.builder() - .putString("color", "#971607") - .putString("translate", "trim_material.minecraft.redstone") - .build()) - .build(); + // Trim material. 26.3 replaced the free-form "asset_name" with a reference to a trim + // palette; the colours themselves are unchanged. + boolean trimPalettes = version.noLessThan(ProtocolVersion.MINECRAFT_26_3); + Map trimColors = Map.ofEntries( + Map.entry("amethyst", "#9A5CC6"), + Map.entry("copper", "#B4684D"), + Map.entry("diamond", "#6EECD2"), + Map.entry("emerald", "#11A036"), + Map.entry("gold", "#DEB12D"), + Map.entry("iron", "#ECECEC"), + Map.entry("lapis", "#416E97"), + Map.entry("netherite", "#625859"), + Map.entry("quartz", "#E3D4C4"), + Map.entry("redstone", "#971607"), + Map.entry("resin", "#FC7812") + ); Map trims = new HashMap<>(); - for (String trimName : List.of("amethyst", "copper", "diamond", - "emerald", "gold", "iron", "lapis", "netherite", "quartz", - "redstone", "resin")) { - trims.put(trimName, trim); - } + trimColors.forEach((trimName, trimColor) -> trims.put(trimName, CompoundBinaryTag.builder() + .putString(trimPalettes ? "palette_id" : "asset_name", + trimPalettes ? "minecraft:trim/" + trimName : trimName) + .put("description", CompoundBinaryTag.builder() + .putString("color", trimColor) + .putString("translate", "trim_material.minecraft." + trimName) + .build()) + .build())); registryContainer.put("minecraft:trim_material", this.createRegistry("minecraft:trim_material", trims)); // Jukebox song @@ -1298,6 +1318,70 @@ private JoinGamePacket createJoinGamePacket(ProtocolVersion version) { .build()); } registryContainer.put("minecraft:timeline", this.createRegistry("minecraft:timeline", timelines)); + + if (version.noLessThan(ProtocolVersion.MINECRAFT_26_3)) { + // 26.3 introduced these two registries. The client resolves them while it builds its + // item data components from the synced item registry, and throws when an entry that + // vanilla items point at is missing, so they have to be present even in a limbo. + // The client also requires at least one transform per entry, so vanilla's shovel + // transform is used as a placeholder for all three: a limbo never transforms blocks, + // so the behaviour is irrelevant and only the shape has to be parseable. + ListBinaryTag placeholderTransform = ListBinaryTag.builder(BinaryTagTypes.COMPOUND) + .add(CompoundBinaryTag.builder() + .put("block_state_provider", CompoundBinaryTag.builder() + .putString("type", "minecraft:rule_based") + .put("rules", ListBinaryTag.builder(BinaryTagTypes.COMPOUND) + .add(CompoundBinaryTag.builder() + .put("if_true", CompoundBinaryTag.builder() + .putString("type", "minecraft:all_of") + .put("predicates", ListBinaryTag.builder(BinaryTagTypes.COMPOUND) + .add(CompoundBinaryTag.builder() + .putString("type", "minecraft:matching_block_tag") + .putString("tag", "minecraft:turns_into_dirt_path") + .build()) + .add(CompoundBinaryTag.builder() + .putString("type", "minecraft:matching_block_tag") + .put("offset", ListBinaryTag.builder(BinaryTagTypes.INT) + .add(IntBinaryTag.intBinaryTag(0)) + .add(IntBinaryTag.intBinaryTag(1)) + .add(IntBinaryTag.intBinaryTag(0)) + .build()) + .putString("tag", "minecraft:air") + .build()) + .build()) + .build()) + .put("then", CompoundBinaryTag.builder() + .putString("id", "minecraft:dirt_path") + .build()) + .build()) + .build()) + .build()) + .put("disallowed_faces", ListBinaryTag.builder(BinaryTagTypes.STRING) + .add(StringBinaryTag.stringBinaryTag("down")) + .build()) + .putInt("item_damage_per_use", 1) + .putString("sound", "minecraft:item.shovel.flatten") + .build()) + .build(); + registryContainer.put("minecraft:block_transformer", this.createRegistry("minecraft:block_transformer", + Map.of( + "minecraft:shovel", placeholderTransform, + "minecraft:axe", placeholderTransform, + "minecraft:hoe", placeholderTransform + ))); + + // Decorated pot patterns, referenced by the pottery sherd items. + Map potPatterns = new HashMap<>(); + for (String potPattern : List.of("angler", "archer", "arms_up", "blade", "brewer", "burn", + "danger", "explorer", "flow", "friend", "guster", "heart", "heartbreak", "howl", + "miner", "mourner", "plenty", "prize", "scrape", "sheaf", "shelter", "skull", "snort")) { + potPatterns.put("minecraft:" + potPattern, CompoundBinaryTag.builder() + .putString("asset_id", "minecraft:" + potPattern + "_pottery_pattern") + .build()); + } + registryContainer.put("minecraft:decorated_pot_pattern", + this.createRegistry("minecraft:decorated_pot_pattern", potPatterns)); + } } } else { CompoundBinaryTag.Builder wolfVariant = CompoundBinaryTag.builder() diff --git a/plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleBlock.java b/plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleBlock.java index 335d3e65..647265b0 100644 --- a/plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleBlock.java +++ b/plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleBlock.java @@ -20,8 +20,9 @@ import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.velocitypowered.api.network.ProtocolVersion; +import io.netty.util.collection.CharObjectHashMap; +import io.netty.util.collection.CharObjectMap; import io.netty.util.collection.ShortObjectHashMap; -import io.netty.util.collection.ShortObjectMap; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -41,15 +42,15 @@ public class SimpleBlock implements VirtualBlock { private static final Gson GSON = new Gson(); private static final ShortObjectHashMap LEGACY_BLOCK_STATE_IDS_MAP = new ShortObjectHashMap<>(); - private static final Map> MODERN_BLOCK_STATE_IDS_MAP = new EnumMap<>(ProtocolVersion.class); - private static final ShortObjectHashMap MODERN_BLOCK_STATE_PROTOCOL_ID_MAP = new ShortObjectHashMap<>(); - private static final Map, Short>> MODERN_BLOCK_STATE_STRING_MAP = new HashMap<>(); + private static final Map> MODERN_BLOCK_STATE_IDS_MAP = new EnumMap<>(ProtocolVersion.class); + private static final CharObjectHashMap MODERN_BLOCK_STATE_PROTOCOL_ID_MAP = new CharObjectHashMap<>(); + private static final Map, Character>> MODERN_BLOCK_STATE_STRING_MAP = new HashMap<>(); private static final Map MODERN_BLOCK_STRING_MAP = new HashMap<>(); private static final ShortObjectHashMap> LEGACY_BLOCK_IDS_MAP = new ShortObjectHashMap<>(); private static final Map> DEFAULT_PROPERTIES_MAP = new HashMap<>(); private static final Map MODERN_ID_REMAP = new HashMap<>(); - public static final SimpleBlock AIR = new SimpleBlock(false, true, false, "minecraft:air", (short) 0, (short) 0); + public static final SimpleBlock AIR = new SimpleBlock(false, true, false, "minecraft:air", (char) 0, (short) 0); @SuppressWarnings("unchecked") public static void init() { @@ -82,7 +83,7 @@ public static void init() { LinkedTreeMap.class ); blockStates.forEach((key, value) -> { - MODERN_BLOCK_STATE_PROTOCOL_ID_MAP.put(Short.valueOf(value), key); + MODERN_BLOCK_STATE_PROTOCOL_ID_MAP.put((char) Integer.parseInt(value), key); String[] stringIDArgs = key.split("\\["); if (!MODERN_BLOCK_STATE_STRING_MAP.containsKey(stringIDArgs[0])) { @@ -90,10 +91,10 @@ public static void init() { } if (stringIDArgs.length == 1) { - MODERN_BLOCK_STATE_STRING_MAP.get(stringIDArgs[0]).put(null, Short.valueOf(value)); + MODERN_BLOCK_STATE_STRING_MAP.get(stringIDArgs[0]).put(null, (char) Integer.parseInt(value)); } else { stringIDArgs[1] = stringIDArgs[1].substring(0, stringIDArgs[1].length() - 1); - MODERN_BLOCK_STATE_STRING_MAP.get(stringIDArgs[0]).put(new HashSet<>(Arrays.asList(stringIDArgs[1].split(","))), Short.valueOf(value)); + MODERN_BLOCK_STATE_STRING_MAP.get(stringIDArgs[0]).put(new HashSet<>(Arrays.asList(stringIDArgs[1].split(","))), (char) Integer.parseInt(value)); } }); @@ -102,7 +103,7 @@ public static void init() { LinkedTreeMap.class ); legacyBlocks.forEach((legacyBlockID, modernID) - -> LEGACY_BLOCK_STATE_IDS_MAP.put(Short.valueOf(legacyBlockID), solid(Short.parseShort(modernID)))); + -> LEGACY_BLOCK_STATE_IDS_MAP.put(Short.valueOf(legacyBlockID), solid((char) Integer.parseInt(modernID)))); LEGACY_BLOCK_STATE_IDS_MAP.put((short) 0, AIR); @@ -112,10 +113,13 @@ public static void init() { ); modernMap.forEach((modernID, versionMap) -> { - Short id = null; + Character id = null; for (ProtocolVersion version : ProtocolVersion.SUPPORTED_VERSIONS) { - id = Short.valueOf(versionMap.getOrDefault(version.toString(), String.valueOf(id))); - SimpleBlock.MODERN_BLOCK_STATE_IDS_MAP.computeIfAbsent(version, k -> new ShortObjectHashMap<>()).put(Short.parseShort(modernID), id); + String mappedID = versionMap.get(version.toString()); + if (mappedID != null) { + id = (char) Integer.parseInt(mappedID); + } + SimpleBlock.MODERN_BLOCK_STATE_IDS_MAP.computeIfAbsent(version, k -> new CharObjectHashMap<>()).put((char) Integer.parseInt(modernID), id); } }); @@ -142,14 +146,14 @@ public static void init() { private final boolean air; private final boolean motionBlocking; // 1.14+ private final String modernID; - private final short blockStateID; + private final char blockStateID; private final short blockID; - public SimpleBlock(boolean solid, boolean air, boolean motionBlocking, short blockStateID) { + public SimpleBlock(boolean solid, boolean air, boolean motionBlocking, char blockStateID) { this(solid, air, motionBlocking, MODERN_BLOCK_STATE_PROTOCOL_ID_MAP.get(blockStateID), blockStateID); } - public SimpleBlock(boolean solid, boolean air, boolean motionBlocking, String modernID, short blockStateID) { + public SimpleBlock(boolean solid, boolean air, boolean motionBlocking, String modernID, char blockStateID) { this(solid, air, motionBlocking, modernID, blockStateID, findId(modernID)); } @@ -163,7 +167,7 @@ private static short findId(String modernID) { return id; } - public SimpleBlock(boolean solid, boolean air, boolean motionBlocking, String modernID, short blockStateID, short blockID) { + public SimpleBlock(boolean solid, boolean air, boolean motionBlocking, String modernID, char blockStateID, short blockID) { this.solid = solid; this.air = air; this.motionBlocking = motionBlocking; @@ -190,7 +194,7 @@ public SimpleBlock(SimpleBlock block) { } @Override - public short getModernID() { + public char getModernID() { return this.blockStateID; } @@ -200,7 +204,7 @@ public String getModernStringID() { } @Override - public short getID(ProtocolVersion version) { + public char getID(ProtocolVersion version) { return this.getBlockStateID(version); } @@ -225,7 +229,7 @@ public boolean isSupportedOn(ProtocolVersion version) { } @Override - public short getBlockStateID(ProtocolVersion version) { + public char getBlockStateID(ProtocolVersion version) { return MODERN_BLOCK_STATE_IDS_MAP.get(version).getOrDefault(this.blockStateID, this.blockStateID); } @@ -264,7 +268,7 @@ public static VirtualBlock fromModernID(String modernID, Map pro return solid(modernID, transformID(modernID, properties)); } - private static short transformID(String modernID, Map properties) { + private static char transformID(String modernID, Map properties) { Map defaultProperties = DEFAULT_PROPERTIES_MAP.get(modernID); if (defaultProperties == null || defaultProperties.isEmpty()) { return transformID(modernID, (Set) null); @@ -281,15 +285,15 @@ private static short transformID(String modernID, Map properties } } - private static short transformID(String modernID, Set properties) { - Map, Short> blockInfo = MODERN_BLOCK_STATE_STRING_MAP.get(modernID); + private static char transformID(String modernID, Set properties) { + Map, Character> blockInfo = MODERN_BLOCK_STATE_STRING_MAP.get(modernID); if (blockInfo == null) { LimboAPI.getLogger().warn("Block " + modernID + " is not supported, and was replaced with air."); return AIR.getModernID(); } - Short id; + Character id; if (properties == null || properties.isEmpty()) { id = blockInfo.get(null); } else { @@ -315,42 +319,42 @@ private static String remapModernID(String modernID) { } @NonNull - public static SimpleBlock solid(short id) { + public static SimpleBlock solid(char id) { return solid(true, MODERN_BLOCK_STATE_PROTOCOL_ID_MAP.get(id), id); } @NonNull - public static SimpleBlock solid(String modernID, short id) { + public static SimpleBlock solid(String modernID, char id) { return solid(true, remapModernID(modernID), id); } @NonNull - public static SimpleBlock solid(boolean motionBlocking, short id) { + public static SimpleBlock solid(boolean motionBlocking, char id) { return new SimpleBlock(true, false, motionBlocking, MODERN_BLOCK_STATE_PROTOCOL_ID_MAP.get(id), id); } @NonNull - public static SimpleBlock solid(boolean motionBlocking, String modernID, short id) { + public static SimpleBlock solid(boolean motionBlocking, String modernID, char id) { return new SimpleBlock(true, false, motionBlocking, remapModernID(modernID), id); } @NonNull - public static SimpleBlock nonSolid(short id) { + public static SimpleBlock nonSolid(char id) { return nonSolid(true, MODERN_BLOCK_STATE_PROTOCOL_ID_MAP.get(id), id); } @NonNull - public static SimpleBlock nonSolid(String modernID, short id) { + public static SimpleBlock nonSolid(String modernID, char id) { return nonSolid(true, remapModernID(modernID), id); } @NonNull - public static SimpleBlock nonSolid(boolean motionBlocking, short id) { + public static SimpleBlock nonSolid(boolean motionBlocking, char id) { return new SimpleBlock(false, false, motionBlocking, MODERN_BLOCK_STATE_PROTOCOL_ID_MAP.get(id), id); } @NonNull - public static SimpleBlock nonSolid(boolean motionBlocking, String modernID, short id) { + public static SimpleBlock nonSolid(boolean motionBlocking, String modernID, char id) { return new SimpleBlock(false, false, motionBlocking, remapModernID(modernID), id); }