From 95bc340b065d2bb725808d50d681817d859ace06 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Fri, 12 Nov 2021 13:18:02 +0100
Subject: [PATCH] Fix play record, remove unused 1.18 code

---
 build.gradle.kts                              |  2 +-
 .../Protocol1_17_1To1_18.java                 |  2 +-
 .../packets/BlockItemPackets1_18.java         | 28 ++++++++++---------
 .../packets/EntityPackets1_18.java            | 11 ++------
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ffddaf3c..798b4645 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.1.0-21w44a-SNAPSHOT"
+    version = "4.1.0-1.18-pre1-SNAPSHOT"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java
index fcfeadb7..7a595aba 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java
@@ -78,7 +78,7 @@ public final class Protocol1_17_1To1_18 extends BackwardsProtocol<ClientboundPac
 
     @Override
     public void init(final UserConnection connection) {
-        addEntityTracker(connection, new EntityTrackerBase(connection, Entity1_17Types.PLAYER)); //TODO
+        addEntityTracker(connection, new EntityTrackerBase(connection, Entity1_17Types.PLAYER));
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
index 440bcb40..ddb0a631 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
@@ -55,8 +55,6 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
 
     @Override
     protected void registerPackets() {
-        //final BlockRewriter blockRewriter = new BlockRewriter(protocol, Type.POSITION1_14);
-
         new RecipeRewriter1_16(protocol).registerDefaultHandler(ClientboundPackets1_18.DECLARE_RECIPES);
 
         registerSetCooldown(ClientboundPackets1_18.COOLDOWN);
@@ -67,11 +65,21 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
         registerAdvancements(ClientboundPackets1_18.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
         registerClickWindow1_17_1(ServerboundPackets1_17.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM);
 
-        /*blockRewriter.registerAcknowledgePlayerDigging(ClientboundPackets1_18.ACKNOWLEDGE_PLAYER_DIGGING);
-        blockRewriter.registerBlockAction(ClientboundPackets1_18.BLOCK_ACTION);
-        blockRewriter.registerEffect(ClientboundPackets1_18.EFFECT, 1010, 2001);
-        blockRewriter.registerBlockChange(ClientboundPackets1_18.BLOCK_CHANGE);
-        blockRewriter.registerVarLongMultiBlockChange(ClientboundPackets1_18.MULTI_BLOCK_CHANGE);*/
+        protocol.registerClientbound(ClientboundPackets1_18.EFFECT, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // Effect id
+                map(Type.POSITION1_14); // Location
+                map(Type.INT); // Data
+                handler(wrapper -> {
+                    int id = wrapper.get(Type.INT, 0);
+                    int data = wrapper.get(Type.INT, 1);
+                    if (id == 1010) { // Play record
+                        wrapper.set(Type.INT, 1, protocol.getMappingData().getNewItemId(data));
+                    }
+                });
+            }
+        });
 
         registerCreativeInvAction(ServerboundPackets1_17.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
 
@@ -162,12 +170,6 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
                         for (int i = 0; i < ChunkSection.BIOME_SIZE; i++) {
                             biomeData[biomeIndex++] = biomePalette.idAt(i);
                         }
-
-                        // Rewrite ids
-                        /*for (int i = 0; i < section.getPaletteSize(); i++) {
-                            int old = section.getPaletteEntry(i);
-                            section.setPaletteEntry(i, protocol.getMappingData().getNewBlockStateId(old));
-                        }*/
                     }
 
                     final List<CompoundTag> blockEntityTags = new ArrayList<>(oldChunk.blockEntities().size());
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java
index 172f60fc..5aab8b99 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java
@@ -44,12 +44,6 @@ public final class EntityPackets1_18 extends EntityRewriter<Protocol1_17_1To1_18
 
     @Override
     protected void registerPackets() {
-        /*registerTrackerWithData(ClientboundPackets1_18.SPAWN_ENTITY, Entity1_18Types.FALLING_BLOCK);
-        registerSpawnTracker(ClientboundPackets1_18.SPAWN_MOB);
-        registerTracker(ClientboundPackets1_18.SPAWN_EXPERIENCE_ORB, Entity1_18Types.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_18.SPAWN_PAINTING, Entity1_18Types.PAINTING);
-        registerTracker(ClientboundPackets1_18.SPAWN_PLAYER, Entity1_18Types.PLAYER);
-        registerRemoveEntities(ClientboundPackets1_18.REMOVE_ENTITIES);*/
         registerMetadataRewriter(ClientboundPackets1_18.ENTITY_METADATA, Types1_18.METADATA_LIST, Types1_17.METADATA_LIST);
 
         protocol.registerClientbound(ClientboundPackets1_18.JOIN_GAME, new PacketRemapper() {
@@ -67,7 +61,6 @@ public final class EntityPackets1_18 extends EntityRewriter<Protocol1_17_1To1_18
                 map(Type.VAR_INT); // Max players
                 map(Type.VAR_INT); // Chunk radius
                 read(Type.VAR_INT); // Read simulation distance
-                //handler(getTrackerHandler(Entity1_17Types.PLAYER, Type.INT)); //TODO
                 handler(worldDataTrackerHandler(1));
                 handler(wrapper -> {
                     final CompoundTag registry = wrapper.get(Type.NBT, 0);
@@ -127,11 +120,11 @@ public final class EntityPackets1_18 extends EntityRewriter<Protocol1_17_1To1_18
         });
 
         // Particles have already been handled
-        registerMetaTypeHandler(Types1_17.META_TYPES.itemType, null, null, null); //TODO
+        registerMetaTypeHandler(Types1_17.META_TYPES.itemType, null, null, null);
     }
 
     @Override
     public EntityType typeFromId(final int typeId) {
-        return Entity1_17Types.getTypeFromId(typeId); //TODO
+        return Entity1_17Types.getTypeFromId(typeId);
     }
 }