From 23f93818c849b7e82c9c6a084fb8f83f967283b2 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sat, 1 Jul 2023 15:26:20 +0200 Subject: [PATCH] pixlyzer block: properly set replaceable in < 1.19 --- .../data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt index 652f079e3..ab809d4ab 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt @@ -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.item.items.Item 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.registry.RegistryItem 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 - private val material: Material? override var hardness: Float = 0.0f val requiresTool: Boolean val replaceable: Boolean @@ -75,9 +73,9 @@ open class PixLyzerBlock( init { val state = data["states"]?.asAnyMap()!!.iterator().next().value.asJsonObject() 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 - replaceable = data["replaceable"]?.toBoolean() ?: false + replaceable = data["replaceable"]?.toBoolean() ?: material?.replaceable ?: false ITEM_FIELD.inject(data["item"]) }