From a0bb191e9f182f9f350b27741642e6ead6270809 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 17 Mar 2021 17:44:17 +0100 Subject: [PATCH] 21w11a --- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- .../data/mapping-1.16.2to1.17.json | 51 +++++++++++++------ 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 979ba4d6..7729919e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { group = "nl.matsv" - version = "3.3.0-21w10a" + version = "3.3.0-21w11a" description = "Allow older clients to join newer server versions." } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index eb668e79..efbe75a8 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,6 @@ object Versions { // ViaVersion - const val viaversion = "3.3.0-21w10a" + const val viaversion = "3.3.0-21w11a" // Common const val netty = "4.0.20.Final" diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json index 7fbae49a..4cd63b66 100644 --- a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json +++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json @@ -10,18 +10,30 @@ "minecraft:water_cauldron[level=2]": "minecraft:cauldron[level=2]", "minecraft:water_cauldron[level=3]": "minecraft:cauldron[level=3]", "minecraft:lava_cauldron": "minecraft:cauldron[level=3]", - "minecraft:lightning_rod[facing=north,powered=true]": "minecraft:end_rod[facing=north]", - "minecraft:lightning_rod[facing=north,powered=false]": "minecraft:end_rod[facing=north]", - "minecraft:lightning_rod[facing=east,powered=true]": "minecraft:end_rod[facing=east]", - "minecraft:lightning_rod[facing=east,powered=false]": "minecraft:end_rod[facing=east]", - "minecraft:lightning_rod[facing=south,powered=true]": "minecraft:end_rod[facing=south]", - "minecraft:lightning_rod[facing=south,powered=false]": "minecraft:end_rod[facing=south]", - "minecraft:lightning_rod[facing=west,powered=true]": "minecraft:end_rod[facing=west]", - "minecraft:lightning_rod[facing=west,powered=false]": "minecraft:end_rod[facing=west]", - "minecraft:lightning_rod[facing=up,powered=true]": "minecraft:end_rod[facing=up]", - "minecraft:lightning_rod[facing=up,powered=false]": "minecraft:end_rod[facing=up]", - "minecraft:lightning_rod[facing=down,powered=true]": "minecraft:end_rod[facing=down]", - "minecraft:lightning_rod[facing=down,powered=false]": "minecraft:end_rod[facing=down]", + "minecraft:lightning_rod[facing=north,powered=true,waterlogged=true]": "minecraft:end_rod[facing=north]", + "minecraft:lightning_rod[facing=north,powered=true,waterlogged=false]": "minecraft:end_rod[facing=north]", + "minecraft:lightning_rod[facing=north,powered=false,waterlogged=true]": "minecraft:end_rod[facing=north]", + "minecraft:lightning_rod[facing=north,powered=false,waterlogged=false]": "minecraft:end_rod[facing=north]", + "minecraft:lightning_rod[facing=east,powered=true,waterlogged=true]": "minecraft:end_rod[facing=east]", + "minecraft:lightning_rod[facing=east,powered=true,waterlogged=false]": "minecraft:end_rod[facing=east]", + "minecraft:lightning_rod[facing=east,powered=false,waterlogged=true]": "minecraft:end_rod[facing=east]", + "minecraft:lightning_rod[facing=east,powered=false,waterlogged=false]": "minecraft:end_rod[facing=east]", + "minecraft:lightning_rod[facing=south,powered=true,waterlogged=true]": "minecraft:end_rod[facing=south]", + "minecraft:lightning_rod[facing=south,powered=true,waterlogged=false]": "minecraft:end_rod[facing=south]", + "minecraft:lightning_rod[facing=south,powered=false,waterlogged=true]": "minecraft:end_rod[facing=south]", + "minecraft:lightning_rod[facing=south,powered=false,waterlogged=false]": "minecraft:end_rod[facing=south]", + "minecraft:lightning_rod[facing=west,powered=true,waterlogged=true]": "minecraft:end_rod[facing=west]", + "minecraft:lightning_rod[facing=west,powered=true,waterlogged=false]": "minecraft:end_rod[facing=west]", + "minecraft:lightning_rod[facing=west,powered=false,waterlogged=true]": "minecraft:end_rod[facing=west]", + "minecraft:lightning_rod[facing=west,powered=false,waterlogged=false]": "minecraft:end_rod[facing=west]", + "minecraft:lightning_rod[facing=up,powered=true,waterlogged=true]": "minecraft:end_rod[facing=up]", + "minecraft:lightning_rod[facing=up,powered=true,waterlogged=false]": "minecraft:end_rod[facing=up]", + "minecraft:lightning_rod[facing=up,powered=false,waterlogged=true]": "minecraft:end_rod[facing=up]", + "minecraft:lightning_rod[facing=up,powered=false,waterlogged=false]": "minecraft:end_rod[facing=up]", + "minecraft:lightning_rod[facing=down,powered=true,waterlogged=true]": "minecraft:end_rod[facing=down]", + "minecraft:lightning_rod[facing=down,powered=true,waterlogged=false]": "minecraft:end_rod[facing=down]", + "minecraft:lightning_rod[facing=down,powered=false,waterlogged=true]": "minecraft:end_rod[facing=down]", + "minecraft:lightning_rod[facing=down,powered=false,waterlogged=false]": "minecraft:end_rod[facing=down]", "minecraft:tuff": "minecraft:cobblestone", "minecraft:calcite": "minecraft:polished_diorite", "minecraft:tinted_glass": "minecraft:black_stained_glass", @@ -657,8 +669,8 @@ "minecraft:hanging_roots": "minecraft:fern", "minecraft:azalea_leaves": "minecraft:oak_leaves[", "minecraft:azalea_leaves_flowers": "minecraft:oak_leaves[", - "minecraft:cave_vines_head": "minecraft:fern", - "minecraft:cave_vines_body": "minecraft:fern", + "minecraft:cave_vines": "minecraft:fern", + "minecraft:cave_vines_plant": "minecraft:fern", "minecraft:big_dripleaf": "minecraft:oak_leaves[distance=1,persistent=true]", "minecraft:small_dripleaf": "minecraft:fern", "minecraft:big_dripleaf_stem": "minecraft:fern", @@ -1345,7 +1357,10 @@ "entity.glow_item_frame.break": "", "entity.glow_item_frame.place": "", "entity.glow_item_frame.remove_item": "", - "entity.glow_item_frame.rotate_item": "" + "entity.glow_item_frame.rotate_item": "", + "item.axe.scrape": "", + "item.axe.wax_off": "", + "item.honeycomb.wax_on": "" }, "particles": { "small_flame": "flame", @@ -1359,6 +1374,10 @@ "glow": "happy_villager", "glow_squid_ink": "squid_ink", "falling_spore_blossom": "falling_water", - "spore_blossom_air": "mycelium" + "spore_blossom_air": "mycelium", + "wax_on": "happy_villager", + "wax_off": "happy_villager", + "electric_spark": "happy_villager", + "scrape": "happy_villager" } } \ No newline at end of file