AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 09:56:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

bump pixlyzer, fix texture loading

Browse Source
This commit is contained in:
Bixilon 2021-04-20 00:15:58 +02:00
parent 8bfc284a82
commit 1490896a85
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt
View File

@ -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.BlockState
import de.bixilon.minosoft.data.mappings.blocks.FluidBlock import de.bixilon.minosoft.data.mappings.blocks.FluidBlock
import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties 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.Chunk
import de.bixilon.minosoft.data.world.ChunkSection import de.bixilon.minosoft.data.world.ChunkSection
import de.bixilon.minosoft.data.world.ChunkSection.Companion.indexPosition import de.bixilon.minosoft.data.world.ChunkSection.Companion.indexPosition
@ -92,8 +93,20 @@ class WorldRenderer(
return meshCollection return meshCollection
} }
private fun getAllBlocks(mapping: VersionMapping): Collection<BlockState> {
val list: MutableList<BlockState> = mutableListOf()
var currentMapping: VersionMapping? = mapping
while (currentMapping != null) {
list.addAll(currentMapping.blockStateIdMap.values)
currentMapping = currentMapping.parentMapping
}
return list
}
override fun init() { override fun init() {
renderWindow.textures.allTextures.addAll(resolveBlockTextureIds(connection.version.mapping.blockStateIdMap.values)) renderWindow.textures.allTextures.addAll(resolveBlockTextureIds(getAllBlocks(connection.version.mapping)))
// register keybindings // register keybindings

2
src/main/resources/assets/minosoft/mapping/pixlyzer_index.json
View File

File diff suppressed because one or more lines are too long