From 0d33ce228ac6dde04dba37db78064c8d3c4bbbe3 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Mon, 27 Feb 2023 10:49:27 +0300 Subject: [PATCH] do not generate shield model + shield blocking predicate --- .../ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt | 2 +- .../kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 76f7b8c00..ad6eeb407 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -79,7 +79,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.EXOPACK_PROBE) - provider.handheld(MItems.TRITANIUM_TOOLS) + provider.handheld(MItems.TRITANIUM_TOOLS.filter { it != MItems.TRITANIUM_SHIELD }) provider.generated(MItems.TRITANIUM_ARMOR) provider.generatedTiered(MItems.BATTERIES, "battery_tier") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index ae466a53c..82e118108 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -273,6 +273,13 @@ object MRegistry { } private fun initializeClient(event: FMLClientSetupEvent) { + ItemProperties.register(MItems.TRITANIUM_SHIELD, ResourceLocation(OverdriveThatMatters.MOD_ID, "blocking")) { stack, level, entity, _ -> + if (entity?.isUsingItem == true && entity.useItem == stack) { + 1f + } else { + 0f + } + } ItemProperties.register(MItems.ENERGY_SWORD, ResourceLocation(OverdriveThatMatters.MOD_ID, "is_powered")) { stack, _, _, _ -> if ((stack.matteryEnergy?.batteryLevel ?: Decimal.ZERO) >= EnergySwordItem.ENERGY_PER_SWING) { 1f