From ad80b24b55a5f36bc6b84f53a6e903fcf063c999 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Mon, 2 Oct 2023 17:23:33 +0200 Subject: [PATCH] block state registry: warn if id is duplicated --- .../registries/registries/registry/BlockStateRegistry.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/BlockStateRegistry.kt b/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/BlockStateRegistry.kt index 503afa7af..64cbbc067 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/BlockStateRegistry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/BlockStateRegistry.kt @@ -22,6 +22,9 @@ import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.protocol.versions.Version +import de.bixilon.minosoft.util.logging.Log +import de.bixilon.minosoft.util.logging.LogLevels +import de.bixilon.minosoft.util.logging.LogMessageType import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap class BlockStateRegistry(var flattened: Boolean) : AbstractRegistry { @@ -53,7 +56,10 @@ class BlockStateRegistry(var flattened: Boolean) : AbstractRegistry } internal operator fun set(id: Int, state: BlockState) { - idMap[id] = state + val previous = idMap.put(id, state) + if (previous != null) { + Log.log(LogMessageType.LOADING, LogLevels.WARN) { "Block $state just replaced $previous (id=$id)" } + } } private fun _get(id: Int): BlockState? {