diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt index e0ae271c8..5948b8b96 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt @@ -20,6 +20,7 @@ import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.data.mappings.blocks.BlockState import de.bixilon.minosoft.data.mappings.blocks.FluidBlock import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.mappings.versions.VersionMapping import de.bixilon.minosoft.data.world.Chunk import de.bixilon.minosoft.data.world.ChunkSection import de.bixilon.minosoft.data.world.ChunkSection.Companion.indexPosition @@ -92,8 +93,20 @@ class WorldRenderer( return meshCollection } + + private fun getAllBlocks(mapping: VersionMapping): Collection { + val list: MutableList = mutableListOf() + + var currentMapping: VersionMapping? = mapping + while (currentMapping != null) { + list.addAll(currentMapping.blockStateIdMap.values) + currentMapping = currentMapping.parentMapping + } + return list + } + override fun init() { - renderWindow.textures.allTextures.addAll(resolveBlockTextureIds(connection.version.mapping.blockStateIdMap.values)) + renderWindow.textures.allTextures.addAll(resolveBlockTextureIds(getAllBlocks(connection.version.mapping))) // register keybindings diff --git a/src/main/resources/assets/minosoft/mapping/pixlyzer_index.json b/src/main/resources/assets/minosoft/mapping/pixlyzer_index.json index dbf1865b9..3ab3f9f8f 100644 --- a/src/main/resources/assets/minosoft/mapping/pixlyzer_index.json +++ b/src/main/resources/assets/minosoft/mapping/pixlyzer_index.json @@ -1 +1 @@ -{"21w14a":"d8b99d3a78c5c1986862bf4e985e316d724bc25b","21w13a":"7b590813af41caa9789c2596b37f08be9bdf6e19","21w11a":"96fe94e1f24c74fa494a36699f9162a1da5fe4e3","21w10a":"43001bb01b2b7fe051cfdf37624b35d86a493a14","21w08b":"698d0ab2b2046238587b44c366e605310ebb837f","21w08a":"b84723efc9b07b33f12614028604d1cc36e84525","21w07a":"4ea126998c3516decd4297a09f947e6694aebb1d","21w06a":"836fda7b2774dd1f8f218b967228a60d30a4d878","21w05b":"a4d3646312200401500128e350c424231393a64a","21w05a":"f9f67fb7252681a68bebee4fff330b75cc34e0a1","21w03a":"40316b88863a6d388bde894bc9dfd900e2130cfb","1.16.5":"bc7db6ae47f96793c1d7ab5b1cbbb0144fa3c79b","20w51a":"e1673d90349c4da9c5d08510db281c8047b551e5","20w49a":"73b8eba4b34ebe5230b60848ed8222e26c1e1590","20w48a":"119cbadb55c1f96ab5ff6449dc3b54917914585d","20w46a":"4c7cda8083eaa376d838c143265047fd0f94b8b2","20w45a":"f284673932cc8d6303dbc6c9b3d10843254cbd10","1.16.2-pre3":"f440cfc1a46ffc16a0b5c5c697e23622ddd1ecaa","1.16.2-pre2":"3185418bdac9f935de8a044084c333279f6bdb91","1.16.2-pre1":"684c9dc18657b027c9b179fa5d95e420efc2b75e","20w30a":"26aee7fdd379e9b0f34e49c250662ad93230604e","20w29a":"78b7742f5d16dd1b013d0ef009571aee99fe117f","20w28a":"245f4e57c4e5de5e1cbd5c4287483cade2d7b03f","20w27a":"668e7113ed4a11dd1063809c981fe5f0b8ca4847","1.16.1":"a466870757259116d0b3df9d23bf04597c8899b8","1.16":"12940c089f29238f216944dded3a9d2b9c5bc1f4","1.16-rc1":"2a794d7501b15c474f5561af2525be3e691ffc99","1.16-pre8":"1f0714bb50e0b98597639d474fee397b60fe803c","1.16-pre7":"cc6b51e584cd3751222a1641aa6a8a7074e66983","1.16-pre6":"3e6bb9ec49b3bb0968ad71e5b3f61e695a364c49","1.16-pre5":"7463a4771b630e867719a8bfe413dd8a7901c128","1.16-pre4":"4a17fd834dd20ce2389dab54039c1494f1961828","1.16-pre3":"bc479ec34b67522916fc9d8693c6ebaec97e5f91","1.16-pre2":"c50e9eac0dbd8dc7aaef38128c5ad564dfa7669e","1.16-pre1":"4474e0004f3f158b1a7c2de911cb1144e0cbd4eb","20w22a":"81bdf761e2390d9c3ba56e8ffe4e59cf586b25f8","20w21a":"a56b6c6408e16ae26d58c86a83c6a65317f34f0d","20w20b":"6ccbca5547bf65813e93fe642882a70ed2dd1012","20w20a":"6a1b5e672582ffe0f168f0d0eaaf377acb030e10","20w19a":"98ddb8b67cf069592fd16ee584961e4a8c340aca","20w18a":"277db16ff1dc2bc47782f97b7b120b40df31a33a","20w17a":"37b965b14187eee5b07e31206fefea502912c75e","20w16a":"e79bcc9d2f680f57b6104f3c179e124bec491ad5","20w15a":"2f42cc20ff276918641b6571ca22de3f0ef1698f","20w14a":"fe3717230ec1b4c00c98746871b64ee14020a293","20w14infinite":"504516cd7585a35ad81037079a316581de301156","20w13b":"ce8f748976b2e270fd31ce5d66d5efca5ca8c8df","20w13a":"ca951e9a12a5b4f6233be08b1d45a4dcecbd6b18","20w12a":"06a1fe781f87557d65da85f6b3544410cd085ee2","20w11a":"1871b11d4cf32f9758da4e6890745b320418e87e","20w10a":"666018e499c390739e5b88052d4698b582e82272","20w09a":"4ae6e2449075341a01507e16e7827c2c32fb386b","20w08a":"61d9aaf14af620125cba7723c4e1d92fcfdaa9cc","20w07a":"0ab9414e024eb4c4989163dce9498a6df0b92849","20w06a":"2b58e739b955204fde2bbd70eee76e59826b3661","1.16.5-rc1":"4276d3c2738feb81855407faddc7aef6fc69c771","1.16.4":"2af414fa36781c340462837708f15b49b624ed26","1.16.4-rc1":"f58f699a23365e852a72e34dac0aea606993b667","1.16.4-pre2":"66a8b467c88119660bee26fe05b24fb1853ae9a4","1.16.4-pre1":"d36a02dfc400a916f3b96deb32697b1ba022d25e","1.16.3":"1fed0bea361126bde7bb59f0a3fa23e7773423f1","1.16.3-rc1":"b0a6251d058ebfb7c89707d6dc91881dc6a48f49","1.16.2":"32c8fffccbc53541215fad375b92f3f6d4c2f225","1.16.2-rc2":"032681259ea93616c1fa34c64430acdde23cea0f","1.16.2-rc1":"11bbb6da182edadbc728fc711358e3de62db0b75","1.15.2":"b7383b5ec65020c4428722f41a873a3855483ad5","1.15.2-pre2":"12a6e7fba3fb3f91a545d2af059865d9afedc64e","1.15.2-pre1":"8e424831cedeb0e10650b3a13aa5ee63d6fdb350","1.15.1":"12407e6c944ecbde2fffef6c0a6463898a37deea","1.15.1-pre1":"23adbdaa22e32916c5eb1418cd0a7dc8aca58fc2","1.15":"f759ae1d08401d7bac10403ae5fca6075cda0810","1.15-pre7":"cd384fa4ca68d9d503f418600b056d02a90e2009","1.15-pre6":"be23aaf78149b073853b19fe7e6c7f39ced8622c","1.15-pre5":"89d372adbe8582c085618bf881a32320aaf18854","1.15-pre4":"4a3bbb032a30b131ea7cf5d6b10f45d42f422a05","1.15-pre3":"8aa2b9c50d68a519ce887fa9dee773325b419802","1.15-pre2":"c89db8172eb0c5ce12c62acf15f435489362673e","1.15-pre1":"4b68756621153acad011f1bab4e12d5f2bad4558","19w46b":"5ca33271ac629465de01cc984e3110c5c79b997d","19w46a":"638fb4dcbe9e06b59c994e3cda31eb2ca920ed65","19w45b":"919a50dba94d4ee50daf518b6f91323df6bcdad1","19w45a":"96cdc8c006e6e96015b80b7fc3fb3e4d3810f1cb","19w44a":"95a794e93cc4de3c9e39c8723175dc715e1ea219","19w42a":"10898580b6b7b3e24dc9c87540b154b23955e338","19w41a":"8a492c7540f96128fc6bcb407f9b3a6fcd2ebf38","19w40a":"bfc39359860e8a1f7b74681162c05893bb5234f3","19w39a":"59036e93cd062527a148ce64322f76206dfc9cac","19w38b":"2c54debaa6ac070ae34f6ffae6359a4ed8a626c6","19w38a":"cc698d212c788372560fd631b2be4327220bdc89","19w37a":"3a5b8fe244ff11ae29b97eb4b7681267ac8ba93d","19w36a":"6800bf43d71ca17beb91f97fd0b18089b52c578a","19w35a":"2cac0fb4249cc8607a8d34c86ab7ae5f570c3e34","19w34a":"c17ed2ae1a95ac10597282c8766056a415c1fffb","1.14.4":"98c3a5d308c22ea4f9b8b7ffd4057bd5b3b4e67d","1.14.4-pre7":"06856c643fc8bce5f78ed41a6d505fcb853d3867","1.14.4-pre6":"a1a82485fe8ed47c21ee6a9129072b37123f5203","1.14.4-pre5":"173f5a8248688a52ff11c01186ed3014ae357715","1.14.4-pre4":"a10882a43f0af54fef8a60b1440c8bb6ddf2e2cf","1.14.4-pre3":"142df4092d5f29bf1e4b7fec0a287408f7b30d13","1.14.4-pre2":"0a5b637294de49e9f1bbecad207f4ea2e9355fb5","1.14.4-pre1":"7101fe1e943e0f061204648c4511fdbd9f03e571","1.14.3":"74c811cedf2916dbfeb790f1849cf3e9d9e5e7b0","1.14.3-pre4":"c097fcaa2205a6f20c579b289641b22860790d6f","1.14.3-pre3":"82bb5dfaf016150d744da9a916c884dfb8bf659d","1.14.3-pre2":"67c497a52dda3f08660167aedca09c74f97e1ee7","1.14.3-pre1":"11168eb0cdd4dc4977b01969ba23cd73f1bdbe83","1.14.2":"51c801d29a300146cc437a82085486bda24d841f","1.14.2 Pre-Release 4":"38df58e0f4fea146763b611bccb7794879d6bdc2","1.14.2 Pre-Release 3":"f3a3fd9d5d785b220655abc0464f7e8759b64b4e","1.14.2 Pre-Release 2":"a3281cad917630446017611755eb942ef3f3459e","1.14.2 Pre-Release 1":"5aadcec9c28caae89d5cba849e4e327e018e8db6","1.14.1":"df29c9409749cd2a0754dbcb0291ef2b1adc46c5","1.14.1 Pre-Release 2":"0edad619cff1439dea317b21fa4707161c59a1e2","1.14.1 Pre-Release 1":"3b319d23b6faea78d456fc4a28e29d3f1f0c6ef7","1.14":"77a5b3528209a1defdd658e4f390238e24464ea3","1.14 Pre-Release 5":"22d79a5af25c880dbfd7c3e3a7ec6e4af7edcf70","1.14 Pre-Release 4":"a3ca2fca7e94c2f559f9698802a0206b278b549c","1.14 Pre-Release 3":"76d6fd26e8927865a97a4821664c7c02e001f03f","1.14 Pre-Release 2":"2ba9fd03a6da43b6ce5aff7769a48227f4d6ae16","1.14 Pre-Release 1":"1b4d8a29a007c134479d1940c64c8bcc2c1dc774","19w14b":"4a3a49892db32162668c86029897f10682e6264f","19w14a":"bff7846207935a7af57b0c4b500fffaccbb807bd","3D Shareware v1.34":"c92ce5aff08e8d23c56548f8907e84773ec3b73a","19w13b":"5c834e3d5c24a8ed98648e80027b3f5489fbbd1d","19w13a":"9f4b6d34caf7b6f3dc9f55874083dbc85f7030d4","19w12b":"c91f78d83ead2879c7bae9108b061b410f9e794c","19w12a":"614a59d8a028acc02d32ca3dbacbd5612fe678c1","19w11b":"fc06d42fd217456d8b74092de80c18ef372ae583","19w11a":"fe6ab46535193339e276ce36cdd37a1d34eb2faa","21w15a":"14b34416305502b4dabc9030e4c62adc7ec23f25"} +{"21w14a":"d8b99d3a78c5c1986862bf4e985e316d724bc25b","21w13a":"7b590813af41caa9789c2596b37f08be9bdf6e19","21w11a":"96fe94e1f24c74fa494a36699f9162a1da5fe4e3","21w10a":"43001bb01b2b7fe051cfdf37624b35d86a493a14","21w08b":"698d0ab2b2046238587b44c366e605310ebb837f","21w08a":"b84723efc9b07b33f12614028604d1cc36e84525","21w07a":"4ea126998c3516decd4297a09f947e6694aebb1d","21w06a":"836fda7b2774dd1f8f218b967228a60d30a4d878","21w05b":"a4d3646312200401500128e350c424231393a64a","21w05a":"f9f67fb7252681a68bebee4fff330b75cc34e0a1","21w03a":"40316b88863a6d388bde894bc9dfd900e2130cfb","1.16.5":"bc7db6ae47f96793c1d7ab5b1cbbb0144fa3c79b","20w51a":"e1673d90349c4da9c5d08510db281c8047b551e5","20w49a":"73b8eba4b34ebe5230b60848ed8222e26c1e1590","20w48a":"119cbadb55c1f96ab5ff6449dc3b54917914585d","20w46a":"4c7cda8083eaa376d838c143265047fd0f94b8b2","20w45a":"f284673932cc8d6303dbc6c9b3d10843254cbd10","1.16.2-pre3":"f440cfc1a46ffc16a0b5c5c697e23622ddd1ecaa","1.16.2-pre2":"3185418bdac9f935de8a044084c333279f6bdb91","1.16.2-pre1":"684c9dc18657b027c9b179fa5d95e420efc2b75e","20w30a":"26aee7fdd379e9b0f34e49c250662ad93230604e","20w29a":"78b7742f5d16dd1b013d0ef009571aee99fe117f","20w28a":"245f4e57c4e5de5e1cbd5c4287483cade2d7b03f","20w27a":"668e7113ed4a11dd1063809c981fe5f0b8ca4847","1.16.1":"a466870757259116d0b3df9d23bf04597c8899b8","1.16":"12940c089f29238f216944dded3a9d2b9c5bc1f4","1.16-rc1":"2a794d7501b15c474f5561af2525be3e691ffc99","1.16-pre8":"1f0714bb50e0b98597639d474fee397b60fe803c","1.16-pre7":"cc6b51e584cd3751222a1641aa6a8a7074e66983","1.16-pre6":"3e6bb9ec49b3bb0968ad71e5b3f61e695a364c49","1.16-pre5":"7463a4771b630e867719a8bfe413dd8a7901c128","1.16-pre4":"4a17fd834dd20ce2389dab54039c1494f1961828","1.16-pre3":"bc479ec34b67522916fc9d8693c6ebaec97e5f91","1.16-pre2":"c50e9eac0dbd8dc7aaef38128c5ad564dfa7669e","1.16-pre1":"4474e0004f3f158b1a7c2de911cb1144e0cbd4eb","20w22a":"81bdf761e2390d9c3ba56e8ffe4e59cf586b25f8","20w21a":"a56b6c6408e16ae26d58c86a83c6a65317f34f0d","20w20b":"6ccbca5547bf65813e93fe642882a70ed2dd1012","20w20a":"6a1b5e672582ffe0f168f0d0eaaf377acb030e10","20w19a":"98ddb8b67cf069592fd16ee584961e4a8c340aca","20w18a":"277db16ff1dc2bc47782f97b7b120b40df31a33a","20w17a":"37b965b14187eee5b07e31206fefea502912c75e","20w16a":"e79bcc9d2f680f57b6104f3c179e124bec491ad5","20w15a":"2f42cc20ff276918641b6571ca22de3f0ef1698f","20w14a":"fe3717230ec1b4c00c98746871b64ee14020a293","20w14infinite":"504516cd7585a35ad81037079a316581de301156","20w13b":"ce8f748976b2e270fd31ce5d66d5efca5ca8c8df","20w13a":"ca951e9a12a5b4f6233be08b1d45a4dcecbd6b18","20w12a":"06a1fe781f87557d65da85f6b3544410cd085ee2","20w11a":"1871b11d4cf32f9758da4e6890745b320418e87e","20w10a":"666018e499c390739e5b88052d4698b582e82272","20w09a":"4ae6e2449075341a01507e16e7827c2c32fb386b","20w08a":"61d9aaf14af620125cba7723c4e1d92fcfdaa9cc","20w07a":"0ab9414e024eb4c4989163dce9498a6df0b92849","20w06a":"2b58e739b955204fde2bbd70eee76e59826b3661","1.16.5-rc1":"4276d3c2738feb81855407faddc7aef6fc69c771","1.16.4":"2af414fa36781c340462837708f15b49b624ed26","1.16.4-rc1":"f58f699a23365e852a72e34dac0aea606993b667","1.16.4-pre2":"66a8b467c88119660bee26fe05b24fb1853ae9a4","1.16.4-pre1":"d36a02dfc400a916f3b96deb32697b1ba022d25e","1.16.3":"1fed0bea361126bde7bb59f0a3fa23e7773423f1","1.16.3-rc1":"b0a6251d058ebfb7c89707d6dc91881dc6a48f49","1.16.2":"32c8fffccbc53541215fad375b92f3f6d4c2f225","1.16.2-rc2":"032681259ea93616c1fa34c64430acdde23cea0f","1.16.2-rc1":"11bbb6da182edadbc728fc711358e3de62db0b75","1.15.2":"b7383b5ec65020c4428722f41a873a3855483ad5","1.15.2-pre2":"12a6e7fba3fb3f91a545d2af059865d9afedc64e","1.15.2-pre1":"8e424831cedeb0e10650b3a13aa5ee63d6fdb350","1.15.1":"12407e6c944ecbde2fffef6c0a6463898a37deea","1.15.1-pre1":"23adbdaa22e32916c5eb1418cd0a7dc8aca58fc2","1.15":"f759ae1d08401d7bac10403ae5fca6075cda0810","1.15-pre7":"cd384fa4ca68d9d503f418600b056d02a90e2009","1.15-pre6":"be23aaf78149b073853b19fe7e6c7f39ced8622c","1.15-pre5":"89d372adbe8582c085618bf881a32320aaf18854","1.15-pre4":"4a3bbb032a30b131ea7cf5d6b10f45d42f422a05","1.15-pre3":"8aa2b9c50d68a519ce887fa9dee773325b419802","1.15-pre2":"c89db8172eb0c5ce12c62acf15f435489362673e","1.15-pre1":"4b68756621153acad011f1bab4e12d5f2bad4558","19w46b":"5ca33271ac629465de01cc984e3110c5c79b997d","19w46a":"638fb4dcbe9e06b59c994e3cda31eb2ca920ed65","19w45b":"919a50dba94d4ee50daf518b6f91323df6bcdad1","19w45a":"96cdc8c006e6e96015b80b7fc3fb3e4d3810f1cb","19w44a":"95a794e93cc4de3c9e39c8723175dc715e1ea219","19w42a":"10898580b6b7b3e24dc9c87540b154b23955e338","19w41a":"8a492c7540f96128fc6bcb407f9b3a6fcd2ebf38","19w40a":"bfc39359860e8a1f7b74681162c05893bb5234f3","19w39a":"59036e93cd062527a148ce64322f76206dfc9cac","19w38b":"2c54debaa6ac070ae34f6ffae6359a4ed8a626c6","19w38a":"cc698d212c788372560fd631b2be4327220bdc89","19w37a":"3a5b8fe244ff11ae29b97eb4b7681267ac8ba93d","19w36a":"6800bf43d71ca17beb91f97fd0b18089b52c578a","19w35a":"2cac0fb4249cc8607a8d34c86ab7ae5f570c3e34","19w34a":"c17ed2ae1a95ac10597282c8766056a415c1fffb","1.14.4":"98c3a5d308c22ea4f9b8b7ffd4057bd5b3b4e67d","1.14.4-pre7":"06856c643fc8bce5f78ed41a6d505fcb853d3867","1.14.4-pre6":"a1a82485fe8ed47c21ee6a9129072b37123f5203","1.14.4-pre5":"173f5a8248688a52ff11c01186ed3014ae357715","1.14.4-pre4":"a10882a43f0af54fef8a60b1440c8bb6ddf2e2cf","1.14.4-pre3":"142df4092d5f29bf1e4b7fec0a287408f7b30d13","1.14.4-pre2":"0a5b637294de49e9f1bbecad207f4ea2e9355fb5","1.14.4-pre1":"7101fe1e943e0f061204648c4511fdbd9f03e571","1.14.3":"74c811cedf2916dbfeb790f1849cf3e9d9e5e7b0","1.14.3-pre4":"c097fcaa2205a6f20c579b289641b22860790d6f","1.14.3-pre3":"82bb5dfaf016150d744da9a916c884dfb8bf659d","1.14.3-pre2":"67c497a52dda3f08660167aedca09c74f97e1ee7","1.14.3-pre1":"11168eb0cdd4dc4977b01969ba23cd73f1bdbe83","1.14.2":"51c801d29a300146cc437a82085486bda24d841f","1.14.2 Pre-Release 4":"38df58e0f4fea146763b611bccb7794879d6bdc2","1.14.2 Pre-Release 3":"f3a3fd9d5d785b220655abc0464f7e8759b64b4e","1.14.2 Pre-Release 2":"a3281cad917630446017611755eb942ef3f3459e","1.14.2 Pre-Release 1":"5aadcec9c28caae89d5cba849e4e327e018e8db6","1.14.1":"df29c9409749cd2a0754dbcb0291ef2b1adc46c5","1.14.1 Pre-Release 2":"0edad619cff1439dea317b21fa4707161c59a1e2","1.14.1 Pre-Release 1":"3b319d23b6faea78d456fc4a28e29d3f1f0c6ef7","1.14":"77a5b3528209a1defdd658e4f390238e24464ea3","1.14 Pre-Release 5":"22d79a5af25c880dbfd7c3e3a7ec6e4af7edcf70","1.14 Pre-Release 4":"a3ca2fca7e94c2f559f9698802a0206b278b549c","1.14 Pre-Release 3":"76d6fd26e8927865a97a4821664c7c02e001f03f","1.14 Pre-Release 2":"2ba9fd03a6da43b6ce5aff7769a48227f4d6ae16","1.14 Pre-Release 1":"1b4d8a29a007c134479d1940c64c8bcc2c1dc774","19w14b":"4a3a49892db32162668c86029897f10682e6264f","19w14a":"bff7846207935a7af57b0c4b500fffaccbb807bd","3D Shareware v1.34":"c92ce5aff08e8d23c56548f8907e84773ec3b73a","19w13b":"5c834e3d5c24a8ed98648e80027b3f5489fbbd1d","19w13a":"9f4b6d34caf7b6f3dc9f55874083dbc85f7030d4","19w12b":"c91f78d83ead2879c7bae9108b061b410f9e794c","19w12a":"614a59d8a028acc02d32ca3dbacbd5612fe678c1","19w11b":"fc06d42fd217456d8b74092de80c18ef372ae583","19w11a":"fe6ab46535193339e276ce36cdd37a1d34eb2faa","21w15a":"14b34416305502b4dabc9030e4c62adc7ec23f25","17w46a":"153dff89ed90f91758f847907cd4d48d3b553a3f"}