Merge remote-tracking branch 'origin/master'

This commit is contained in:
GearShocky 2023-04-13 21:54:36 +06:00
commit 56a8831364

View File

@ -286,6 +286,7 @@ object MRegistry {
0f 0f
} }
} }
ItemProperties.register(MItems.ENERGY_SWORD, ResourceLocation(OverdriveThatMatters.MOD_ID, "is_powered")) { stack, _, _, _ -> ItemProperties.register(MItems.ENERGY_SWORD, ResourceLocation(OverdriveThatMatters.MOD_ID, "is_powered")) { stack, _, _, _ ->
if ((stack.matteryEnergy?.batteryLevel ?: Decimal.ZERO) >= EnergySwordItem.ENERGY_PER_SWING) { if ((stack.matteryEnergy?.batteryLevel ?: Decimal.ZERO) >= EnergySwordItem.ENERGY_PER_SWING) {
1f 1f
@ -293,5 +294,9 @@ object MRegistry {
0f 0f
} }
} }
ItemProperties.register(MItems.EXPLOSIVE_HAMMER, ResourceLocation(OverdriveThatMatters.MOD_ID, "is_primed")) { stack, _, _, _ ->
if (MItems.EXPLOSIVE_HAMMER.isPrimed(stack)) 1f else 0f
}
} }
} }