From f7bd440a960d93db38ec145c2db4cb256a7c55a6 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Wed, 7 Apr 2021 17:09:23 +0200
Subject: [PATCH] 21w14a

---
 build.gradle.kts                              |  2 +-
 buildSrc/src/main/kotlin/Versions.kt          |  2 +-
 .../packets/EntityPackets1_17.java            |  8 +++++
 .../data/mapping-1.16.2to1.17.json            | 32 +++++++++++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1f869569..3a8381ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "nl.matsv"
-    version = "3.3.0-21w13a"
+    version = "3.3.0-21w14a"
     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 eed844a2..b341e08a 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-21w13a"
+    const val viaversion = "3.3.0-21w14a"
 
     // Common
     const val netty = "4.0.20.Final"
diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
index f78f6317..91418ac0 100644
--- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
+++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -169,6 +169,14 @@ public class EntityPackets1_17 extends EntityRewriter<Protocol1_16_4To1_17> {
                 }
 
                 rewriteParticle(particle);
+            } else if (type == MetaType1_14.Pose) {
+                // Goat LONG_JUMP added at 6
+                int pose = meta.getCastedValue();
+                if (pose == 6) {
+                    meta.setValue(1); // FALL_FLYING
+                } else if (pose > 6) {
+                    meta.setValue(pose - 1);
+                }
             }
             return meta;
         });
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 46bd5a01..6769314b 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
@@ -678,10 +678,14 @@
     "minecraft:weathered_cut_copper_stairs": "minecraft:brick_stairs[",
     "minecraft:exposed_cut_copper_stairs": "minecraft:brick_stairs[",
     "minecraft:cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:waxed_oxidized_cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:waxed_oxidized_cut_copper_slab": "minecraft:brick_slab[",
     "minecraft:oxidized_cut_copper_slab": "minecraft:brick_slab[",
     "minecraft:weathered_cut_copper_slab": "minecraft:brick_slab[",
     "minecraft:exposed_cut_copper_slab": "minecraft:brick_slab[",
     "minecraft:cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:waxed_oxidized_copper": "minecraft:bricks",
+    "minecraft:waxed_oxidized_cut_copper": "minecraft:bricks",
     "minecraft:waxed_copper_block": "minecraft:bricks",
     "minecraft:waxed_weathered_copper": "minecraft:bricks",
     "minecraft:waxed_exposed_copper": "minecraft:bricks",
@@ -996,6 +1000,14 @@
       "id": "minecraft:brick_stairs",
       "name": "1.17 Oxidized Cut Copper Stairs"
     },
+    "minecraft:waxed_oxidized_cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Waxed Oxidized Cut Copper Stairs"
+    },
+    "minecraft:waxed_oxidized_cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Waxed Oxidized Cut Copper Slab"
+    },
     "minecraft:cut_copper_slab": {
       "id": "minecraft:brick_slab",
       "name": "1.17 Cut Copper Slab"
@@ -1020,6 +1032,14 @@
       "id": "minecraft:bricks",
       "name": "1.17 Waxed Exposed Copper"
     },
+    "minecraft:waxed_oxidized_cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Oxidized Cut Copper"
+    },
+    "minecraft:waxed_oxidized_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Oxidized Copper"
+    },
     "minecraft:waxed_weathered_copper": {
       "id": "minecraft:bricks",
       "name": "1.17 Waxed Weathered Copper"
@@ -1184,6 +1204,18 @@
       "id": "minecraft:barrier",
       "name": "1.17 Light"
     },
+    "minecraft:raw_gold": {
+      "id": "minecraft:gold_ore",
+      "name": "1.17 Raw Gold"
+    },
+    "minecraft:raw_iron": {
+      "id": "minecraft:iron_ore",
+      "name": "1.17 Raw Iron"
+    },
+    "minecraft:raw_copper": {
+      "id": "minecraft:iron_ore",
+      "name": "1.17 Raw Copper"
+    },
     "minecraft:goat_spawn_egg": {
       "id": "minecraft:silverfish_spawn_egg",
       "name": "1.17 Goat Spawn Egg"