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

pixlyzer block: properly set replaceable in < 1.19

Browse Source
This commit is contained in:
Bixilon 2023-07-01 15:26:20 +02:00
parent 33978850f8
commit 23f93818c8
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt
View File

@ -42,7 +42,6 @@ import de.bixilon.minosoft.data.registries.factory.clazz.MultiClassFactory
import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.identified.ResourceLocation
import de.bixilon.minosoft.data.registries.item.items.Item import de.bixilon.minosoft.data.registries.item.items.Item
import de.bixilon.minosoft.data.registries.item.items.tool.properties.requirement.ToolRequirement import de.bixilon.minosoft.data.registries.item.items.tool.properties.requirement.ToolRequirement
import de.bixilon.minosoft.data.registries.materials.Material
import de.bixilon.minosoft.data.registries.registries.Registries import de.bixilon.minosoft.data.registries.registries.Registries
import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem
import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec
@ -66,7 +65,6 @@ open class PixLyzerBlock(
override val jumpBoost = data["jump_velocity_multiplier"]?.toFloat() ?: 1.0f override val jumpBoost = data["jump_velocity_multiplier"]?.toFloat() ?: 1.0f
private val material: Material?
override var hardness: Float = 0.0f override var hardness: Float = 0.0f
val requiresTool: Boolean val requiresTool: Boolean
val replaceable: Boolean val replaceable: Boolean
@ -75,9 +73,9 @@ open class PixLyzerBlock(
init { init {
val state = data["states"]?.asAnyMap()!!.iterator().next().value.asJsonObject() val state = data["states"]?.asAnyMap()!!.iterator().next().value.asJsonObject()
hardness = data["hardness"]?.toFloat() ?: state["hardness"].toFloat() hardness = data["hardness"]?.toFloat() ?: state["hardness"].toFloat()
material = registries.material[data["material"] ?: state["material"]] val material = registries.material[data["material"] ?: state["material"]]
requiresTool = data["requires_tool"]?.toBoolean() ?: state["requires_tool"]?.toBoolean() ?: material?.let { !it.soft } ?: false requiresTool = data["requires_tool"]?.toBoolean() ?: state["requires_tool"]?.toBoolean() ?: material?.let { !it.soft } ?: false
replaceable = data["replaceable"]?.toBoolean() ?: false replaceable = data["replaceable"]?.toBoolean() ?: material?.replaceable ?: false
ITEM_FIELD.inject<RegistryItem>(data["item"]) ITEM_FIELD.inject<RegistryItem>(data["item"])
} }