From 59e05e30965ae0566c732f642c676fdae67ce01f Mon Sep 17 00:00:00 2001 From: KennyTV Date: Thu, 4 Feb 2021 19:09:56 +0100 Subject: [PATCH] 21w05b --- bukkit-legacy/pom.xml | 2 +- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolVersion.java | 2 +- .../assets/viaversion/data/mapping-1.17.json | 24 +++++++++---------- fabric/pom.xml | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bukkit-legacy/pom.xml b/bukkit-legacy/pom.xml index 00975b6dc..5b1591719 100644 --- a/bukkit-legacy/pom.xml +++ b/bukkit-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0 diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 979603fc5..b69d63668 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index b1d70fde1..73c0ace2e 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 05d95658d..10f8ec590 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 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 a0aaa29cc..c5272f257 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 @@ -54,7 +54,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_16_2 = register(751, "1.16.2"); public static final ProtocolVersion v1_16_3 = register(753, "1.16.3"); public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5)); - public static final ProtocolVersion v1_17 = register(755, 12, "1.17"); + public static final ProtocolVersion v1_17 = register(755, 13, "1.17"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.17.json b/common/src/main/resources/assets/viaversion/data/mapping-1.17.json index c605e9be3..a850a70ac 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.17.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.17.json @@ -18142,9 +18142,9 @@ "18139": "minecraft:sculk_sensor[power=15,sculk_sensor_phase=active,waterlogged=false]", "18140": "minecraft:sculk_sensor[power=15,sculk_sensor_phase=cooldown,waterlogged=true]", "18141": "minecraft:sculk_sensor[power=15,sculk_sensor_phase=cooldown,waterlogged=false]", - "18142": "minecraft:oxidized_copper_block", - "18143": "minecraft:weathered_copper_block", - "18144": "minecraft:exposed_copper_block", + "18142": "minecraft:oxidized_copper", + "18143": "minecraft:weathered_copper", + "18144": "minecraft:exposed_copper", "18145": "minecraft:copper_block", "18146": "minecraft:copper_ore", "18147": "minecraft:oxidized_cut_copper", @@ -18495,7 +18495,7 @@ "18492": "minecraft:cut_copper_slab[type=bottom,waterlogged=false]", "18493": "minecraft:cut_copper_slab[type=double,waterlogged=true]", "18494": "minecraft:cut_copper_slab[type=double,waterlogged=false]", - "18495": "minecraft:waxed_copper", + "18495": "minecraft:waxed_copper_block", "18496": "minecraft:waxed_weathered_copper", "18497": "minecraft:waxed_exposed_copper", "18498": "minecraft:waxed_weathered_cut_copper", @@ -19713,9 +19713,9 @@ "811": "tinted_glass", "812": "powder_snow", "813": "sculk_sensor", - "814": "oxidized_copper_block", - "815": "weathered_copper_block", - "816": "exposed_copper_block", + "814": "oxidized_copper", + "815": "weathered_copper", + "816": "exposed_copper", "817": "copper_block", "818": "copper_ore", "819": "oxidized_cut_copper", @@ -19730,7 +19730,7 @@ "828": "weathered_cut_copper_slab", "829": "exposed_cut_copper_slab", "830": "cut_copper_slab", - "831": "waxed_copper", + "831": "waxed_copper_block", "832": "waxed_weathered_copper", "833": "waxed_exposed_copper", "834": "waxed_weathered_cut_copper", @@ -20784,9 +20784,9 @@ "1022": "minecraft:amethyst_cluster", "1023": "minecraft:spyglass", "1024": "minecraft:copper_block", - "1025": "minecraft:exposed_copper_block", - "1026": "minecraft:weathered_copper_block", - "1027": "minecraft:oxidized_copper_block", + "1025": "minecraft:exposed_copper", + "1026": "minecraft:weathered_copper", + "1027": "minecraft:oxidized_copper", "1028": "minecraft:cut_copper", "1029": "minecraft:exposed_cut_copper", "1030": "minecraft:weathered_cut_copper", @@ -20799,7 +20799,7 @@ "1037": "minecraft:exposed_cut_copper_slab", "1038": "minecraft:weathered_cut_copper_slab", "1039": "minecraft:oxidized_cut_copper_slab", - "1040": "minecraft:waxed_copper", + "1040": "minecraft:waxed_copper_block", "1041": "minecraft:waxed_exposed_copper", "1042": "minecraft:waxed_weathered_copper", "1043": "minecraft:waxed_cut_copper", diff --git a/fabric/pom.xml b/fabric/pom.xml index c0f0f0eaa..862dec5db 100644 --- a/fabric/pom.xml +++ b/fabric/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0 diff --git a/jar/pom.xml b/jar/pom.xml index 1d81c6b48..a1f263cb4 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 36dad9444..15b78f44e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 3.3.0-21w05a + 3.3.0-21w05b pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 63ffde67a..1a52d1c33 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 08b596f8f..ca2091699 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 5a150a7d9..5838ddd75 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-21w05a + 3.3.0-21w05b 4.0.0