From 444b5ecee8bf80e8ae93caa52dad8918a29a7542 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Mon, 27 May 2024 14:33:11 -0400
Subject: [PATCH] Remove BlockStateUpdater dependency

Not currently used
---
 core/build.gradle.kts                             |  1 -
 .../populator/BlockRegistryPopulator.java         | 15 ---------------
 gradle/libs.versions.toml                         |  3 ---
 3 files changed, 19 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 42d4e13c5..a27c4fc89 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     implementation(libs.websocket)
 
     api(libs.bundles.protocol)
-    implementation(libs.blockstateupdater)
 
     api(libs.mcauthlib)
     api(libs.mcprotocollib) {
diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
index 936935306..6b856c509 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
@@ -35,8 +35,6 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.objects.*;
-import org.cloudburstmc.blockstateupdater.BlockStateUpdater;
-import org.cloudburstmc.blockstateupdater.util.tagupdater.CompoundTagUpdaterContext;
 import org.cloudburstmc.nbt.*;
 import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 import org.cloudburstmc.protocol.bedrock.codec.v685.Bedrock_v685;
@@ -85,19 +83,6 @@ public final class BlockRegistryPopulator {
     interface Remapper {
 
         NbtMap remap(NbtMap tag);
-
-        static Remapper of(BlockStateUpdater... updaters) {
-            CompoundTagUpdaterContext context = new CompoundTagUpdaterContext();
-            for (BlockStateUpdater updater : updaters) {
-                updater.registerUpdaters(context);
-            }
-
-            return tag -> {
-                NbtMapBuilder updated = context.update(tag, 0).toBuilder();
-                updated.remove("version"); // we already removed this, but the context adds it. remove it again.
-                return updated.build();
-            };
-        }
     }
 
     public static void populate(Stage stage) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8301029d2..1995a6ada 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,6 @@ gson = "2.3.1" # Provided by Spigot 1.8.8
 websocket = "1.5.1"
 protocol = "3.0.0.Beta2-20240520.153053-5"
 raknet = "1.0.0.CR3-20240416.144209-1"
-blockstateupdater="1.20.80-20240411.142413-1"
 mcauthlib = "e5b0bcc"
 mcprotocollib = "1.20.6-2-20240520.030045-8"
 adventure = "4.14.0"
@@ -122,8 +121,6 @@ protocol-connection = { group = "org.cloudburstmc.protocol", name = "bedrock-con
 
 math = { group = "org.cloudburstmc.math", name = "immutable", version = "2.0" }
 
-blockstateupdater = { group = "org.cloudburstmc", name = "block-state-updater", version.ref = "blockstateupdater"}
-
 # plugins
 indra = { group = "net.kyori", name  = "indra-common", version.ref = "indra" }
 shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }