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

fix default dimension height, test equality of dimension deserialization and default constructor

Browse Source 
This fixes some chunk bugs in < 1.15 if the top section was set
This commit is contained in:
Moritz Zwerger 2023-10-08 17:29:02 +02:00
parent 8ed82ef3be
commit 4b718d6c5f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/data/registries/dimension/AmbientLight.kt
View File

@ -33,4 +33,8 @@ class AmbientLight(val base: Float = 0.0f) {
override fun toString(): String { override fun toString(): String {
return base.toString() return base.toString()
} }
companion object {
val DEFAULT = AmbientLight()
}
} }

9
src/main/java/de/bixilon/minosoft/data/registries/dimension/DimensionProperties.kt
View File

@ -28,7 +28,7 @@ import de.bixilon.minosoft.util.nbt.tag.NBTUtil.get
data class DimensionProperties( data class DimensionProperties(
// val piglinSafe: Boolean = false, // val piglinSafe: Boolean = false,
// val natural: Boolean = true, // val natural: Boolean = true,
val ambientLight: AmbientLight = AmbientLight(), val ambientLight: AmbientLight = AmbientLight.DEFAULT,
// val respawnAnchorWorks: Boolean = false, // val respawnAnchorWorks: Boolean = false,
val light: Boolean = true, val light: Boolean = true,
val skyLight: Boolean = true, val skyLight: Boolean = true,
@ -59,16 +59,15 @@ data class DimensionProperties(
companion object { companion object {
const val DEFAULT_HEIGHT = 256 const val DEFAULT_HEIGHT = 256
const val DEFAULT_MAX_Y = DEFAULT_HEIGHT - 1
fun deserialize(identifier: ResourceLocation? = null, data: Map<String, Any>): DimensionProperties { fun deserialize(identifier: ResourceLocation? = null, data: Map<String, Any>): DimensionProperties {
return DimensionProperties( return DimensionProperties(
//piglinSafe = data["piglin_safe"]?.toBoolean() ?: false, //piglinSafe = data["piglin_safe"]?.toBoolean() ?: false,
//natural = data["natural"]?.toBoolean() ?: false, //natural = data["natural"]?.toBoolean() ?: false,
ambientLight = AmbientLight(data["ambient_light"]?.toFloat() ?: 0.0f), ambientLight = data["ambient_light"]?.toFloat()?.let { AmbientLight(it) } ?: AmbientLight.DEFAULT,
//infiniBurn = ResourceLocation(data["infiniburn"].nullCast<String>() ?: "infiniburn_overworld"), //infiniBurn = ResourceLocation(data["infiniburn"].nullCast<String>() ?: "infiniburn_overworld"),
//respawnAnchorWorks = data["respawn_anchor_works"]?.toBoolean() ?: false, //respawnAnchorWorks = data["respawn_anchor_works"]?.toBoolean() ?: false,
skyLight = data["has_skylight", "has_sky_light"]?.toBoolean() ?: false, skyLight = data["has_skylight", "has_sky_light"]?.toBoolean() ?: true,
//bedWorks = data["bed_works"]?.toBoolean() ?: false, //bedWorks = data["bed_works"]?.toBoolean() ?: false,
effects = data["effects"].nullCast<String>()?.let { DefaultDimensionEffects[it.toResourceLocation()] } ?: identifier?.let { DefaultDimensionEffects[it] } ?: OverworldEffects, effects = data["effects"].nullCast<String>()?.let { DefaultDimensionEffects[it.toResourceLocation()] } ?: identifier?.let { DefaultDimensionEffects[it] } ?: OverworldEffects,
//hasRaids = data["has_raids"]?.toBoolean() ?: false, //hasRaids = data["has_raids"]?.toBoolean() ?: false,
@ -77,7 +76,7 @@ data class DimensionProperties(
minY = data["min_y"]?.toInt() ?: 0, minY = data["min_y"]?.toInt() ?: 0,
//hasCeiling = data["has_ceiling"]?.toBoolean() ?: false, //hasCeiling = data["has_ceiling"]?.toBoolean() ?: false,
ultraWarm = data["ultrawarm"]?.toBoolean() ?: false, ultraWarm = data["ultrawarm"]?.toBoolean() ?: false,
height = data["height"]?.toInt() ?: DEFAULT_MAX_Y, height = data["height"]?.toInt() ?: DEFAULT_HEIGHT,
supports3DBiomes = data["supports_3d_biomes"]?.toBoolean() ?: true, supports3DBiomes = data["supports_3d_biomes"]?.toBoolean() ?: true,
) )
} }

17
src/test/java/de/bixilon/minosoft/data/registries/dimension/DimensionPropertiesTest.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2022 Moritz Zwerger * Copyright (C) 2020-2023 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -38,4 +38,19 @@ class DimensionPropertiesTest {
assertEquals(0, properties.maxSection) assertEquals(0, properties.maxSection)
assertEquals(15, properties.maxY) assertEquals(15, properties.maxY)
} }
@Test
fun `legacy dimension`() {
val properties = DimensionProperties()
assertEquals(16, properties.sections)
assertEquals(0, properties.minSection)
assertEquals(15, properties.maxSection)
assertEquals(255, properties.maxY)
}
@Test
fun `default of deserialization`() {
val properties = DimensionProperties.deserialize(null, emptyMap())
assertEquals(properties, DimensionProperties())
}
} }