diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt index a8e76e8f4..d78740e9d 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt @@ -322,7 +322,6 @@ class VersionMapping(var version: Version?) { for (statesJson in json.getAsJsonArray("states")) { check(statesJson is JsonObject) { "Invalid block state json" } - val block = loadBlockState(ModIdentifier(mod, identifierName!!), statesJson) var blockId = getBlockId(block.identifier) val blockNumericId = getBlockId(statesJson, !version.isFlattened()) @@ -360,6 +359,10 @@ class VersionMapping(var version: Version?) { } val blockStates = block.getAsJsonObject("states") for (identifier in blockStates.keySet()) { + if (identifier == "dispenser") { + Log.debug("") + } + loadBlockModelState(mod, identifier!!, blockStates) } } @@ -413,7 +416,8 @@ class VersionMapping(var version: Version?) { for (blockState in blockStates) { if (blockState.bareEquals(state)) { for (type in value.getAsJsonArray("types")) { - blockState.blockModels.add(BlockModel(blockModels[ModIdentifier(type.asJsonObject["model"].asString.replace("block/", ""))], value)) + check(type is JsonObject) { "Invalid block type json" } + blockState.blockModels.add(BlockModel(blockModels[ModIdentifier(type["model"].asString.replace("block/", ""))], type)) } ckecked = true } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt index f99261b74..92c873813 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt @@ -70,7 +70,7 @@ class ChunkRenderer(private val connection: Connection, private val world: World section.getBlock(position.getLocationByDirection(Directions.EAST)) } - // if(block.fullIdentifier != "minecraft:dropper"){ + // if (block.identifier.fullIdentifier != "minecraft:dispenser") { // continue // }