From 5878c53aa4c447b5e7aa48a9c5f6cc8ca13842bc Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Tue, 15 May 2018 16:20:23 -0300 Subject: [PATCH 1/2] 18w20a + mapping changes (cherry picked from commit 57b5a0d) --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolVersion.java | 2 +- .../data/SpawnEggRewriter.java | 3 +- .../assets/viaversion/data/mapping-1.12.json | 64 ++--- .../assets/viaversion/data/mapping-1.13.json | 238 +++++++++--------- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- 11 files changed, 153 insertions(+), 168 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index dcda53ae8..654813813 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w19b + 1.4.0-18w20a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 00651e6fe..c2af14c8f 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w19b + 1.4.0-18w20a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 8a4124db0..966fd3b9b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w19b + 1.4.0-18w20a 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index c3e8f2f9a..04c177b42 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -62,7 +62,7 @@ public class ProtocolVersion { register(v1_12 = new ProtocolVersion(335, "1.12")); register(v1_12_1 = new ProtocolVersion(338, "1.12.1")); register(v1_12_2 = new ProtocolVersion(340, "1.12.2")); - register(v1_13 = new ProtocolVersion(374, "18w19b")); + register(v1_13 = new ProtocolVersion(375, "18w20a")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java index 6a1b0524e..9d79f5cb0 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/SpawnEggRewriter.java @@ -30,7 +30,7 @@ public class SpawnEggRewriter { registerSpawnEgg("minecraft:mooshroom"); registerSpawnEgg("minecraft:mule"); registerSpawnEgg("minecraft:ocelot"); - registerSpawnEgg("minecraft:puffer_fish"); + registerSpawnEgg("minecraft:parrot"); registerSpawnEgg("minecraft:pig"); registerSpawnEgg("minecraft:polar_bear"); @@ -44,7 +44,6 @@ public class SpawnEggRewriter { registerSpawnEgg("minecraft:spider"); registerSpawnEgg("minecraft:squid"); registerSpawnEgg("minecraft:stray"); - registerSpawnEgg("minecraft:turtle"); registerSpawnEgg("minecraft:vex"); registerSpawnEgg("minecraft:villager"); registerSpawnEgg("minecraft:vindication_illager"); diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.12.json b/common/src/main/resources/assets/viaversion/data/mapping-1.12.json index 9a0c1f62e..b4b9f753e 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.12.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.12.json @@ -1715,10 +1715,6 @@ "100": "minecraft:acacia_sapling", "101": "minecraft:dark_oak_sapling", "112": "minecraft:bedrock", - "128": "minecraft:flowing_water", - "144": "minecraft:water", - "160": "minecraft:flowing_lava", - "176": "minecraft:lava", "192": "minecraft:sand", "193": "minecraft:red_sand", "208": "minecraft:gravel", @@ -1782,7 +1778,6 @@ "640": "minecraft:red_mushroom", "656": "minecraft:gold_block", "672": "minecraft:iron_block", - "688": "minecraft:double_stone_slab", "704": "minecraft:stone_slab", "705": "minecraft:sandstone_slab", "706": "minecraft:petrified_oak_slab", @@ -1797,7 +1792,6 @@ "768": "minecraft:mossy_cobblestone", "784": "minecraft:obsidian", "800": "minecraft:torch", - "816": "minecraft:fire", "832": "minecraft:mob_spawner", "848": "minecraft:oak_stairs", "864": "minecraft:chest", @@ -1806,7 +1800,6 @@ "928": "minecraft:crafting_table", "960": "minecraft:farmland", "976": "minecraft:furnace", - "992": "minecraft:lit_furnace", "1040": "minecraft:ladder", "1056": "minecraft:rail", "1072": "minecraft:cobblestone_stairs", @@ -1827,7 +1820,6 @@ "1392": "minecraft:netherrack", "1408": "minecraft:soul_sand", "1424": "minecraft:glowstone", - "1440": "minecraft:portal", "1456": "minecraft:jack_o_lantern", "1520": "minecraft:white_stained_glass", "1521": "minecraft:orange_stained_glass", @@ -1871,19 +1863,16 @@ "1808": "minecraft:nether_brick_fence", "1824": "minecraft:nether_brick_stairs", "1856": "minecraft:enchanting_table", - "1904": "minecraft:end_portal", "1920": "minecraft:end_portal_frame", "1936": "minecraft:end_stone", "1952": "minecraft:dragon_egg", "1968": "minecraft:redstone_lamp", - "2000": "minecraft:double_wooden_slab", "2016": "minecraft:oak_slab", "2017": "minecraft:spruce_slab", "2018": "minecraft:birch_slab", "2019": "minecraft:jungle_slab", "2020": "minecraft:acacia_slab", "2021": "minecraft:dark_oak_slab", - "2032": "minecraft:cocoa", "2048": "minecraft:sandstone_stairs", "2064": "minecraft:emerald_ore", "2080": "minecraft:ender_chest", @@ -1896,8 +1885,6 @@ "2208": "minecraft:beacon", "2224": "minecraft:cobblestone_wall", "2225": "minecraft:mossy_cobblestone_wall", - "2256": "minecraft:carrots", - "2272": "minecraft:potatoes", "2288": "minecraft:oak_button", "2320": "minecraft:anvil", "2321": "minecraft:chipped_anvil", @@ -2182,7 +2169,8 @@ "5585": "minecraft:salmon", "5586": "minecraft:clownfish", "5587": "minecraft:pufferfish", - "5600": "minecraft:cooked_fished", + "5600": "minecraft:cooked_cod", + "5601": "minecraft:cooked_salmon", "5616": "minecraft:ink_sac", "5617": "minecraft:rose_red", "5618": "minecraft:cactus_green", @@ -2366,30 +2354,28 @@ "25100305": "minecraft:mooshroom_spawn_egg", "25100306": "minecraft:mule_spawn_egg", "25100307": "minecraft:ocelot_spawn_egg", - "25100308": "minecraft:puffer_fish_spawn_egg", - "25100309": "minecraft:parrot_spawn_egg", - "25100310": "minecraft:pig_spawn_egg", - "25100311": "minecraft:polar_bear_spawn_egg", - "25100312": "minecraft:rabbit_spawn_egg", - "25100313": "minecraft:sheep_spawn_egg", - "25100314": "minecraft:shulker_spawn_egg", - "25100315": "minecraft:silverfish_spawn_egg", - "25100316": "minecraft:skeleton_spawn_egg", - "25100317": "minecraft:skeleton_horse_spawn_egg", - "25100318": "minecraft:slime_spawn_egg", - "25100319": "minecraft:spider_spawn_egg", - "25100320": "minecraft:squid_spawn_egg", - "25100321": "minecraft:stray_spawn_egg", - "25100322": "minecraft:turtle_spawn_egg", - "25100323": "minecraft:vex_spawn_egg", - "25100324": "minecraft:villager_spawn_egg", - "25100325": "minecraft:vindication_illager_spawn_egg", - "25100326": "minecraft:witch_spawn_egg", - "25100327": "minecraft:wither_skeleton_spawn_egg", - "25100328": "minecraft:wolf_spawn_egg", - "25100329": "minecraft:zombie_spawn_egg", - "25100330": "minecraft:zombie_horse_spawn_egg", - "25100331": "minecraft:zombie_pigman_spawn_egg", - "25100332": "minecraft:zombie_villager_spawn_egg" + "25100308": "minecraft:parrot_spawn_egg", + "25100309": "minecraft:pig_spawn_egg", + "25100310": "minecraft:polar_bear_spawn_egg", + "25100311": "minecraft:rabbit_spawn_egg", + "25100312": "minecraft:sheep_spawn_egg", + "25100313": "minecraft:shulker_spawn_egg", + "25100314": "minecraft:silverfish_spawn_egg", + "25100315": "minecraft:skeleton_spawn_egg", + "25100316": "minecraft:skeleton_horse_spawn_egg", + "25100317": "minecraft:slime_spawn_egg", + "25100318": "minecraft:spider_spawn_egg", + "25100319": "minecraft:squid_spawn_egg", + "25100320": "minecraft:stray_spawn_egg", + "25100321": "minecraft:vex_spawn_egg", + "25100322": "minecraft:villager_spawn_egg", + "25100323": "minecraft:vindication_illager_spawn_egg", + "25100324": "minecraft:witch_spawn_egg", + "25100325": "minecraft:wither_skeleton_spawn_egg", + "25100326": "minecraft:wolf_spawn_egg", + "25100327": "minecraft:zombie_spawn_egg", + "25100328": "minecraft:zombie_horse_spawn_egg", + "25100329": "minecraft:zombie_pigman_spawn_egg", + "25100330": "minecraft:zombie_villager_spawn_egg" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.13.json b/common/src/main/resources/assets/viaversion/data/mapping-1.13.json index f5299a919..ef066d884 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.13.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.13.json @@ -6551,86 +6551,86 @@ "6548": "minecraft:prismarine_stairs[facing=west,half=bottom,shape=outer_left,waterlogged=false]", "6549": "minecraft:prismarine_stairs[facing=west,half=bottom,shape=outer_right,waterlogged=true]", "6550": "minecraft:prismarine_stairs[facing=west,half=bottom,shape=outer_right,waterlogged=false]", - "6551": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=straight,waterlogged=true]", - "6552": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=straight,waterlogged=false]", - "6553": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=inner_left,waterlogged=true]", - "6554": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=inner_left,waterlogged=false]", - "6555": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=inner_right,waterlogged=true]", - "6556": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=inner_right,waterlogged=false]", - "6557": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=outer_left,waterlogged=true]", - "6558": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=outer_left,waterlogged=false]", - "6559": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=outer_right,waterlogged=true]", - "6560": "minecraft:prismarine_bricks_stairs[facing=north,half=top,shape=outer_right,waterlogged=false]", - "6561": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=straight,waterlogged=true]", - "6562": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]", - "6563": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=inner_left,waterlogged=true]", - "6564": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=inner_left,waterlogged=false]", - "6565": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=inner_right,waterlogged=true]", - "6566": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=inner_right,waterlogged=false]", - "6567": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=outer_left,waterlogged=true]", - "6568": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=outer_left,waterlogged=false]", - "6569": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=outer_right,waterlogged=true]", - "6570": "minecraft:prismarine_bricks_stairs[facing=north,half=bottom,shape=outer_right,waterlogged=false]", - "6571": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=straight,waterlogged=true]", - "6572": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=straight,waterlogged=false]", - "6573": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=inner_left,waterlogged=true]", - "6574": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=inner_left,waterlogged=false]", - "6575": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=inner_right,waterlogged=true]", - "6576": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=inner_right,waterlogged=false]", - "6577": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=outer_left,waterlogged=true]", - "6578": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=outer_left,waterlogged=false]", - "6579": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=outer_right,waterlogged=true]", - "6580": "minecraft:prismarine_bricks_stairs[facing=east,half=top,shape=outer_right,waterlogged=false]", - "6581": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=straight,waterlogged=true]", - "6582": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=straight,waterlogged=false]", - "6583": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=inner_left,waterlogged=true]", - "6584": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=inner_left,waterlogged=false]", - "6585": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=inner_right,waterlogged=true]", - "6586": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=inner_right,waterlogged=false]", - "6587": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=outer_left,waterlogged=true]", - "6588": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=outer_left,waterlogged=false]", - "6589": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=outer_right,waterlogged=true]", - "6590": "minecraft:prismarine_bricks_stairs[facing=east,half=bottom,shape=outer_right,waterlogged=false]", - "6591": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=straight,waterlogged=true]", - "6592": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=straight,waterlogged=false]", - "6593": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=inner_left,waterlogged=true]", - "6594": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=inner_left,waterlogged=false]", - "6595": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=inner_right,waterlogged=true]", - "6596": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=inner_right,waterlogged=false]", - "6597": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=outer_left,waterlogged=true]", - "6598": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=outer_left,waterlogged=false]", - "6599": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=outer_right,waterlogged=true]", - "6600": "minecraft:prismarine_bricks_stairs[facing=south,half=top,shape=outer_right,waterlogged=false]", - "6601": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=straight,waterlogged=true]", - "6602": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]", - "6603": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=inner_left,waterlogged=true]", - "6604": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=inner_left,waterlogged=false]", - "6605": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=inner_right,waterlogged=true]", - "6606": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=inner_right,waterlogged=false]", - "6607": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=outer_left,waterlogged=true]", - "6608": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=outer_left,waterlogged=false]", - "6609": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=outer_right,waterlogged=true]", - "6610": "minecraft:prismarine_bricks_stairs[facing=south,half=bottom,shape=outer_right,waterlogged=false]", - "6611": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=straight,waterlogged=true]", - "6612": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=straight,waterlogged=false]", - "6613": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=inner_left,waterlogged=true]", - "6614": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=inner_left,waterlogged=false]", - "6615": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=inner_right,waterlogged=true]", - "6616": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=inner_right,waterlogged=false]", - "6617": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=outer_left,waterlogged=true]", - "6618": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=outer_left,waterlogged=false]", - "6619": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=outer_right,waterlogged=true]", - "6620": "minecraft:prismarine_bricks_stairs[facing=west,half=top,shape=outer_right,waterlogged=false]", - "6621": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=straight,waterlogged=true]", - "6622": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]", - "6623": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=inner_left,waterlogged=true]", - "6624": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=inner_left,waterlogged=false]", - "6625": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=inner_right,waterlogged=true]", - "6626": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=inner_right,waterlogged=false]", - "6627": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=outer_left,waterlogged=true]", - "6628": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=outer_left,waterlogged=false]", - "6629": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=outer_right,waterlogged=true]", - "6630": "minecraft:prismarine_bricks_stairs[facing=west,half=bottom,shape=outer_right,waterlogged=false]", + "6551": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=straight,waterlogged=true]", + "6552": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=straight,waterlogged=false]", + "6553": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=inner_left,waterlogged=true]", + "6554": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=inner_left,waterlogged=false]", + "6555": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=inner_right,waterlogged=true]", + "6556": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=inner_right,waterlogged=false]", + "6557": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=outer_left,waterlogged=true]", + "6558": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=outer_left,waterlogged=false]", + "6559": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=outer_right,waterlogged=true]", + "6560": "minecraft:prismarine_brick_stairs[facing=north,half=top,shape=outer_right,waterlogged=false]", + "6561": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=straight,waterlogged=true]", + "6562": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=straight,waterlogged=false]", + "6563": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=inner_left,waterlogged=true]", + "6564": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=inner_left,waterlogged=false]", + "6565": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=inner_right,waterlogged=true]", + "6566": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=inner_right,waterlogged=false]", + "6567": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=outer_left,waterlogged=true]", + "6568": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=outer_left,waterlogged=false]", + "6569": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=outer_right,waterlogged=true]", + "6570": "minecraft:prismarine_brick_stairs[facing=north,half=bottom,shape=outer_right,waterlogged=false]", + "6571": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=straight,waterlogged=true]", + "6572": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=straight,waterlogged=false]", + "6573": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=inner_left,waterlogged=true]", + "6574": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=inner_left,waterlogged=false]", + "6575": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=inner_right,waterlogged=true]", + "6576": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=inner_right,waterlogged=false]", + "6577": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=outer_left,waterlogged=true]", + "6578": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=outer_left,waterlogged=false]", + "6579": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=outer_right,waterlogged=true]", + "6580": "minecraft:prismarine_brick_stairs[facing=east,half=top,shape=outer_right,waterlogged=false]", + "6581": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=straight,waterlogged=true]", + "6582": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=straight,waterlogged=false]", + "6583": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=inner_left,waterlogged=true]", + "6584": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=inner_left,waterlogged=false]", + "6585": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=inner_right,waterlogged=true]", + "6586": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=inner_right,waterlogged=false]", + "6587": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=outer_left,waterlogged=true]", + "6588": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=outer_left,waterlogged=false]", + "6589": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=outer_right,waterlogged=true]", + "6590": "minecraft:prismarine_brick_stairs[facing=east,half=bottom,shape=outer_right,waterlogged=false]", + "6591": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=straight,waterlogged=true]", + "6592": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=straight,waterlogged=false]", + "6593": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=inner_left,waterlogged=true]", + "6594": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=inner_left,waterlogged=false]", + "6595": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=inner_right,waterlogged=true]", + "6596": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=inner_right,waterlogged=false]", + "6597": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=outer_left,waterlogged=true]", + "6598": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=outer_left,waterlogged=false]", + "6599": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=outer_right,waterlogged=true]", + "6600": "minecraft:prismarine_brick_stairs[facing=south,half=top,shape=outer_right,waterlogged=false]", + "6601": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=straight,waterlogged=true]", + "6602": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=straight,waterlogged=false]", + "6603": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=inner_left,waterlogged=true]", + "6604": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=inner_left,waterlogged=false]", + "6605": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=inner_right,waterlogged=true]", + "6606": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=inner_right,waterlogged=false]", + "6607": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=outer_left,waterlogged=true]", + "6608": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=outer_left,waterlogged=false]", + "6609": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=outer_right,waterlogged=true]", + "6610": "minecraft:prismarine_brick_stairs[facing=south,half=bottom,shape=outer_right,waterlogged=false]", + "6611": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=straight,waterlogged=true]", + "6612": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=straight,waterlogged=false]", + "6613": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=inner_left,waterlogged=true]", + "6614": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=inner_left,waterlogged=false]", + "6615": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=inner_right,waterlogged=true]", + "6616": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=inner_right,waterlogged=false]", + "6617": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=outer_left,waterlogged=true]", + "6618": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=outer_left,waterlogged=false]", + "6619": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=outer_right,waterlogged=true]", + "6620": "minecraft:prismarine_brick_stairs[facing=west,half=top,shape=outer_right,waterlogged=false]", + "6621": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=straight,waterlogged=true]", + "6622": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=straight,waterlogged=false]", + "6623": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=inner_left,waterlogged=true]", + "6624": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=inner_left,waterlogged=false]", + "6625": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=inner_right,waterlogged=true]", + "6626": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=inner_right,waterlogged=false]", + "6627": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=outer_left,waterlogged=true]", + "6628": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=outer_left,waterlogged=false]", + "6629": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=outer_right,waterlogged=true]", + "6630": "minecraft:prismarine_brick_stairs[facing=west,half=bottom,shape=outer_right,waterlogged=false]", "6631": "minecraft:dark_prismarine_stairs[facing=north,half=top,shape=straight,waterlogged=true]", "6632": "minecraft:dark_prismarine_stairs[facing=north,half=top,shape=straight,waterlogged=false]", "6633": "minecraft:dark_prismarine_stairs[facing=north,half=top,shape=inner_left,waterlogged=true]", @@ -6717,12 +6717,12 @@ "6714": "minecraft:prismarine_slab[type=bottom,waterlogged=false]", "6715": "minecraft:prismarine_slab[type=double,waterlogged=true]", "6716": "minecraft:prismarine_slab[type=double,waterlogged=false]", - "6717": "minecraft:prismarine_bricks_slab[type=top,waterlogged=true]", - "6718": "minecraft:prismarine_bricks_slab[type=top,waterlogged=false]", - "6719": "minecraft:prismarine_bricks_slab[type=bottom,waterlogged=true]", - "6720": "minecraft:prismarine_bricks_slab[type=bottom,waterlogged=false]", - "6721": "minecraft:prismarine_bricks_slab[type=double,waterlogged=true]", - "6722": "minecraft:prismarine_bricks_slab[type=double,waterlogged=false]", + "6717": "minecraft:prismarine_brick_slab[type=top,waterlogged=true]", + "6718": "minecraft:prismarine_brick_slab[type=top,waterlogged=false]", + "6719": "minecraft:prismarine_brick_slab[type=bottom,waterlogged=true]", + "6720": "minecraft:prismarine_brick_slab[type=bottom,waterlogged=false]", + "6721": "minecraft:prismarine_brick_slab[type=double,waterlogged=true]", + "6722": "minecraft:prismarine_brick_slab[type=double,waterlogged=false]", "6723": "minecraft:dark_prismarine_slab[type=top,waterlogged=true]", "6724": "minecraft:dark_prismarine_slab[type=top,waterlogged=false]", "6725": "minecraft:dark_prismarine_slab[type=bottom,waterlogged=true]", @@ -8319,33 +8319,33 @@ "8316": "minecraft:green_concrete_powder", "8317": "minecraft:red_concrete_powder", "8318": "minecraft:black_concrete_powder", - "8319": "minecraft:kelp", - "8320": "minecraft:kelp_top[age=0]", - "8321": "minecraft:kelp_top[age=1]", - "8322": "minecraft:kelp_top[age=2]", - "8323": "minecraft:kelp_top[age=3]", - "8324": "minecraft:kelp_top[age=4]", - "8325": "minecraft:kelp_top[age=5]", - "8326": "minecraft:kelp_top[age=6]", - "8327": "minecraft:kelp_top[age=7]", - "8328": "minecraft:kelp_top[age=8]", - "8329": "minecraft:kelp_top[age=9]", - "8330": "minecraft:kelp_top[age=10]", - "8331": "minecraft:kelp_top[age=11]", - "8332": "minecraft:kelp_top[age=12]", - "8333": "minecraft:kelp_top[age=13]", - "8334": "minecraft:kelp_top[age=14]", - "8335": "minecraft:kelp_top[age=15]", - "8336": "minecraft:kelp_top[age=16]", - "8337": "minecraft:kelp_top[age=17]", - "8338": "minecraft:kelp_top[age=18]", - "8339": "minecraft:kelp_top[age=19]", - "8340": "minecraft:kelp_top[age=20]", - "8341": "minecraft:kelp_top[age=21]", - "8342": "minecraft:kelp_top[age=22]", - "8343": "minecraft:kelp_top[age=23]", - "8344": "minecraft:kelp_top[age=24]", - "8345": "minecraft:kelp_top[age=25]", + "8319": "minecraft:kelp_plant", + "8320": "minecraft:kelp[age=0]", + "8321": "minecraft:kelp[age=1]", + "8322": "minecraft:kelp[age=2]", + "8323": "minecraft:kelp[age=3]", + "8324": "minecraft:kelp[age=4]", + "8325": "minecraft:kelp[age=5]", + "8326": "minecraft:kelp[age=6]", + "8327": "minecraft:kelp[age=7]", + "8328": "minecraft:kelp[age=8]", + "8329": "minecraft:kelp[age=9]", + "8330": "minecraft:kelp[age=10]", + "8331": "minecraft:kelp[age=11]", + "8332": "minecraft:kelp[age=12]", + "8333": "minecraft:kelp[age=13]", + "8334": "minecraft:kelp[age=14]", + "8335": "minecraft:kelp[age=15]", + "8336": "minecraft:kelp[age=16]", + "8337": "minecraft:kelp[age=17]", + "8338": "minecraft:kelp[age=18]", + "8339": "minecraft:kelp[age=19]", + "8340": "minecraft:kelp[age=20]", + "8341": "minecraft:kelp[age=21]", + "8342": "minecraft:kelp[age=22]", + "8343": "minecraft:kelp[age=23]", + "8344": "minecraft:kelp[age=24]", + "8345": "minecraft:kelp[age=25]", "8346": "minecraft:dried_kelp_block", "8347": "minecraft:turtle_egg[eggs=1,hatch=0]", "8348": "minecraft:turtle_egg[eggs=1,hatch=1]", @@ -8537,7 +8537,7 @@ "120": "minecraft:red_sandstone_slab", "121": "minecraft:purpur_slab", "122": "minecraft:prismarine_slab", - "123": "minecraft:prismarine_bricks_slab", + "123": "minecraft:prismarine_brick_slab", "124": "minecraft:dark_prismarine_slab", "125": "minecraft:smooth_quartz", "126": "minecraft:smooth_red_sandstone", @@ -8755,7 +8755,7 @@ "338": "minecraft:prismarine_bricks", "339": "minecraft:dark_prismarine", "340": "minecraft:prismarine_stairs", - "341": "minecraft:prismarine_bricks_stairs", + "341": "minecraft:prismarine_brick_stairs", "342": "minecraft:dark_prismarine_stairs", "343": "minecraft:sea_lantern", "344": "minecraft:red_sandstone", @@ -8957,7 +8957,7 @@ "540": "minecraft:brick", "541": "minecraft:clay_ball", "542": "minecraft:sugar_cane", - "543": "minecraft:kelp_top", + "543": "minecraft:kelp", "544": "minecraft:dried_kelp_block", "545": "minecraft:paper", "546": "minecraft:book", @@ -9041,7 +9041,7 @@ "624": "minecraft:blaze_spawn_egg", "625": "minecraft:cave_spider_spawn_egg", "626": "minecraft:chicken_spawn_egg", - "627": "minecraft:cod_mob_spawn_egg", + "627": "minecraft:cod_spawn_egg", "628": "minecraft:cow_spawn_egg", "629": "minecraft:creeper_spawn_egg", "630": "minecraft:dolphin_spawn_egg", @@ -9066,7 +9066,7 @@ "649": "minecraft:polar_bear_spawn_egg", "650": "minecraft:pufferfish_spawn_egg", "651": "minecraft:rabbit_spawn_egg", - "652": "minecraft:salmon_mob_spawn_egg", + "652": "minecraft:salmon_spawn_egg", "653": "minecraft:sheep_spawn_egg", "654": "minecraft:shulker_spawn_egg", "655": "minecraft:silverfish_spawn_egg", @@ -9189,4 +9189,4 @@ "772": "minecraft:nautilus_shell", "773": "minecraft:heart_of_the_sea" } -} \ No newline at end of file +} diff --git a/jar/pom.xml b/jar/pom.xml index cf29a534e..f963b1519 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w19b + 1.4.0-18w20a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 859171c5b..f1a0600db 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 1.4.0-18w19b + 1.4.0-18w20a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 97ac7d2f5..1713cb37e 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w19b + 1.4.0-18w20a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index fbe1d5a79..06ebf70b9 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w19b + 1.4.0-18w20a 4.0.0 From bb64329b074b714ffda341933b4afba064a397e6 Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Wed, 16 May 2018 17:12:43 -0300 Subject: [PATCH 2/2] 18w20b --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../ViaVersion/api/protocol/ProtocolVersion.java | 2 +- .../ProtocolSnapshotTo1_12_2.java | 14 ++++++++++++-- .../assets/viaversion/data/mapping-1.12.json | 8 ++++---- .../assets/viaversion/data/mapping-1.13.json | 8 ++++---- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- 11 files changed, 28 insertions(+), 18 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 654813813..5e9c89242 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w20a + 1.4.0-18w20b 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index c2af14c8f..697a444ee 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w20a + 1.4.0-18w20b 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 966fd3b9b..da94e573d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w20a + 1.4.0-18w20b 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 04c177b42..81b10ca1d 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -62,7 +62,7 @@ public class ProtocolVersion { register(v1_12 = new ProtocolVersion(335, "1.12")); register(v1_12_1 = new ProtocolVersion(338, "1.12.1")); register(v1_12_2 = new ProtocolVersion(340, "1.12.2")); - register(v1_13 = new ProtocolVersion(375, "18w20a")); + register(v1_13 = new ProtocolVersion(376, "18w20b")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java index ffe0ccafc..d126b0766 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java @@ -1,5 +1,7 @@ package us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.chat.ComponentSerializer; import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.entities.Entity1_13Types; @@ -27,6 +29,12 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.type.Particle1_13T public class ProtocolSnapshotTo1_12_2 extends Protocol { public static final Particle1_13Type PARTICLE_TYPE = new Particle1_13Type(); + public static String legacyTextToJson(String legacyText) { + return ComponentSerializer.toString( + TextComponent.fromLegacyText(legacyText) + ); + } + static { MappingData.init(); } @@ -313,8 +321,8 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol { if (action == 0 || action == 2) { wrapper.passthrough(Type.STRING); // Display Name - wrapper.read(Type.STRING); // Prefix !REMOVED! TODO alternative or drop? - wrapper.read(Type.STRING); // Suffix !REMOVED! + String prefix = wrapper.read(Type.STRING); // Prefix moved + String suffix = wrapper.read(Type.STRING); // Suffix moved wrapper.passthrough(Type.BYTE); // Flags @@ -329,6 +337,8 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol { else wrapper.write(Type.VAR_INT, (int) color); + wrapper.write(Type.STRING, legacyTextToJson(prefix)); // Prefix + wrapper.write(Type.STRING, legacyTextToJson(suffix)); // Suffix } } }); diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.12.json b/common/src/main/resources/assets/viaversion/data/mapping-1.12.json index b4b9f753e..c1a1f6dba 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.12.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.12.json @@ -673,7 +673,7 @@ "1615": "minecraft:mushroom_stem[down=true,east=true,north=true,south=true,up=true,west=true]", "1616": "minecraft:iron_bars[east=false,north=false,south=false,waterlogged=false,west=false]", "1632": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]", - "1648": "minecraft:melon_block", + "1648": "minecraft:melon", "1664": "minecraft:pumpkin_stem[age=0]", "1665": "minecraft:pumpkin_stem[age=1]", "1666": "minecraft:pumpkin_stem[age=2]", @@ -1852,7 +1852,7 @@ "1600": "minecraft:red_mushroom_block", "1616": "minecraft:iron_bars", "1632": "minecraft:glass_pane", - "1648": "minecraft:melon_block", + "1648": "minecraft:melon", "1696": "minecraft:vine", "1712": "minecraft:oak_fence_gate", "1728": "minecraft:brick_stairs", @@ -2210,7 +2210,7 @@ "5712": "minecraft:cookie", "5728": "minecraft:filled_map", "5744": "minecraft:shears", - "5760": "minecraft:melon", + "5760": "minecraft:melon_slice", "5776": "minecraft:pumpkin_seeds", "5792": "minecraft:melon_seeds", "5808": "minecraft:beef", @@ -2232,7 +2232,7 @@ "6064": "minecraft:brewing_stand", "6080": "minecraft:cauldron", "6096": "minecraft:ender_eye", - "6112": "minecraft:speckled_melon", + "6112": "minecraft:glistering_melon_slice", "6144": "minecraft:experience_bottle", "6160": "minecraft:fire_charge", "6176": "minecraft:writable_book", diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.13.json b/common/src/main/resources/assets/viaversion/data/mapping-1.13.json index ef066d884..e9cbece47 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.13.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.13.json @@ -4153,7 +4153,7 @@ "4150": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=true,west=false]", "4151": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=true]", "4152": "minecraft:glass_pane[east=false,north=false,south=false,waterlogged=false,west=false]", - "4153": "minecraft:melon_block", + "4153": "minecraft:melon", "4154": "minecraft:attached_pumpkin_stem[facing=north]", "4155": "minecraft:attached_pumpkin_stem[facing=east]", "4156": "minecraft:attached_pumpkin_stem[facing=south]", @@ -8616,7 +8616,7 @@ "199": "minecraft:mushroom_stem", "200": "minecraft:iron_bars", "201": "minecraft:glass_pane", - "202": "minecraft:melon_block", + "202": "minecraft:melon", "203": "minecraft:vine", "204": "minecraft:oak_fence_gate", "205": "minecraft:spruce_fence_gate", @@ -9013,7 +9013,7 @@ "596": "minecraft:cookie", "597": "minecraft:filled_map", "598": "minecraft:shears", - "599": "minecraft:melon", + "599": "minecraft:melon_slice", "600": "minecraft:dried_kelp", "601": "minecraft:pumpkin_seeds", "602": "minecraft:melon_seeds", @@ -9036,7 +9036,7 @@ "619": "minecraft:brewing_stand", "620": "minecraft:cauldron", "621": "minecraft:ender_eye", - "622": "minecraft:speckled_melon", + "622": "minecraft:glistering_melon_slice", "623": "minecraft:bat_spawn_egg", "624": "minecraft:blaze_spawn_egg", "625": "minecraft:cave_spider_spawn_egg", diff --git a/jar/pom.xml b/jar/pom.xml index f963b1519..3c5ee393c 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w20a + 1.4.0-18w20b 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index f1a0600db..0010ab504 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 1.4.0-18w20a + 1.4.0-18w20b pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 1713cb37e..db54e487f 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w20a + 1.4.0-18w20b 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 06ebf70b9..033f8b345 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.0-18w20a + 1.4.0-18w20b 4.0.0