From a4261d6d9e49e7f1b6173485187ce96a340e46e3 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 9 Nov 2022 16:40:14 +0100
Subject: [PATCH] 22w45a

---
 build.gradle.kts                              |  2 +-
 .../Protocol1_19_1To1_19_3.java               |  4 +++
 .../data/mapping-1.19to1.19.3.json            | 36 +++++++++++++++++--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 952d91bd..fb29311b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.5.0-22w44a-SNAPSHOT"
+    version = "4.5.0-22w45a-SNAPSHOT"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
index bbf3e33a..6835cdf0 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java
@@ -99,6 +99,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
 
         final TagRewriter tagRewriter = new TagRewriter(this);
         tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:non_flammable_wood");
+        tagRewriter.addEmptyTag(RegistryType.ITEM, "minecraft:overworld_natural_logs");
         tagRewriter.registerGeneric(ClientboundPackets1_19_3.TAGS);
 
         new StatisticsRewriter(this).register(ClientboundPackets1_19_3.STATISTICS);
@@ -129,6 +130,9 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
 
                             final String identifier = MAPPINGS.getArgumentTypeMappings().identifier(argumentTypeId);
                             commandRewriter.handleArgument(wrapper, identifier);
+                            if (identifier.equals("minecraft:gamemode")) {
+                                wrapper.write(Type.VAR_INT, 0); // Word
+                            }
 
                             if ((flags & 0x10) != 0) {
                                 wrapper.passthrough(Type.STRING); // Suggestion type
diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.19to1.19.3.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.19to1.19.3.json
index 8e2eed76..f11b7af0 100644
--- a/common/src/main/resources/assets/viabackwards/data/mapping-1.19to1.19.3.json
+++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.19to1.19.3.json
@@ -664,11 +664,14 @@
     "minecraft:bamboo_mosaic_slab": "minecraft:birch_slab[",
     "minecraft:bamboo_fence": "minecraft:birch_fence[",
     "minecraft:bamboo_fence_gate": "minecraft:birch_fence_gate[",
-    "minecraft:bamboo_door": "minecraft:birch_door["
+    "minecraft:bamboo_door": "minecraft:birch_door[",
+    "minecraft:bamboo_block": "minecraft:birch_wood[",
+    "minecraft:stripped_bamboo_block": "minecraft:stripped_birch_wood["
   },
   "argumenttypes": {
     "minecraft:resource_key": "minecraft:resource_or_tag",
-    "minecraft:resource_or_tag_key": "minecraft:resource_or_tag"
+    "minecraft:resource_or_tag_key": "minecraft:resource_or_tag",
+    "minecraft:gamemode": "brigadier:string"
   },
   "blockentities": {
     "hanging_sign": "sign",
@@ -798,6 +801,14 @@
     "minecraft:wither_spawn_egg": {
       "id": "minecraft:squid_spawn_egg",
       "name": "1.19.3 Wither Spawn Egg"
+    },
+    "minecraft:bamboo_block": {
+      "id": "minecraft:birch_wood",
+      "name": "1.19.3 Bamboo Block"
+    },
+    "minecraft:stripped_bamboo_block": {
+      "id": "minecraft:stripped_birch_wood",
+      "name": "1.19.3 Stripped Bamboo Block"
     }
   },
   "sounds": {
@@ -846,7 +857,26 @@
     "block.nether_wood_pressure_plate.click_off": "",
     "block.nether_wood_pressure_plate.click_on": "",
     "block.nether_wood_fence_gate.close": "",
-    "block.nether_wood_fence_gate.open": ""
+    "block.nether_wood_fence_gate.open": "",
+    "block.chiseled_bookshelf.break": "",
+    "block.chiseled_bookshelf.fall": "",
+    "block.chiseled_bookshelf.hit": "",
+    "block.chiseled_bookshelf.insert": "",
+    "block.chiseled_bookshelf.insert.enchanted": "",
+    "block.chiseled_bookshelf.step": "",
+    "block.chiseled_bookshelf.pickup": "",
+    "block.chiseled_bookshelf.pickup.enchanted": "",
+    "block.chiseled_bookshelf.place": "",
+    "block.nether_wood_hanging_sign.step": "",
+    "block.nether_wood_hanging_sign.break": "",
+    "block.nether_wood_hanging_sign.fall": "",
+    "block.nether_wood_hanging_sign.hit": "",
+    "block.nether_wood_hanging_sign.place": "",
+    "block.bamboo_wood_hanging_sign.step": "",
+    "block.bamboo_wood_hanging_sign.break": "",
+    "block.bamboo_wood_hanging_sign.fall": "",
+    "block.bamboo_wood_hanging_sign.hit": "",
+    "block.bamboo_wood_hanging_sign.place": ""
   },
   "entitynames": {
     "camel": "Camel"