From 0e48f5925504a3ae34b67ffae6476f6309ddfd34 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 25 Jan 2023 18:10:34 +0100 Subject: [PATCH] 23w04a: fix build --- .../pixlyzer/generator/generators/ItemGenerator.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt index e231f56..2d1d2e0 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt @@ -86,7 +86,9 @@ object ItemGenerator : Generator( itemData["attack_damage"] = DIGGER_ITEM_ATTACK_DAMAGE.getFloat(item) } if (item is ArmorItem) { - itemData["equipment_slot"] = (ARMOR_ITEM_EQUIPMENT_SLOT_FIELD.get(item) as EquipmentSlot).name.lowercase(Locale.getDefault()) + (ARMOR_ITEM_EQUIPMENT_SLOT_FIELD?.get(item) as EquipmentSlot?)?.let { + itemData["equipment_slot"] = it.name.lowercase(Locale.getDefault()) + } itemData["defense"] = item.protection itemData["toughness"] = ARMOR_ITEM_TOUGHNESS_FIELD.getFloat(item) itemData["armor_material"] = item.material.name.lowercase(Locale.getDefault()) @@ -251,8 +253,9 @@ object ItemGenerator : Generator( private val DIGGER_ITEM_BLOCKS_FIELD = MiningToolItem::class.java.getDeclaredField("effectiveBlocks") private val DIGGER_ITEM_SPEED_FIELD = MiningToolItem::class.java.getDeclaredField("miningSpeed") - private val DIGGER_ITEM_ATTACK_DAMAGE = getField(MiningToolItem::class.java, "attackDamageBaseline", "attackDamage")!! - private val ARMOR_ITEM_EQUIPMENT_SLOT_FIELD = ArmorItem::class.java.getDeclaredField("slot") + private val DIGGER_ITEM_ATTACK_DAMAGE = + getField(MiningToolItem::class.java, "attackDamageBaseline", "attackDamage")!! + private val ARMOR_ITEM_EQUIPMENT_SLOT_FIELD = getField(ArmorItem::class.java, "slot") private val ARMOR_ITEM_TOUGHNESS_FIELD = ArmorItem::class.java.getDeclaredField("toughness") private val AXE_ITEM_STRIPPABLES_FIELD = getField(AxeItem::class.java, "STRIPABLES", "STRIPPABLES", "STRIPPED_BLOCKS")!! private val BUCKED_ITEM_CONTENT_FIELD = BucketItem::class.java.getDeclaredField("fluid") @@ -268,7 +271,6 @@ object ItemGenerator : Generator( init { DIGGER_ITEM_BLOCKS_FIELD.isAccessible = true DIGGER_ITEM_SPEED_FIELD.isAccessible = true - ARMOR_ITEM_EQUIPMENT_SLOT_FIELD.isAccessible = true ARMOR_ITEM_TOUGHNESS_FIELD.isAccessible = true AXE_ITEM_STRIPPABLES_FIELD.isAccessible = true BUCKED_ITEM_CONTENT_FIELD.isAccessible = true