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

fix version mapping block getting with pre flattening meta data

Browse Source
This commit is contained in:
Bixilon 2021-04-30 13:07:31 +02:00
parent efe05ed03f
commit f94adbd3de
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt
View File

@ -101,6 +101,8 @@ class VersionMapping {
var isFullyLoaded = false var isFullyLoaded = false
private set private set
private var isFlattened = false
var parentMapping: VersionMapping? = null var parentMapping: VersionMapping? = null
set(value) { set(value) {
@ -115,7 +117,13 @@ class VersionMapping {
if (blockState == ProtocolDefinition.NULL_BLOCK_ID) { if (blockState == ProtocolDefinition.NULL_BLOCK_ID) {
return null return null
} }
return blockStateIdMap[blockState] ?: parentMapping?.getBlockState(blockState) return blockStateIdMap[blockState] ?: parentMapping?.getBlockState(blockState) ?: let {
if (isFlattened) {
null
} else {
blockStateIdMap[(blockState shr 4) shl 4] // Remove meta data and test again
}
}
} }
fun getEntityMetaDataIndex(field: EntityMetaDataFields): Int? { fun getEntityMetaDataIndex(field: EntityMetaDataFields): Int? {
@ -131,6 +139,7 @@ class VersionMapping {
} }
fun load(version: Version, pixlyzerData: JsonObject) { fun load(version: Version, pixlyzerData: JsonObject) {
isFlattened = version.isFlattened()
// pre init stuff // pre init stuff
loadShapes(pixlyzerData["shapes"]?.asJsonObject) loadShapes(pixlyzerData["shapes"]?.asJsonObject)