From 39e7b2d937e38d1016afc6fc911cb7b826e3cf75 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 6 Jul 2021 18:55:02 +0200
Subject: [PATCH] fix some datafixer bugs

---
 .../java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt  | 6 +++---
 .../java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt b/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt
index 5c1bf8249..1826595fc 100644
--- a/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt
+++ b/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt
@@ -19,14 +19,13 @@ import de.bixilon.minosoft.datafixer.DataFixerUtil.asResourceLocationMap
 object BlockEntityFixer {
     private val RENAMES: Map<ResourceLocation, ResourceLocation> = mapOf(
         "Furnace" to "minecraft:furnace",
-        "Furnace" to "minecraft:lit_furnace",
         "Chest" to "minecraft:chest",
-        "Chest" to "minecraft:trapped_chest",
         "EnderChest" to "minecraft:ender_chest",
         "RecordPlayer" to "minecraft:jukebox",
         "Trap" to "minecraft:dispenser",
         "Dropper" to "minecraft:dropper",
         "Sign" to "minecraft:sign",
+        "wall_sign" to "minecraft:sign",
         "MobSpawner" to "minecraft:mob_spawner",
         "Music" to "minecraft:noteblock",
         "Cauldron" to "minecraft:brewing_stand",
@@ -52,7 +51,8 @@ object BlockEntityFixer {
         "Airportal" to "minecraft:end_portal",
         "EndGateway" to "minecraft:end_gateway",
         "Banner" to "minecraft:shield",
-        "minecraft:noteblock" to "minecraft:note_block"
+        "minecraft:noteblock" to "minecraft:note_block",
+        // ToDo: flower_pot
     ).asResourceLocationMap()
 
 
diff --git a/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt b/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt
index 6f5193bed..d7726afe7 100644
--- a/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt
@@ -19,7 +19,7 @@ object DataFixerUtil {
     fun Map<String, String>.asResourceLocationMap(): Map<ResourceLocation, ResourceLocation> {
         val out: MutableMap<ResourceLocation, ResourceLocation> = mutableMapOf()
         for ((key, value) in this) {
-            out[ResourceLocation.getResourceLocation(key)] = ResourceLocation.getResourceLocation(value)
+            out[ResourceLocation(key)] = ResourceLocation(value)
         }
         return out.toMap()
     }